PCI/ASPM: Don't retrain link if ASPM not possible

Some (defective) PCIe devices are not able to reliably do link retraining.

Check to see if ASPM is possible between link partners before configuring
common clocking, and doing the resulting link retraining.  If ASPM is not
possible, there is no reason to risk losing access to a device due to an
unnecessary link retraining.

Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 3b14d9e85dee49f45db558792f3da95b8b921405..17ac1dce32867051298a5489841de8b636835a68 100644 (file)
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -351,12 +351,26 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist)
                return;
        }
 
+       /* Get upstream/downstream components' register state */
+       pcie_get_aspm_reg(parent, &upreg);
+       child = list_entry(linkbus->devices.next, struct pci_dev, bus_list);
+       pcie_get_aspm_reg(child, &dwreg);
+
+       /*
+        * If ASPM not supported, don't mess with the clocks and link,
+        * bail out now.
+        */
+       if (!(upreg.support & dwreg.support))
+               return;
+
        /* Configure common clock before checking latencies */
        pcie_aspm_configure_common_clock(link);
 
-       /* Get upstream/downstream components' register state */
+       /*
+        * Re-read upstream/downstream components' register state
+        * after clock configuration
+        */
        pcie_get_aspm_reg(parent, &upreg);
-       child = list_entry(linkbus->devices.next, struct pci_dev, bus_list);
        pcie_get_aspm_reg(child, &dwreg);
 
        /*