aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/pcie
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/pcie')
-rw-r--r--drivers/pci/pcie/aer/aerdrv_acpi.c6
-rw-r--r--drivers/pci/pcie/pme/pcie_pme_acpi.c8
2 files changed, 8 insertions, 6 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c
index f278d7b0d95d..3a276a0cea93 100644
--- a/drivers/pci/pcie/aer/aerdrv_acpi.c
+++ b/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -39,9 +39,9 @@ int aer_osc_setup(struct pcie_device *pciedev)
39 39
40 handle = acpi_find_root_bridge_handle(pdev); 40 handle = acpi_find_root_bridge_handle(pdev);
41 if (handle) { 41 if (handle) {
42 status = acpi_pci_osc_control_set(handle, 42 u32 flags = OSC_PCI_EXPRESS_AER_CONTROL |
43 OSC_PCI_EXPRESS_AER_CONTROL | 43 OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL;
44 OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL); 44 status = acpi_pci_osc_control_set(handle, &flags, flags);
45 } 45 }
46 46
47 if (ACPI_FAILURE(status)) { 47 if (ACPI_FAILURE(status)) {
diff --git a/drivers/pci/pcie/pme/pcie_pme_acpi.c b/drivers/pci/pcie/pme/pcie_pme_acpi.c
index 83ab2287ae3f..be20222b12d3 100644
--- a/drivers/pci/pcie/pme/pcie_pme_acpi.c
+++ b/drivers/pci/pcie/pme/pcie_pme_acpi.c
@@ -28,6 +28,7 @@ int pcie_pme_acpi_setup(struct pcie_device *srv)
28 acpi_status status = AE_NOT_FOUND; 28 acpi_status status = AE_NOT_FOUND;
29 struct pci_dev *port = srv->port; 29 struct pci_dev *port = srv->port;
30 acpi_handle handle; 30 acpi_handle handle;
31 u32 flags;
31 int error = 0; 32 int error = 0;
32 33
33 if (acpi_pci_disabled) 34 if (acpi_pci_disabled)
@@ -39,9 +40,10 @@ int pcie_pme_acpi_setup(struct pcie_device *srv)
39 if (!handle) 40 if (!handle)
40 return -EINVAL; 41 return -EINVAL;
41 42
42 status = acpi_pci_osc_control_set(handle, 43 flags = OSC_PCI_EXPRESS_PME_CONTROL |
43 OSC_PCI_EXPRESS_PME_CONTROL | 44 OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL;
44 OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL); 45
46 status = acpi_pci_osc_control_set(handle, &flags, flags);
45 if (ACPI_FAILURE(status)) { 47 if (ACPI_FAILURE(status)) {
46 dev_info(&port->dev, 48 dev_info(&port->dev,
47 "Failed to receive control of PCIe PME service: %s\n", 49 "Failed to receive control of PCIe PME service: %s\n",