Messages in this thread Patch in this message |  | | | From | Jeremy Fitzhardinge <> | | Subject | [PATCH 16/18] xen: disable MSI | | Date | Thu, 7 May 2009 14:14:41 -0700 |
| |
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Impact: prevent MSI subsystem from crashing
Disable MSI until we support it properly.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> --- arch/x86/xen/apic.c | 3 +++ drivers/pci/pci.h | 2 -- include/linux/pci.h | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c index e9d9ea7..3f890c4 100644 --- a/arch/x86/xen/apic.c +++ b/arch/x86/xen/apic.c @@ -1,6 +1,7 @@ #include <linux/kernel.h> #include <linux/threads.h> #include <linux/bitmap.h> +#include <linux/pci.h> #include <asm/io_apic.h> #include <asm/acpi.h> @@ -47,6 +48,8 @@ void xen_init_apic(void) if (!xen_initial_domain()) return; + pci_no_msi(); + #ifdef CONFIG_ACPI /* * Pretend ACPI found our lapic even though we've disabled it, diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index d03f6b9..79ada7b 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -111,10 +111,8 @@ extern struct rw_semaphore pci_bus_sem; extern unsigned int pci_pm_d3_delay; #ifdef CONFIG_PCI_MSI -void pci_no_msi(void); extern void pci_msi_init_pci_dev(struct pci_dev *dev); #else -static inline void pci_no_msi(void) { } static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { } #endif diff --git a/include/linux/pci.h b/include/linux/pci.h index 72698d8..724d030 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1253,5 +1253,11 @@ static inline irqreturn_t pci_sriov_migration(struct pci_dev *dev) } #endif +#ifdef CONFIG_PCI_MSI +void pci_no_msi(void); +#else +static inline void pci_no_msi(void) { } +#endif + #endif /* __KERNEL__ */ #endif /* LINUX_PCI_H */ -- 1.6.0.6
|  |