Use `link_active_reporting' to determine whether Data Link Layer Link 
Active Reporting is available rather than re-retrieving the capability.

Signed-off-by: Maciej W. Rozycki <ma...@orcam.me.uk>
---
NB this has been compile-tested only with PPC64LE and x86-64 
configurations.

Changes from v6:

- Regenerate against 6.3-rc5.

New change in v6.
---
 drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

linux-pcie-link-active-reporting-mlx5.diff
Index: linux-macro/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
===================================================================
--- linux-macro.orig/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
+++ linux-macro/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
@@ -307,7 +307,6 @@ static int mlx5_pci_link_toggle(struct m
        unsigned long timeout;
        struct pci_dev *sdev;
        int cap, err;
-       u32 reg32;
 
        /* Check that all functions under the pci bridge are PFs of
         * this device otherwise fail this function.
@@ -346,11 +345,8 @@ static int mlx5_pci_link_toggle(struct m
                return err;
 
        /* Check link */
-       err = pci_read_config_dword(bridge, cap + PCI_EXP_LNKCAP, &reg32);
-       if (err)
-               return err;
-       if (!(reg32 & PCI_EXP_LNKCAP_DLLLARC)) {
-               mlx5_core_warn(dev, "No PCI link reporting capability 
(0x%08x)\n", reg32);
+       if (!bridge->link_active_reporting) {
+               mlx5_core_warn(dev, "No PCI link reporting capability\n");
                msleep(1000);
                goto restore;
        }

Reply via email to