aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic/vector.c
diff options
context:
space:
mode:
authorJiang Liu <jiang.liu@linux.intel.com>2014-10-27 04:12:01 -0400
committerThomas Gleixner <tglx@linutronix.de>2014-12-16 08:08:17 -0500
commit849d3569bbaf2dfdea41a6073bc0e25a0578c380 (patch)
tree5e1682d201671fd90f41f351d2dd760addd6d377 /arch/x86/kernel/apic/vector.c
parentf0e5bf758348e7205a33de50c894e75f9bc89714 (diff)
x86, irq: Replace printk(KERN_LVL) with pr_lvl() utilities
Replace printk(KENR_LVL) with pr_lvl() to keep checkpatch script silent. Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Joerg Roedel <joro@8bytes.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Rafael J. Wysocki <rjw@rjwysocki.net> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Link: http://lkml.kernel.org/r/1414397531-28254-11-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/apic/vector.c')
-rw-r--r--arch/x86/kernel/apic/vector.c69
1 files changed, 34 insertions, 35 deletions
diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
index fe326a3452fc..938108fbc39b 100644
--- a/arch/x86/kernel/apic/vector.c
+++ b/arch/x86/kernel/apic/vector.c
@@ -504,28 +504,27 @@ static void __init print_local_APIC(void *dummy)
504 unsigned int i, v, ver, maxlvt; 504 unsigned int i, v, ver, maxlvt;
505 u64 icr; 505 u64 icr;
506 506
507 printk(KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n", 507 pr_debug("printing local APIC contents on CPU#%d/%d:\n",
508 smp_processor_id(), hard_smp_processor_id()); 508 smp_processor_id(), hard_smp_processor_id());
509 v = apic_read(APIC_ID); 509 v = apic_read(APIC_ID);
510 printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, read_apic_id()); 510 pr_info("... APIC ID: %08x (%01x)\n", v, read_apic_id());
511 v = apic_read(APIC_LVR); 511 v = apic_read(APIC_LVR);
512 printk(KERN_INFO "... APIC VERSION: %08x\n", v); 512 pr_info("... APIC VERSION: %08x\n", v);
513 ver = GET_APIC_VERSION(v); 513 ver = GET_APIC_VERSION(v);
514 maxlvt = lapic_get_maxlvt(); 514 maxlvt = lapic_get_maxlvt();
515 515
516 v = apic_read(APIC_TASKPRI); 516 v = apic_read(APIC_TASKPRI);
517 printk(KERN_DEBUG "... APIC TASKPRI: %08x (%02x)\n", 517 pr_debug("... APIC TASKPRI: %08x (%02x)\n", v, v & APIC_TPRI_MASK);
518 v, v & APIC_TPRI_MASK);
519 518
520 /* !82489DX */ 519 /* !82489DX */
521 if (APIC_INTEGRATED(ver)) { 520 if (APIC_INTEGRATED(ver)) {
522 if (!APIC_XAPIC(ver)) { 521 if (!APIC_XAPIC(ver)) {
523 v = apic_read(APIC_ARBPRI); 522 v = apic_read(APIC_ARBPRI);
524 printk(KERN_DEBUG "... APIC ARBPRI: %08x (%02x)\n", v, 523 pr_debug("... APIC ARBPRI: %08x (%02x)\n",
525 v & APIC_ARBPRI_MASK); 524 v, v & APIC_ARBPRI_MASK);
526 } 525 }
527 v = apic_read(APIC_PROCPRI); 526 v = apic_read(APIC_PROCPRI);
528 printk(KERN_DEBUG "... APIC PROCPRI: %08x\n", v); 527 pr_debug("... APIC PROCPRI: %08x\n", v);
529 } 528 }
530 529
531 /* 530 /*
@@ -534,23 +533,23 @@ static void __init print_local_APIC(void *dummy)
534 */ 533 */
535 if (!APIC_INTEGRATED(ver) || maxlvt == 3) { 534 if (!APIC_INTEGRATED(ver) || maxlvt == 3) {
536 v = apic_read(APIC_RRR); 535 v = apic_read(APIC_RRR);
537 printk(KERN_DEBUG "... APIC RRR: %08x\n", v); 536 pr_debug("... APIC RRR: %08x\n", v);
538 } 537 }
539 538
540 v = apic_read(APIC_LDR); 539 v = apic_read(APIC_LDR);
541 printk(KERN_DEBUG "... APIC LDR: %08x\n", v); 540 pr_debug("... APIC LDR: %08x\n", v);
542 if (!x2apic_enabled()) { 541 if (!x2apic_enabled()) {
543 v = apic_read(APIC_DFR); 542 v = apic_read(APIC_DFR);
544 printk(KERN_DEBUG "... APIC DFR: %08x\n", v); 543 pr_debug("... APIC DFR: %08x\n", v);
545 } 544 }
546 v = apic_read(APIC_SPIV); 545 v = apic_read(APIC_SPIV);
547 printk(KERN_DEBUG "... APIC SPIV: %08x\n", v); 546 pr_debug("... APIC SPIV: %08x\n", v);
548 547
549 printk(KERN_DEBUG "... APIC ISR field:\n"); 548 pr_debug("... APIC ISR field:\n");
550 print_APIC_field(APIC_ISR); 549 print_APIC_field(APIC_ISR);
551 printk(KERN_DEBUG "... APIC TMR field:\n"); 550 pr_debug("... APIC TMR field:\n");
552 print_APIC_field(APIC_TMR); 551 print_APIC_field(APIC_TMR);
553 printk(KERN_DEBUG "... APIC IRR field:\n"); 552 pr_debug("... APIC IRR field:\n");
554 print_APIC_field(APIC_IRR); 553 print_APIC_field(APIC_IRR);
555 554
556 /* !82489DX */ 555 /* !82489DX */
@@ -560,48 +559,48 @@ static void __init print_local_APIC(void *dummy)
560 apic_write(APIC_ESR, 0); 559 apic_write(APIC_ESR, 0);
561 560
562 v = apic_read(APIC_ESR); 561 v = apic_read(APIC_ESR);
563 printk(KERN_DEBUG "... APIC ESR: %08x\n", v); 562 pr_debug("... APIC ESR: %08x\n", v);
564 } 563 }
565 564
566 icr = apic_icr_read(); 565 icr = apic_icr_read();
567 printk(KERN_DEBUG "... APIC ICR: %08x\n", (u32)icr); 566 pr_debug("... APIC ICR: %08x\n", (u32)icr);
568 printk(KERN_DEBUG "... APIC ICR2: %08x\n", (u32)(icr >> 32)); 567 pr_debug("... APIC ICR2: %08x\n", (u32)(icr >> 32));
569 568
570 v = apic_read(APIC_LVTT); 569 v = apic_read(APIC_LVTT);
571 printk(KERN_DEBUG "... APIC LVTT: %08x\n", v); 570 pr_debug("... APIC LVTT: %08x\n", v);
572 571
573 if (maxlvt > 3) { 572 if (maxlvt > 3) {
574 /* PC is LVT#4. */ 573 /* PC is LVT#4. */
575 v = apic_read(APIC_LVTPC); 574 v = apic_read(APIC_LVTPC);
576 printk(KERN_DEBUG "... APIC LVTPC: %08x\n", v); 575 pr_debug("... APIC LVTPC: %08x\n", v);
577 } 576 }
578 v = apic_read(APIC_LVT0); 577 v = apic_read(APIC_LVT0);
579 printk(KERN_DEBUG "... APIC LVT0: %08x\n", v); 578 pr_debug("... APIC LVT0: %08x\n", v);
580 v = apic_read(APIC_LVT1); 579 v = apic_read(APIC_LVT1);
581 printk(KERN_DEBUG "... APIC LVT1: %08x\n", v); 580 pr_debug("... APIC LVT1: %08x\n", v);
582 581
583 if (maxlvt > 2) { 582 if (maxlvt > 2) {
584 /* ERR is LVT#3. */ 583 /* ERR is LVT#3. */
585 v = apic_read(APIC_LVTERR); 584 v = apic_read(APIC_LVTERR);
586 printk(KERN_DEBUG "... APIC LVTERR: %08x\n", v); 585 pr_debug("... APIC LVTERR: %08x\n", v);
587 } 586 }
588 587
589 v = apic_read(APIC_TMICT); 588 v = apic_read(APIC_TMICT);
590 printk(KERN_DEBUG "... APIC TMICT: %08x\n", v); 589 pr_debug("... APIC TMICT: %08x\n", v);
591 v = apic_read(APIC_TMCCT); 590 v = apic_read(APIC_TMCCT);
592 printk(KERN_DEBUG "... APIC TMCCT: %08x\n", v); 591 pr_debug("... APIC TMCCT: %08x\n", v);
593 v = apic_read(APIC_TDCR); 592 v = apic_read(APIC_TDCR);
594 printk(KERN_DEBUG "... APIC TDCR: %08x\n", v); 593 pr_debug("... APIC TDCR: %08x\n", v);
595 594
596 if (boot_cpu_has(X86_FEATURE_EXTAPIC)) { 595 if (boot_cpu_has(X86_FEATURE_EXTAPIC)) {
597 v = apic_read(APIC_EFEAT); 596 v = apic_read(APIC_EFEAT);
598 maxlvt = (v >> 16) & 0xff; 597 maxlvt = (v >> 16) & 0xff;
599 printk(KERN_DEBUG "... APIC EFEAT: %08x\n", v); 598 pr_debug("... APIC EFEAT: %08x\n", v);
600 v = apic_read(APIC_ECTRL); 599 v = apic_read(APIC_ECTRL);
601 printk(KERN_DEBUG "... APIC ECTRL: %08x\n", v); 600 pr_debug("... APIC ECTRL: %08x\n", v);
602 for (i = 0; i < maxlvt; i++) { 601 for (i = 0; i < maxlvt; i++) {
603 v = apic_read(APIC_EILVTn(i)); 602 v = apic_read(APIC_EILVTn(i));
604 printk(KERN_DEBUG "... APIC EILVT%d: %08x\n", i, v); 603 pr_debug("... APIC EILVT%d: %08x\n", i, v);
605 } 604 }
606 } 605 }
607 pr_cont("\n"); 606 pr_cont("\n");
@@ -631,15 +630,15 @@ static void __init print_PIC(void)
631 if (!nr_legacy_irqs()) 630 if (!nr_legacy_irqs())
632 return; 631 return;
633 632
634 printk(KERN_DEBUG "\nprinting PIC contents\n"); 633 pr_debug("\nprinting PIC contents\n");
635 634
636 raw_spin_lock_irqsave(&i8259A_lock, flags); 635 raw_spin_lock_irqsave(&i8259A_lock, flags);
637 636
638 v = inb(0xa1) << 8 | inb(0x21); 637 v = inb(0xa1) << 8 | inb(0x21);
639 printk(KERN_DEBUG "... PIC IMR: %04x\n", v); 638 pr_debug("... PIC IMR: %04x\n", v);
640 639
641 v = inb(0xa0) << 8 | inb(0x20); 640 v = inb(0xa0) << 8 | inb(0x20);
642 printk(KERN_DEBUG "... PIC IRR: %04x\n", v); 641 pr_debug("... PIC IRR: %04x\n", v);
643 642
644 outb(0x0b, 0xa0); 643 outb(0x0b, 0xa0);
645 outb(0x0b, 0x20); 644 outb(0x0b, 0x20);
@@ -649,10 +648,10 @@ static void __init print_PIC(void)
649 648
650 raw_spin_unlock_irqrestore(&i8259A_lock, flags); 649 raw_spin_unlock_irqrestore(&i8259A_lock, flags);
651 650
652 printk(KERN_DEBUG "... PIC ISR: %04x\n", v); 651 pr_debug("... PIC ISR: %04x\n", v);
653 652
654 v = inb(0x4d1) << 8 | inb(0x4d0); 653 v = inb(0x4d1) << 8 | inb(0x4d0);
655 printk(KERN_DEBUG "... PIC ELCR: %04x\n", v); 654 pr_debug("... PIC ELCR: %04x\n", v);
656} 655}
657 656
658static int show_lapic __initdata = 1; 657static int show_lapic __initdata = 1;