aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorAndrew Patterson <andrew.patterson@hp.com>2008-11-10 15:31:05 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-01-07 11:12:31 -0800
commit07ae95f988a34465bdcb384bfa73c03424fe2312 (patch)
tree4e1901b7fd2ccfdb85a92953c0010a4d3900a3f8 /drivers/acpi
parenteb9188bdb9d65aeead2382ec3dd656a17ec8936d (diff)
downloadkernel_samsung_tuna-07ae95f988a34465bdcb384bfa73c03424fe2312.zip
kernel_samsung_tuna-07ae95f988a34465bdcb384bfa73c03424fe2312.tar.gz
kernel_samsung_tuna-07ae95f988a34465bdcb384bfa73c03424fe2312.tar.bz2
ACPI/PCI: PCI MSI _OSC support capabilities called when root bridge added
The _OSC capability OSC_MSI_SUPPORT is set when the root bridge is added with pci_acpi_osc_support(), so we no longer need to do it in the PCI MSI driver. Also adds the function pci_msi_enabled, which returns true if pci=nomsi is not on the kernel command-line. Signed-off-by: Andrew Patterson <andrew.patterson@hp.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/pci_root.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 9fe026b..5b38a02 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -350,6 +350,8 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
if (pcie_aspm_enabled())
flags |= OSC_ACTIVE_STATE_PWR_SUPPORT |
OSC_CLOCK_PWR_CAPABILITY_SUPPORT;
+ if (pci_msi_enabled())
+ flags |= OSC_MSI_SUPPORT;
if (flags != base_flags)
pci_acpi_osc_support(device->handle, flags);