Attachment 312226 Details for Bug 451081 – new patch backported to 2.6.25

new patch backported to 2.6.25

linux-2.6-x86-apic-dump-all-regs-v3.patch (text/plain), 4.66 KB, created by Chuck Ebbert on 2008-07-21 03:02:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chuck Ebbert

Created: 2008-07-21 03:02:17 UTC

Size: 4.66 KB

patch

obsolete

>Dump all the PIC, local APIC and I/O APIC information at the
>fs_initcall() level, which is after ACPI (if used) has initialised PCI
>information, making the point of invocation consistent across MP-table and
>ACPI platforms.  Remove explicit calls to print_IO_APIC() from elsewhere.  
>Make the interface of all the functions involved consistent between 32-bit
>and 64-bit versions and make them all static by default by the means of a
>New-and-Improved(TM) __apicdebuginit() macro.
>
>Note that like print_IO_APIC() all these only output anything if 
>"apic=debug" has been passed to the kernel through the command line.
>
>Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
>---
>bz 451081
>diff -up --recursive --new-file linux-next-2.6.26-rc9-20080711.macro/arch/x86/kernel/io_apic_32.c linux-next-2.6.26-rc9-20080711/arch/x86/kernel/io_apic_32.c
>--- linux-next-2.6.26-rc9-20080711.macro/arch/x86/kernel/io_apic_32.c	2008-07-11 15:56:32.000000000 +0000
>+++ linux-next-2.6.26-rc9-20080711/arch/x86/kernel/io_apic_32.c	2008-07-15 23:19:56.000000000 +0000
>@@ -1492,8 +1492,6 @@ void __init print_IO_APIC(void)
> 	return;
> }
> 
>-#if 0
>-
> static void print_APIC_bitfield (int base)
> {
> 	unsigned int v;
>@@ -1633,7 +1631,17 @@ void /*__init*/ print_PIC(void)
> 	printk(KERN_DEBUG "... PIC ELCR: %04x\n", v);
> }
> 
>-#endif  /*  0  */
>+static int __init print_all_ICs(void)
>+{
>+	print_PIC();
>+	print_all_local_APICs();
>+	print_IO_APIC();
>+
>+	return 0;
>+}
>+
>+fs_initcall(print_all_ICs);
>+
> 
> static void __init enable_IO_APIC(void)
> {
>@@ -2324,8 +2332,6 @@ void __init setup_IO_APIC(void)
> 	setup_IO_APIC_irqs();
> 	init_IO_APIC_traps();
> 	check_timer();
>-	if (!acpi_ioapic)
>-		print_IO_APIC();
> }
> 
> static int __init setup_disable_8254_timer(char *s)
>diff -up --recursive --new-file linux-next-2.6.26-rc9-20080711.macro/arch/x86/kernel/io_apic_64.c linux-next-2.6.26-rc9-20080711/arch/x86/kernel/io_apic_64.c
>--- linux-next-2.6.26-rc9-20080711.macro/arch/x86/kernel/io_apic_64.c	2008-07-13 01:24:07.000000000 +0000
>+++ linux-next-2.6.26-rc9-20080711/arch/x86/kernel/io_apic_64.c	2008-07-15 23:20:45.000000000 +0000
>@@ -1065,8 +1065,6 @@ void __apicdebuginit print_IO_APIC(void)
> 	return;
> }
> 
>-#if 0
>-
> static __apicdebuginit void print_APIC_bitfield (int base)
> {
> 	unsigned int v;
>@@ -1202,7 +1200,17 @@ void __apicdebuginit print_PIC(void)
> 	printk(KERN_DEBUG "... PIC ELCR: %04x\n", v);
> }
> 
>-#endif  /*  0  */
>+static int __init print_all_ICs(void)
>+{
>+	print_PIC();
>+	print_all_local_APICs();
>+	print_IO_APIC();
>+
>+	return 0;
>+}
>+
>+fs_initcall(print_all_ICs);
>+
> 
> void __init enable_IO_APIC(void)
> {
>@@ -1848,8 +1856,6 @@ void __init setup_IO_APIC(void)
> 	setup_IO_APIC_irqs();
> 	init_IO_APIC_traps();
> 	check_timer();
>-	if (!acpi_ioapic)
>-		print_IO_APIC();
> }
> 
> struct sysfs_ioapic_data {
>diff -up --recursive --new-file linux-next-2.6.26-rc9-20080711.macro/arch/x86/pci/acpi.c linux-next-2.6.26-rc9-20080711/arch/x86/pci/acpi.c
>--- linux-next-2.6.26-rc9-20080711.macro/arch/x86/pci/acpi.c	2008-07-11 15:56:32.000000000 +0000
>+++ linux-next-2.6.26-rc9-20080711/arch/x86/pci/acpi.c	2008-07-15 23:10:13.000000000 +0000
>@@ -281,11 +281,6 @@ int __init pci_acpi_init(void)
> 	} else
> 		printk(KERN_INFO "PCI: If a device doesn't work, try \"pci=routeirq\".  If it helps, post a report\n");
> 
>-#ifdef CONFIG_X86_IO_APIC
>-	if (acpi_ioapic)
>-		print_IO_APIC();
>-#endif
>-
> 	return 0;
> }
> subsys_initcall(pci_acpi_init);
>diff -up --recursive --new-file linux-next-2.6.26-rc9-20080711.macro/include/asm-x86/hw_irq_32.h linux-next-2.6.26-rc9-20080711/include/asm-x86/hw_irq_32.h
>--- linux-next-2.6.26-rc9-20080711.macro/include/asm-x86/hw_irq_32.h	2008-07-09 18:01:22.000000000 +0000
>+++ linux-next-2.6.26-rc9-20080711/include/asm-x86/hw_irq_32.h	2008-07-15 23:26:41.000000000 +0000
>@@ -51,7 +51,6 @@ extern unsigned long io_apic_irqs;
> void init_VISWS_APIC_irqs(void);
> void setup_IO_APIC(void);
> void disable_IO_APIC(void);
>-void print_IO_APIC(void);
> int IO_APIC_get_PCI_irq_vector(int bus, int slot, int fn);
> void send_IPI(int dest, int vector);
> void setup_ioapic_dest(void);
>diff -up --recursive --new-file linux-next-2.6.26-rc9-20080711.macro/include/asm-x86/hw_irq_64.h linux-next-2.6.26-rc9-20080711/include/asm-x86/hw_irq_64.h
>--- linux-next-2.6.26-rc9-20080711.macro/include/asm-x86/hw_irq_64.h	2008-07-09 18:01:22.000000000 +0000
>+++ linux-next-2.6.26-rc9-20080711/include/asm-x86/hw_irq_64.h	2008-07-15 23:26:41.000000000 +0000
>@@ -137,7 +137,6 @@ extern unsigned long io_apic_irqs;
> extern void setup_IO_APIC(void);
> extern void enable_IO_APIC(void);
> extern void disable_IO_APIC(void);
>-extern void print_IO_APIC(void);
> extern int IO_APIC_get_PCI_irq_vector(int bus, int slot, int fn);
> extern void send_IPI(int dest, int vector);
> extern void setup_ioapic_dest(void);

Actions: View

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