diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/pci_root.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 3e06d4e179ec..0e2004100c44 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c | |||
@@ -373,23 +373,18 @@ static void negotiate_os_control(struct acpi_pci_root *root, int *no_aspm, | |||
373 | * PCI domains, so we indicate this in _OSC support capabilities. | 373 | * PCI domains, so we indicate this in _OSC support capabilities. |
374 | */ | 374 | */ |
375 | support = base_support = OSC_PCI_SEGMENT_GROUPS_SUPPORT; | 375 | support = base_support = OSC_PCI_SEGMENT_GROUPS_SUPPORT; |
376 | acpi_pci_osc_support(root, support); | ||
377 | |||
378 | if (pci_ext_cfg_avail()) | 376 | if (pci_ext_cfg_avail()) |
379 | support |= OSC_PCI_EXT_CONFIG_SUPPORT; | 377 | support |= OSC_PCI_EXT_CONFIG_SUPPORT; |
380 | if (pcie_aspm_support_enabled()) { | 378 | if (pcie_aspm_support_enabled()) |
381 | support |= OSC_PCI_ASPM_SUPPORT | OSC_PCI_CLOCK_PM_SUPPORT; | 379 | support |= OSC_PCI_ASPM_SUPPORT | OSC_PCI_CLOCK_PM_SUPPORT; |
382 | } | ||
383 | if (pci_msi_enabled()) | 380 | if (pci_msi_enabled()) |
384 | support |= OSC_PCI_MSI_SUPPORT; | 381 | support |= OSC_PCI_MSI_SUPPORT; |
385 | if (support != base_support) { | 382 | status = acpi_pci_osc_support(root, support); |
386 | status = acpi_pci_osc_support(root, support); | 383 | if (ACPI_FAILURE(status)) { |
387 | if (ACPI_FAILURE(status)) { | 384 | dev_info(&device->dev, "ACPI _OSC support " |
388 | dev_info(&device->dev, "ACPI _OSC support " | 385 | "notification failed, disabling PCIe ASPM\n"); |
389 | "notification failed, disabling PCIe ASPM\n"); | 386 | *no_aspm = 1; |
390 | *no_aspm = 1; | 387 | support = base_support; |
391 | support = base_support; | ||
392 | } | ||
393 | } | 388 | } |
394 | 389 | ||
395 | if (!pcie_ports_disabled | 390 | if (!pcie_ports_disabled |