|
@@ -33,6 +33,7 @@
|
|
|
#include <linux/pm_runtime.h>
|
|
|
#include <linux/pci.h>
|
|
|
#include <linux/pci-acpi.h>
|
|
|
+#include <linux/pci-aspm.h>
|
|
|
#include <linux/acpi.h>
|
|
|
#include <linux/slab.h>
|
|
|
#include <acpi/acpi_bus.h>
|
|
@@ -543,6 +544,14 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
|
|
|
if (flags != base_flags)
|
|
|
acpi_pci_osc_support(root, flags);
|
|
|
|
|
|
+ status = acpi_pci_osc_control_set(root->device->handle,
|
|
|
+ OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
|
|
|
+
|
|
|
+ if (ACPI_FAILURE(status)) {
|
|
|
+ printk(KERN_INFO "Unable to assume PCIe control: Disabling ASPM\n");
|
|
|
+ pcie_no_aspm();
|
|
|
+ }
|
|
|
+
|
|
|
pci_acpi_add_bus_pm_notifier(device, root->bus);
|
|
|
if (device->wakeup.flags.run_wake)
|
|
|
device_set_run_wake(root->bus->bridge, true);
|