PCI: Use an error code with PCIe failed link retraining

commit 59100eb248c0b15585affa546c7f6834b30eb5a4 upstream.

Given how the call place in pcie_wait_for_link_delay() got structured now,
and that pcie_retrain_link() returns a potentially useful error code,
convert pcie_failed_link_retrain() to return an error code rather than a
boolean status, fixing handling at the call site mentioned.  Update the
other call site accordingly.

Fixes: 1abb47390350 ("Merge branch 'pci/enumeration'")
Link: https://lore.kernel.org/r/alpine.DEB.2.21.2408091156530.61955@angie.orcam.me.uk
Reported-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/aa2d1c4e-9961-d54a-00c7-ddf8e858a9b0@linux.intel.com/
Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Cc: <stable@vger.kernel.org> # v6.5+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 54e10ceb20834889f77476891f554fd7eb04ec1d..4f77fe122e7d0875d21768a8592e0bf9320033c4 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1295,7 +1295,7 @@ static int pci_dev_wait(struct pci_dev *dev, char *reset_type, int timeout)
                if (delay > PCI_RESET_WAIT) {
                        if (retrain) {
                                retrain = false;
-                               if (pcie_failed_link_retrain(bridge)) {
+                               if (pcie_failed_link_retrain(bridge) == 0) {
                                        delay = 1;
                                        continue;
                                }

diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index fd44565c47562868bacdad9b1bb2e017cae09795..55d76d6802ec88bac03ffbdce5daae010eb58b00 100644 (file)
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -541,7 +541,7 @@ void pci_acs_init(struct pci_dev *dev);
 int pci_dev_specific_acs_enabled(struct pci_dev *dev, u16 acs_flags);
 int pci_dev_specific_enable_acs(struct pci_dev *dev);
 int pci_dev_specific_disable_acs_redir(struct pci_dev *dev);
-bool pcie_failed_link_retrain(struct pci_dev *dev);
+int pcie_failed_link_retrain(struct pci_dev *dev);
 #else
 static inline int pci_dev_specific_acs_enabled(struct pci_dev *dev,
                                               u16 acs_flags)
@@ -556,9 +556,9 @@ static inline int pci_dev_specific_disable_acs_redir(struct pci_dev *dev)
 {
        return -ENOTTY;
 }
-static inline bool pcie_failed_link_retrain(struct pci_dev *dev)
+static inline int pcie_failed_link_retrain(struct pci_dev *dev)
 {
-       return false;
+       return -ENOTTY;
 }
 #endif
 

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index f0c334a2a4d6e6110ed797e465545ac3cb1861eb..206b76156c051a3b51c1be248f271fcc2d8621c7 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -78,21 +78,21 @@
  * again to remove any residual state, ignoring the result as it's supposed
  * to fail anyway.
  *
- * Return TRUE if the link has been successfully retrained.  Return FALSE
+ * Return 0 if the link has been successfully retrained.  Return an error
  * if retraining was not needed or we attempted a retrain and it failed.
  */
-bool pcie_failed_link_retrain(struct pci_dev *dev)
+int pcie_failed_link_retrain(struct pci_dev *dev)
 {
        static const struct pci_device_id ids[] = {
                { PCI_VDEVICE(ASMEDIA, 0x2824) }, /* ASMedia ASM2824 */
                {}
        };
        u16 lnksta, lnkctl2;
-       bool ret = false;
+       int ret = -ENOTTY;
 
        if (!pci_is_pcie(dev) || !pcie_downstream_port(dev) ||
            !pcie_cap_has_lnkctl2(dev) || !dev->link_active_reporting)
-               return false;
+               return ret;
 
        pcie_capability_read_word(dev, PCI_EXP_LNKCTL2, &lnkctl2);
        pcie_capability_read_word(dev, PCI_EXP_LNKSTA, &lnksta);
@@ -106,13 +106,13 @@ bool pcie_failed_link_retrain(struct pci_dev *dev)
                lnkctl2 |= PCI_EXP_LNKCTL2_TLS_2_5GT;
                pcie_capability_write_word(dev, PCI_EXP_LNKCTL2, lnkctl2);
 
-               ret = pcie_retrain_link(dev, false) == 0;
-               if (!ret) {
+               ret = pcie_retrain_link(dev, false);
+               if (ret) {
                        pci_info(dev, "retraining failed\n");
                        pcie_capability_write_word(dev, PCI_EXP_LNKCTL2,
                                                   oldlnkctl2);
                        pcie_retrain_link(dev, true);
-                       return false;
+                       return ret;
                }
 
                pcie_capability_read_word(dev, PCI_EXP_LNKSTA, &lnksta);
@@ -129,10 +129,10 @@ bool pcie_failed_link_retrain(struct pci_dev *dev)
                lnkctl2 |= lnkcap & PCI_EXP_LNKCAP_SLS;
                pcie_capability_write_word(dev, PCI_EXP_LNKCTL2, lnkctl2);
 
-               ret = pcie_retrain_link(dev, false) == 0;
-               if (!ret) {
+               ret = pcie_retrain_link(dev, false);
+               if (ret) {
                        pci_info(dev, "retraining failed\n");
-                       return false;
+                       return ret;
                }
        }