Merge branch 'pci/bjorn-pcie-cap' into next

* pci/bjorn-pcie-cap:
  ath9k: Use standard #defines for PCIe Capability ASPM fields
  iwlwifi: Use standard #defines for PCIe Capability ASPM fields
  iwlwifi: collapse wrapper for pcie_capability_read_word()
  iwlegacy: Use standard #defines for PCIe Capability ASPM fields
  iwlegacy: collapse wrapper for pcie_capability_read_word()
  cxgb3: Use standard #defines for PCIe Capability ASPM fields
  PCI: Add standard PCIe Capability Link ASPM field names
  PCI/portdrv: Use PCI Express Capability accessors
  PCI: Use standard PCIe Capability Link register field names
  PCI: Add and use standard PCI-X Capability register names

3 files changed, 18 insertions, 15 deletions

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 3da9ecc9ab84..b52630b8eada 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -426,7 +426,8 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist)
 
 static void pcie_config_aspm_dev(struct pci_dev *pdev, u32 val)
 {
-        pcie_capability_clear_and_set_word(pdev, PCI_EXP_LNKCTL, 0x3, val);
+        pcie_capability_clear_and_set_word(pdev, PCI_EXP_LNKCTL,
+                                           PCI_EXP_LNKCTL_ASPMC, val);
 }
 
 static void pcie_config_aspm_link(struct pcie_link_state *link, u32 state)
@@ -441,12 +442,12 @@ static void pcie_config_aspm_link(struct pcie_link_state *link, u32 state)
                 return;
         /* Convert ASPM state to upstream/downstream ASPM register state */
         if (state & ASPM_STATE_L0S_UP)
-                dwstream |= PCIE_LINK_STATE_L0S;
+                dwstream |= PCI_EXP_LNKCTL_ASPM_L0S;
         if (state & ASPM_STATE_L0S_DW)
-                upstream |= PCIE_LINK_STATE_L0S;
+                upstream |= PCI_EXP_LNKCTL_ASPM_L0S;
         if (state & ASPM_STATE_L1) {
-                upstream |= PCIE_LINK_STATE_L1;
-                dwstream |= PCIE_LINK_STATE_L1;
+                upstream |= PCI_EXP_LNKCTL_ASPM_L1;
+                dwstream |= PCI_EXP_LNKCTL_ASPM_L1;
         }
         /*
          * Spec 2.0 suggests all functions should be configured the
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index ed129b414624..b42133afca98 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -120,8 +120,7 @@ static int pcie_port_enable_msix(struct pci_dev *dev, int *vectors, int mask)
                  * the value in this field indicates which MSI-X Table entry is
                  * used to generate the interrupt message."
                  */
-                pos = pci_pcie_cap(dev);
-                pci_read_config_word(dev, pos + PCI_EXP_FLAGS, &reg16);
+                pcie_capability_read_word(dev, PCI_EXP_FLAGS, &reg16);
                 entry = (reg16 & PCI_EXP_FLAGS_IRQ) >> 9;
                 if (entry >= nr_entries)
                         goto Error;
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 293af5a6f912..d46ef2df23da 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -521,7 +521,7 @@ static unsigned char pcie_link_speed[] = {
 
 void pcie_update_link_speed(struct pci_bus *bus, u16 linksta)
 {
-        bus->cur_bus_speed = pcie_link_speed[linksta & 0xf];
+        bus->cur_bus_speed = pcie_link_speed[linksta & PCI_EXP_LNKSTA_CLS];
 }
 EXPORT_SYMBOL_GPL(pcie_update_link_speed);
 
@@ -579,14 +579,16 @@ static void pci_set_bus_speed(struct pci_bus *bus)
         if (pos) {
                 u16 status;
                 enum pci_bus_speed max;
-                pci_read_config_word(bridge, pos + 2, &status);
 
-                if (status & 0x8000) {
+                pci_read_config_word(bridge, pos + PCI_X_BRIDGE_SSTATUS,
+                                     &status);
+
+                if (status & PCI_X_SSTATUS_533MHZ) {
                         max = PCI_SPEED_133MHz_PCIX_533;
-                } else if (status & 0x4000) {
+                } else if (status & PCI_X_SSTATUS_266MHZ) {
                         max = PCI_SPEED_133MHz_PCIX_266;
-                } else if (status & 0x0002) {
-                        if (((status >> 12) & 0x3) == 2) {
+                } else if (status & PCI_X_SSTATUS_133MHZ) {
+                        if ((status & PCI_X_SSTATUS_VERS) == PCI_X_SSTATUS_V2) {
                                 max = PCI_SPEED_133MHz_PCIX_ECC;
                         } else {
                                 max = PCI_SPEED_133MHz_PCIX;
@@ -596,7 +598,8 @@ static void pci_set_bus_speed(struct pci_bus *bus)
                 }
 
                 bus->max_bus_speed = max;
-                bus->cur_bus_speed = pcix_bus_speed[(status >> 6) & 0xf];
+                bus->cur_bus_speed = pcix_bus_speed[
+                        (status & PCI_X_SSTATUS_FREQ) >> 6];
 
                 return;
         }
@@ -607,7 +610,7 @@ static void pci_set_bus_speed(struct pci_bus *bus)
                 u16 linksta;
 
                 pcie_capability_read_dword(bridge, PCI_EXP_LNKCAP, &linkcap);
-                bus->max_bus_speed = pcie_link_speed[linkcap & 0xf];
+                bus->max_bus_speed = pcie_link_speed[linkcap & PCI_EXP_LNKCAP_SLS];
 
                 pcie_capability_read_word(bridge, PCI_EXP_LNKSTA, &linksta);
                 pcie_update_link_speed(bus, linksta);