net/mlx5: Convert PCI error values to generic errnos

mlx5_pci_link_toggle() returns a mix of PCI-specific error codes and
generic errnos.

Convert the PCI-specific error values to generic errno using
pcibios_err_to_errno() before returning them.

Fixes: eabe8e5e88f5 ("net/mlx5: Handle sync reset now event")
Fixes: 212b4d7251c1 ("net/mlx5: Wait for firmware to enable CRS before pci_restore_state")
Link: https://lore.kernel.org/r/20230814132721.26608-1-ilpo.jarvinen@linux.intel.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
[bhelgaas: rebase to pci/pcie-rmw, also convert in mlx5_check_dev_ids()]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c b/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
index 99dcbd006357a2ece7ca1e1c89828c1df49a762f..85a2dfbb5c4691fd29e30331d6f55ad2a8b864cc 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
@@ -311,7 +311,7 @@ static int mlx5_check_dev_ids(struct mlx5_core_dev *dev, u16 dev_id)
        list_for_each_entry(sdev, &bridge_bus->devices, bus_list) {
                err = pci_read_config_word(sdev, PCI_DEVICE_ID, &sdev_id);
                if (err)
-                       return err;
+                       return pcibios_err_to_errno(err);
                if (sdev_id != dev_id) {
                        mlx5_core_warn(dev, "unrecognized dev_id (0x%x)\n", sdev_id);
                        return -EPERM;
@@ -371,7 +371,7 @@ static int mlx5_pci_link_toggle(struct mlx5_core_dev *dev)
 
        err = pci_read_config_word(dev->pdev, PCI_DEVICE_ID, &dev_id);
        if (err)
-               return err;
+               return pcibios_err_to_errno(err);
        err = mlx5_check_dev_ids(dev, dev_id);
        if (err)
                return err;
@@ -386,11 +386,11 @@ static int mlx5_pci_link_toggle(struct mlx5_core_dev *dev)
        /* PCI link toggle */
        err = pcie_capability_set_word(bridge, PCI_EXP_LNKCTL, PCI_EXP_LNKCTL_LD);
        if (err)
-               return err;
+               return pcibios_err_to_errno(err);
        msleep(500);
        err = pcie_capability_clear_word(bridge, PCI_EXP_LNKCTL, PCI_EXP_LNKCTL_LD);
        if (err)
-               return err;
+               return pcibios_err_to_errno(err);
 
        /* Check link */
        if (!bridge->link_active_reporting) {
@@ -403,7 +403,7 @@ static int mlx5_pci_link_toggle(struct mlx5_core_dev *dev)
        do {
                err = pci_read_config_word(bridge, cap + PCI_EXP_LNKSTA, &reg16);
                if (err)
-                       return err;
+                       return pcibios_err_to_errno(err);
                if (reg16 & PCI_EXP_LNKSTA_DLLLA)
                        break;
                msleep(20);
@@ -421,7 +421,7 @@ static int mlx5_pci_link_toggle(struct mlx5_core_dev *dev)
        do {
                err = pci_read_config_word(dev->pdev, PCI_DEVICE_ID, &reg16);
                if (err)
-                       return err;
+                       return pcibios_err_to_errno(err);
                if (reg16 == dev_id)
                        break;
                msleep(20);