]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From 07ae95f988a34465bdcb384bfa73c03424fe2312 Mon Sep 17 00:00:00 2001 |
2 | From: Andrew Patterson <andrew.patterson@hp.com> | |
3 | Date: Mon, 10 Nov 2008 15:31:05 -0700 | |
4 | Subject: ACPI/PCI: PCI MSI _OSC support capabilities called when root bridge added | |
5 | Patch-mainline: 2.6.29 | |
6 | References: bnc#438941 | |
7 | ||
8 | The _OSC capability OSC_MSI_SUPPORT is set when the root bridge is added | |
9 | with pci_acpi_osc_support(), so we no longer need to do it in the PCI | |
10 | MSI driver. Also adds the function pci_msi_enabled, which returns true | |
11 | if pci=nomsi is not on the kernel command-line. | |
12 | ||
13 | Signed-off-by: Andrew Patterson <andrew.patterson@hp.com> | |
14 | Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> | |
15 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
16 | ||
17 | Automatically created from "patches.drivers/acpi-pci-pci-msi-_osc-support-capabilities-called-when-root-bridge-added.patch" by xen-port-patches.py | |
18 | ||
19 | --- sle11-2009-04-20.orig/drivers/pci/msi-xen.c 2009-04-24 13:36:45.000000000 +0200 | |
20 | +++ sle11-2009-04-20/drivers/pci/msi-xen.c 2009-01-09 11:10:27.000000000 +0100 | |
21 | @@ -804,6 +804,17 @@ void pci_no_msi(void) | |
22 | pci_msi_enable = 0; | |
23 | } | |
24 | ||
25 | +/** | |
26 | + * pci_msi_enabled - is MSI enabled? | |
27 | + * | |
28 | + * Returns true if MSI has not been disabled by the command-line option | |
29 | + * pci=nomsi. | |
30 | + **/ | |
31 | +int pci_msi_enabled(void) | |
32 | +{ | |
33 | + return pci_msi_enable; | |
34 | +} | |
35 | + | |
36 | void pci_msi_init_pci_dev(struct pci_dev *dev) | |
37 | { | |
38 | #ifndef CONFIG_XEN |