Skip to content

Commit da54556

Browse files
ij-intelbjorn-helgaas
authored andcommitted
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: eabe8e5 ("net/mlx5: Handle sync reset now event") Fixes: 212b4d7 ("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>
1 parent 7cd23f6 commit da54556

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ static int mlx5_check_dev_ids(struct mlx5_core_dev *dev, u16 dev_id)
311311
list_for_each_entry(sdev, &bridge_bus->devices, bus_list) {
312312
err = pci_read_config_word(sdev, PCI_DEVICE_ID, &sdev_id);
313313
if (err)
314-
return err;
314+
return pcibios_err_to_errno(err);
315315
if (sdev_id != dev_id) {
316316
mlx5_core_warn(dev, "unrecognized dev_id (0x%x)\n", sdev_id);
317317
return -EPERM;
@@ -371,7 +371,7 @@ static int mlx5_pci_link_toggle(struct mlx5_core_dev *dev)
371371

372372
err = pci_read_config_word(dev->pdev, PCI_DEVICE_ID, &dev_id);
373373
if (err)
374-
return err;
374+
return pcibios_err_to_errno(err);
375375
err = mlx5_check_dev_ids(dev, dev_id);
376376
if (err)
377377
return err;
@@ -386,11 +386,11 @@ static int mlx5_pci_link_toggle(struct mlx5_core_dev *dev)
386386
/* PCI link toggle */
387387
err = pcie_capability_set_word(bridge, PCI_EXP_LNKCTL, PCI_EXP_LNKCTL_LD);
388388
if (err)
389-
return err;
389+
return pcibios_err_to_errno(err);
390390
msleep(500);
391391
err = pcie_capability_clear_word(bridge, PCI_EXP_LNKCTL, PCI_EXP_LNKCTL_LD);
392392
if (err)
393-
return err;
393+
return pcibios_err_to_errno(err);
394394

395395
/* Check link */
396396
if (!bridge->link_active_reporting) {
@@ -403,7 +403,7 @@ static int mlx5_pci_link_toggle(struct mlx5_core_dev *dev)
403403
do {
404404
err = pci_read_config_word(bridge, cap + PCI_EXP_LNKSTA, &reg16);
405405
if (err)
406-
return err;
406+
return pcibios_err_to_errno(err);
407407
if (reg16 & PCI_EXP_LNKSTA_DLLLA)
408408
break;
409409
msleep(20);
@@ -421,7 +421,7 @@ static int mlx5_pci_link_toggle(struct mlx5_core_dev *dev)
421421
do {
422422
err = pci_read_config_word(dev->pdev, PCI_DEVICE_ID, &reg16);
423423
if (err)
424-
return err;
424+
return pcibios_err_to_errno(err);
425425
if (reg16 == dev_id)
426426
break;
427427
msleep(20);

0 commit comments

Comments
 (0)