Merge tag 'pci-v6.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci

[sfrench/cifs-2.6.git] / drivers / net / ethernet / mellanox / mlx5 / core / fw_reset.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c b/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
index e87766f911506f7f98a515be8ee73456ba3d668c..b568988e92e3e95985683f79b8c5fdf601d13d5a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
@@ -338,7 +338,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;
@@ -398,7 +398,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;
@@ -411,18 +411,13 @@ static int mlx5_pci_link_toggle(struct mlx5_core_dev *dev)
                pci_cfg_access_lock(sdev);
        }
        /* PCI link toggle */
-       err = pci_read_config_word(bridge, cap + PCI_EXP_LNKCTL, &reg16);
-       if (err)
-               return err;
-       reg16 |= PCI_EXP_LNKCTL_LD;
-       err = pci_write_config_word(bridge, cap + PCI_EXP_LNKCTL, reg16);
+       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);
-       reg16 &= ~PCI_EXP_LNKCTL_LD;
-       err = pci_write_config_word(bridge, cap + PCI_EXP_LNKCTL, reg16);
+       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) {
@@ -435,7 +430,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);
@@ -453,7 +448,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);