x86/pci: Use cached pci_dev->pcie_cap to simplify code

The PCI core caches the PCIe Capability offset in pci_dev->pcie_cap, so
use that instead of pci_find_capability().  Use pci_bus_set_ops() when
replacing the device pci_ops.  And use #defines instead of numeric
constants.

[bhelgaas: changelog, also use PCI_EXP_LNKCTL_ASPMC]
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

1 files changed, 10 insertions, 8 deletions

diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index f5809fa2753e..b046e070e088 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -231,7 +231,7 @@ static int quirk_pcie_aspm_write(struct pci_bus *bus, unsigned int devfn, int wh
         offset = quirk_aspm_offset[GET_INDEX(bus->self->device, devfn)];
 
         if ((offset) && (where == offset))
-                value = value & 0xfffffffc;
+                value = value & ~PCI_EXP_LNKCTL_ASPMC;
 
         return raw_pci_write(pci_domain_nr(bus), bus->number,
                                                 devfn, where, size, value);
@@ -252,7 +252,7 @@ static struct pci_ops quirk_pcie_aspm_ops = {
  */
 static void pcie_rootport_aspm_quirk(struct pci_dev *pdev)
 {
-        int cap_base, i;
+        int i;
         struct pci_bus  *pbus;
         struct pci_dev *dev;
 
@@ -278,7 +278,7 @@ static void pcie_rootport_aspm_quirk(struct pci_dev *pdev)
                 for (i = GET_INDEX(pdev->device, 0); i <= GET_INDEX(pdev->device, 7); ++i)
                         quirk_aspm_offset[i] = 0;
 
-                pbus->ops = pbus->parent->ops;
+                pci_bus_set_ops(pbus, pbus->parent->ops);
         } else {
                 /*
                  * If devices are attached to the root port at power-up or
@@ -286,13 +286,15 @@ static void pcie_rootport_aspm_quirk(struct pci_dev *pdev)
                  * each root port to save the register offsets and replace the
                  * bus ops.
                  */
-                list_for_each_entry(dev, &pbus->devices, bus_list) {
+                list_for_each_entry(dev, &pbus->devices, bus_list)
                         /* There are 0 to 8 devices attached to this bus */
-                        cap_base = pci_find_capability(dev, PCI_CAP_ID_EXP);
-                        quirk_aspm_offset[GET_INDEX(pdev->device, dev->devfn)] = cap_base + 0x10;
-                }
-                pbus->ops = &quirk_pcie_aspm_ops;
+                        quirk_aspm_offset[GET_INDEX(pdev->device, dev->devfn)] =
+                                dev->pcie_cap + PCI_EXP_LNKCTL;
+
+                pci_bus_set_ops(pbus, &quirk_pcie_aspm_ops);
+                dev_info(&pbus->dev, "writes to ASPM control bits will be ignored\n");
         }
+
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_MCH_PA,     pcie_rootport_aspm_quirk);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_MCH_PA1,    pcie_rootport_aspm_quirk);