Attachment 83861 Details for Bug 116364

[patch] randy's patch rebased against our current CVS head kernel

msi_disable2.patch (text/plain), 7.09 KB, created by Thomas Renninger on 2006-05-17 14:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Renninger

Created: 2006-05-17 14:10:00 UTC

Size: 7.09 KB

patch

obsolete

>From: Randy Dunlap <rdunlap@xenotime.net>
>
>MSI requires local APIC + IO APIC support (according to Kconfig),
>but if a kernel is built with all of those (APICs + CONFIG_PCI_MSI)
>and then booted with "nosmp" or "max_cpus=0|1" or "noapic" or
>"nolapic", MSI also should be disabled, otherwise the interrupt
>routing is bad (so that only using "irqpoll" helps).
>
>Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
> arch/i386/kernel/io_apic.c   |    2 ++
> arch/i386/kernel/smpboot.c   |    6 +++++-
> arch/x86_64/kernel/apic.c    |    6 +++++-
> arch/x86_64/kernel/io_apic.c |    2 ++
> arch/x86_64/kernel/setup.c   |    4 +++-
> arch/x86_64/kernel/smpboot.c |   11 +++++++++--
> drivers/pci/msi.c            |    5 +++++
> include/linux/pci.h          |    2 ++
> 8 files changed, 33 insertions(+), 5 deletions(-)
>
>Index: linux-2.6.16/arch/i386/kernel/io_apic.c
>===================================================================
>--- linux-2.6.16.orig/arch/i386/kernel/io_apic.c
>+++ linux-2.6.16/arch/i386/kernel/io_apic.c
>@@ -33,6 +33,7 @@
> #include <linux/mc146818rtc.h>
> #include <linux/compiler.h>
> #include <linux/acpi.h>
>+#include <linux/pci.h>
> #include <linux/module.h>
> #include <linux/sysdev.h>
> 
>@@ -691,6 +692,7 @@ int skip_ioapic_setup;
> static int __init ioapic_setup(char *str)
> {
> 	skip_ioapic_setup = 1;
>+	msi_off();
> 	return 1;
> }
> 
>Index: linux-2.6.16/arch/i386/kernel/smpboot.c
>===================================================================
>--- linux-2.6.16.orig/arch/i386/kernel/smpboot.c
>+++ linux-2.6.16/arch/i386/kernel/smpboot.c
>@@ -48,6 +48,7 @@
> #endif	/* CONFIG_KDB */
> #include <linux/notifier.h>
> #include <linux/cpu.h>
>+#include <linux/pci.h>
> #include <linux/percpu.h>
> 
> #include <linux/delay.h>
>@@ -1147,9 +1148,11 @@ static void __init smp_boot_cpus(unsigne
> 		printk(KERN_NOTICE "SMP motherboard not detected.\n");
> 		smpboot_clear_io_apic_irqs();
> 		phys_cpu_present_map = physid_mask_of_physid(0);
>-		if (APIC_init_uniprocessor())
>+		if (APIC_init_uniprocessor()) {
> 			printk(KERN_NOTICE "Local APIC not detected."
> 					   " Using dummy APIC emulation.\n");
>+			msi_off();
>+		}
> 		map_cpu_to_logical_apicid();
> 		cpu_set(0, cpu_sibling_map[0]);
> 		cpu_set(0, cpu_core_map[0]);
>@@ -1190,6 +1193,7 @@ static void __init smp_boot_cpus(unsigne
> 		smp_found_config = 0;
> 		printk(KERN_INFO "SMP mode deactivated, forcing use of dummy APIC emulation.\n");
> 		smpboot_clear_io_apic_irqs();
>+		msi_off();
> 		phys_cpu_present_map = physid_mask_of_physid(0);
> 		cpu_set(0, cpu_sibling_map[0]);
> 		cpu_set(0, cpu_core_map[0]);
>Index: linux-2.6.16/arch/x86_64/kernel/apic.c
>===================================================================
>--- linux-2.6.16.orig/arch/x86_64/kernel/apic.c
>+++ linux-2.6.16/arch/x86_64/kernel/apic.c
>@@ -24,6 +24,7 @@
> #include <linux/interrupt.h>
> #include <linux/mc146818rtc.h>
> #include <linux/kernel_stat.h>
>+#include <linux/pci.h>
> #include <linux/sysdev.h>
> #include <linux/module.h>
> 
>@@ -1126,8 +1127,10 @@ int __init APIC_init_uniprocessor (void)
> #ifdef CONFIG_X86_IO_APIC
> 	if (smp_found_config && !skip_ioapic_setup && nr_ioapics)
> 			setup_IO_APIC();
>-	else
>+	else {
> 		nr_ioapics = 0;
>+		msi_off();
>+	}
> #endif
> 	setup_boot_APIC_clock();
> 	check_nmi_watchdog();
>@@ -1143,6 +1146,7 @@ static __init int setup_disableapic(char
> static __init int setup_nolapic(char *str) 
> { 
> 	disable_apic = 1;
>+	msi_off();
> 	return 0;
> } 
> 
>Index: linux-2.6.16/arch/x86_64/kernel/io_apic.c
>===================================================================
>--- linux-2.6.16.orig/arch/x86_64/kernel/io_apic.c
>+++ linux-2.6.16/arch/x86_64/kernel/io_apic.c
>@@ -29,6 +29,7 @@
> #include <linux/smp_lock.h>
> #include <linux/mc146818rtc.h>
> #include <linux/acpi.h>
>+#include <linux/pci.h>
> #include <linux/sysdev.h>
> #ifdef CONFIG_ACPI
> #include <acpi/acpi_bus.h>
>@@ -240,6 +241,7 @@ int ioapic_force;
> static int __init disable_ioapic_setup(char *str)
> {
> 	skip_ioapic_setup = 1;
>+	msi_off();
> 	return 1;
> }
> 
>Index: linux-2.6.16/arch/x86_64/kernel/smpboot.c
>===================================================================
>--- linux-2.6.16.orig/arch/x86_64/kernel/smpboot.c
>+++ linux-2.6.16/arch/x86_64/kernel/smpboot.c
>@@ -47,6 +47,7 @@
> #include <linux/bootmem.h>
> #include <linux/thread_info.h>
> #include <linux/module.h>
>+#include <linux/pci.h>
> 
> #include <linux/delay.h>
> #include <linux/mc146818rtc.h>
>@@ -1002,9 +1003,11 @@ static int __init smp_sanity_check(unsig
> 	if (!smp_found_config) {
> 		printk(KERN_NOTICE "SMP motherboard not detected.\n");
> 		disable_smp();
>-		if (APIC_init_uniprocessor())
>+		if (APIC_init_uniprocessor()) {
> 			printk(KERN_NOTICE "Local APIC not detected."
> 					   " Using dummy APIC emulation.\n");
>+			msi_off();
>+		}
> 		return -1;
> 	}
> 
>@@ -1026,6 +1029,7 @@ static int __init smp_sanity_check(unsig
> 			boot_cpu_id);
> 		printk(KERN_ERR "... forcing use of dummy APIC emulation. (tell your hw vendor)\n");
> 		nr_ioapics = 0;
>+		msi_off();
> 		return -1;
> 	}
> 
>@@ -1035,6 +1039,7 @@ static int __init smp_sanity_check(unsig
> 	if (!max_cpus) {
> 		printk(KERN_INFO "SMP mode deactivated, forcing use of dummy APIC emulation.\n");
> 		nr_ioapics = 0;
>+		msi_off();
> 		return -1;
> 	}
> 
>@@ -1076,8 +1081,10 @@ void __init smp_prepare_cpus(unsigned in
> 	 */
> 	if (!skip_ioapic_setup && nr_ioapics)
> 		setup_IO_APIC();
>-	else
>+	else {
> 		nr_ioapics = 0;
>+		msi_off();
>+	}
> 
> 	/*
> 	 * Set up local APIC timer on boot CPU.
>Index: linux-2.6.16/drivers/pci/msi.c
>===================================================================
>--- linux-2.6.16.orig/drivers/pci/msi.c
>+++ linux-2.6.16/drivers/pci/msi.c
>@@ -1148,6 +1148,11 @@ void pci_no_msi(void)
> 	pci_msi_enable = 0;
> }
> 
>+void msi_off(void)
>+{
>+	pci_msi_enable = 0;
>+}
>+
> EXPORT_SYMBOL(pci_enable_msi);
> EXPORT_SYMBOL(pci_disable_msi);
> EXPORT_SYMBOL(pci_enable_msix);
>Index: linux-2.6.16/include/linux/pci.h
>===================================================================
>--- linux-2.6.16.orig/include/linux/pci.h
>+++ linux-2.6.16/include/linux/pci.h
>@@ -559,6 +559,7 @@ static inline int pci_enable_msix(struct
> 	struct msix_entry *entries, int nvec) {return -1;}
> static inline void pci_disable_msix(struct pci_dev *dev) {}
> static inline void msi_remove_pci_irq_vectors(struct pci_dev *dev) {}
>+static inline void msi_off(void) {}
> #else
> extern void pci_scan_msi_device(struct pci_dev *dev);
> extern int pci_enable_msi(struct pci_dev *dev);
>@@ -567,6 +568,7 @@ extern int pci_enable_msix(struct pci_de
> 	struct msix_entry *entries, int nvec);
> extern void pci_disable_msix(struct pci_dev *dev);
> extern void msi_remove_pci_irq_vectors(struct pci_dev *dev);
>+extern void msi_off(void);
> #endif
> 
> extern void pci_block_user_cfg_access(struct pci_dev *dev);
>Index: linux-2.6.16/arch/x86_64/kernel/setup.c
>===================================================================
>--- linux-2.6.16.orig/arch/x86_64/kernel/setup.c
>+++ linux-2.6.16/arch/x86_64/kernel/setup.c
>@@ -346,8 +346,10 @@ static __init void parse_cmdline_early (
> 
> 		/* Don't confuse with noapictimer */
> 		if (!memcmp(from, "noapic", 6) &&
>-			(from[6] == ' ' || from[6] == 0))
>+		    (from[6] == ' ' || from[6] == 0)){
> 			skip_ioapic_setup = 1;
>+			msi_off();
>+		}
> 
> 		/* Make sure to not confuse with apic= */
> 		if (!memcmp(from, "apic", 4) &&

Actions: View | Diff

Attachments on bug 116364: 49557 | 49558 | 49570 | 49572 | 49590 | 49591 | 49608 | 49609 | 50889 | 83861 | 83905 | 83907 | 83925