Merge tag 'pci-v5.7-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[linux-2.6-microblaze.git] / drivers / pci / pci.c

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 8682131..595fcf5 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1560,7 +1560,7 @@ void pci_restore_state(struct pci_dev *dev)
        pci_restore_rebar_state(dev);
        pci_restore_dpc_state(dev);
 
-       pci_cleanup_aer_error_status_regs(dev);
+       pci_aer_clear_status(dev);
        pci_restore_aer_state(dev);
 
        pci_restore_config_space(dev);
@@ -5841,19 +5841,10 @@ enum pci_bus_speed pcie_get_speed_cap(struct pci_dev *dev)
         * where only 2.5 GT/s and 5.0 GT/s speeds were defined.
         */
        pcie_capability_read_dword(dev, PCI_EXP_LNKCAP2, &lnkcap2);
-       if (lnkcap2) { /* PCIe r3.0-compliant */
-               if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_32_0GB)
-                       return PCIE_SPEED_32_0GT;
-               else if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_16_0GB)
-                       return PCIE_SPEED_16_0GT;
-               else if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_8_0GB)
-                       return PCIE_SPEED_8_0GT;
-               else if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_5_0GB)
-                       return PCIE_SPEED_5_0GT;
-               else if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_2_5GB)
-                       return PCIE_SPEED_2_5GT;
-               return PCI_SPEED_UNKNOWN;
-       }
+
+       /* PCIe r3.0-compliant */
+       if (lnkcap2)
+               return PCIE_LNKCAP2_SLS2SPEED(lnkcap2);
 
        pcie_capability_read_dword(dev, PCI_EXP_LNKCAP, &lnkcap);
        if ((lnkcap & PCI_EXP_LNKCAP_SLS) == PCI_EXP_LNKCAP_SLS_5_0GB)
@@ -5929,14 +5920,14 @@ void __pcie_print_link_status(struct pci_dev *dev, bool verbose)
        if (bw_avail >= bw_cap && verbose)
                pci_info(dev, "%u.%03u Gb/s available PCIe bandwidth (%s x%d link)\n",
                         bw_cap / 1000, bw_cap % 1000,
-                        PCIE_SPEED2STR(speed_cap), width_cap);
+                        pci_speed_string(speed_cap), width_cap);
        else if (bw_avail < bw_cap)
                pci_info(dev, "%u.%03u Gb/s available PCIe bandwidth, limited by %s x%d link at %s (capable of %u.%03u Gb/s with %s x%d link)\n",
                         bw_avail / 1000, bw_avail % 1000,
-                        PCIE_SPEED2STR(speed), width,
+                        pci_speed_string(speed), width,
                         limiting_dev ? pci_name(limiting_dev) : "<unknown>",
                         bw_cap / 1000, bw_cap % 1000,
-                        PCIE_SPEED2STR(speed_cap), width_cap);
+                        pci_speed_string(speed_cap), width_cap);
 }
 
 /**