Attachment 311779 Details for Bug 451081 – Dump all the APIC and PIC state

[patch] Dump all the APIC and PIC state

patch-2.6.26-rc1-20080505-all-pic-dump-6 (text/plain), 4.12 KB, created by Maciej W. Rozycki on 2008-07-14 21:27:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maciej W. Rozycki

Created: 2008-07-14 21:27:21 UTC

Size: 4.12 KB

patch

obsolete

>diff -up --recursive --new-file linux-2.6.26-rc1-20080505.macro/arch/x86/kernel/io_apic_32.c linux-2.6.26-rc1-20080505/arch/x86/kernel/io_apic_32.c
>--- linux-2.6.26-rc1-20080505.macro/arch/x86/kernel/io_apic_32.c	2008-05-05 02:55:24.000000000 +0000
>+++ linux-2.6.26-rc1-20080505/arch/x86/kernel/io_apic_32.c	2008-07-10 21:09:01.000000000 +0000
>@@ -1457,8 +1457,6 @@ void __init print_IO_APIC(void)
> 	return;
> }
> 
>-#if 0
>-
> static void print_APIC_bitfield (int base)
> {
> 	unsigned int v;
>@@ -1489,15 +1487,16 @@ void /*__init*/ print_local_APIC(void * 
> 
> 	printk("\n" KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n",
> 		smp_processor_id(), hard_smp_processor_id());
>-	printk(KERN_INFO "... APIC ID:      %08x (%01x)\n", v,
>-			GET_APIC_ID(read_apic_id()));
>+	v = read_apic_id();
>+	printk(KERN_INFO "... APIC ID:      %08x (%01x)\n", v, GET_APIC_ID(v));
> 	v = apic_read(APIC_LVR);
> 	printk(KERN_INFO "... APIC VERSION: %08x\n", v);
> 	ver = GET_APIC_VERSION(v);
> 	maxlvt = lapic_get_maxlvt();
> 
> 	v = apic_read(APIC_TASKPRI);
>-	printk(KERN_DEBUG "... APIC TASKPRI: %08x (%02x)\n", v, v & APIC_TPRI_MASK);
>+	printk(KERN_DEBUG "... APIC TASKPRI: %08x (%02x)\n",
>+	       v, v & APIC_TPRI_MASK);
> 
> 	if (APIC_INTEGRATED(ver)) {			/* !82489DX */
> 		v = apic_read(APIC_ARBPRI);
>@@ -1600,7 +1599,20 @@ void /*__init*/ print_PIC(void)
> 	printk(KERN_DEBUG "... PIC ELCR: %04x\n", v);
> }
> 
>-#endif  /*  0  */
>+int __init all_pic_dump(void)
>+{
>+	int v = apic_verbosity;
>+
>+	apic_verbosity = APIC_DEBUG;
>+	print_IO_APIC();
>+	print_all_local_APICs();
>+	print_PIC();
>+	apic_verbosity = v;
>+
>+	return 0;
>+}
>+
>+late_initcall(all_pic_dump);
> 
> static void __init enable_IO_APIC(void)
> {
>@@ -2290,8 +2302,13 @@ void __init setup_IO_APIC(void)
> 	setup_IO_APIC_irqs();
> 	init_IO_APIC_traps();
> 	check_timer();
>-	if (!acpi_ioapic)
>+	if (1 || !acpi_ioapic) {
>+		int v = apic_verbosity;
>+
>+		apic_verbosity = APIC_DEBUG;
> 		print_IO_APIC();
>+		apic_verbosity = v;
>+	}
> }
> 
> static int __init setup_disable_8254_timer(char *s)
>diff -up --recursive --new-file linux-2.6.26-rc1-20080505.macro/arch/x86/kernel/io_apic_64.c linux-2.6.26-rc1-20080505/arch/x86/kernel/io_apic_64.c
>--- linux-2.6.26-rc1-20080505.macro/arch/x86/kernel/io_apic_64.c	2008-05-05 02:55:24.000000000 +0000
>+++ linux-2.6.26-rc1-20080505/arch/x86/kernel/io_apic_64.c	2008-07-10 22:45:51.000000000 +0000
>@@ -45,6 +45,7 @@
> #include <asm/proto.h>
> #include <asm/acpi.h>
> #include <asm/dma.h>
>+#include <asm/i8259.h>
> #include <asm/nmi.h>
> #include <asm/msidef.h>
> #include <asm/hypertransport.h>
>@@ -1045,8 +1046,6 @@ void __apicdebuginit print_IO_APIC(void)
> 	return;
> }
> 
>-#if 0
>-
> static __apicdebuginit void print_APIC_bitfield (int base)
> {
> 	unsigned int v;
>@@ -1077,14 +1076,16 @@ void __apicdebuginit print_local_APIC(vo
> 
> 	printk("\n" KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n",
> 		smp_processor_id(), hard_smp_processor_id());
>-	printk(KERN_INFO "... APIC ID:      %08x (%01x)\n", v, GET_APIC_ID(read_apic_id()));
>+	v = read_apic_id();
>+	printk(KERN_INFO "... APIC ID:      %08x (%01x)\n", v, GET_APIC_ID(v));
> 	v = apic_read(APIC_LVR);
> 	printk(KERN_INFO "... APIC VERSION: %08x\n", v);
> 	ver = GET_APIC_VERSION(v);
> 	maxlvt = lapic_get_maxlvt();
> 
> 	v = apic_read(APIC_TASKPRI);
>-	printk(KERN_DEBUG "... APIC TASKPRI: %08x (%02x)\n", v, v & APIC_TPRI_MASK);
>+	printk(KERN_DEBUG "... APIC TASKPRI: %08x (%02x)\n",
>+	       v, v & APIC_TPRI_MASK);
> 
> 	v = apic_read(APIC_ARBPRI);
> 	printk(KERN_DEBUG "... APIC ARBPRI: %08x (%02x)\n", v,
>@@ -1181,7 +1182,20 @@ void __apicdebuginit print_PIC(void)
> 	printk(KERN_DEBUG "... PIC ELCR: %04x\n", v);
> }
> 
>-#endif  /*  0  */
>+int __init all_pic_dump(void)
>+{
>+	int v = apic_verbosity;
>+
>+	apic_verbosity = APIC_DEBUG;
>+	print_IO_APIC();
>+	print_all_local_APICs();
>+	print_PIC();
>+	apic_verbosity = v;
>+
>+	return 0;
>+}
>+
>+late_initcall(all_pic_dump);
> 
> void __init enable_IO_APIC(void)
> {
>@@ -1804,8 +1818,13 @@ void __init setup_IO_APIC(void)
> 	setup_IO_APIC_irqs();
> 	init_IO_APIC_traps();
> 	check_timer();
>-	if (!acpi_ioapic)
>+	if (1 || !acpi_ioapic) {
>+		int v = apic_verbosity;
>+
>+		apic_verbosity = APIC_DEBUG;
> 		print_IO_APIC();
>+		apic_verbosity = v;
>+	}
> }
> 
> struct sysfs_ioapic_data {

Actions: View | Diff

Attachments on bug 451081: 309113 | 311779 | 312226 | 312727