diff options
| author | Nir Dotan <nird@mellanox.com> | 2019-01-18 15:57:57 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-18 15:12:16 -0800 |
| commit | 67c14cc9b35055264fc0efed00159a7de1819f1b (patch) | |
| tree | 5578f78a79c4e71bbb9a8c5ea2c0b5583e0af30d | |
| parent | d2f372ba0914e5722ac28e15f2ed2db61bcf0e44 (diff) | |
| download | lwn-67c14cc9b35055264fc0efed00159a7de1819f1b.tar.gz lwn-67c14cc9b35055264fc0efed00159a7de1819f1b.zip | |
mlxsw: pci: Return error on PCI reset timeout
Return an appropriate error in the case when the driver timeouts on waiting
for firmware to go out of PCI reset.
Fixes: 233fa44bd67a ("mlxsw: pci: Implement reset done check")
Signed-off-by: Nir Dotan <nird@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c index 91bf294f7677..a2321fe8d6a0 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/pci.c +++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c @@ -1367,10 +1367,10 @@ static int mlxsw_pci_sw_reset(struct mlxsw_pci *mlxsw_pci, u32 val = mlxsw_pci_read32(mlxsw_pci, FW_READY); if ((val & MLXSW_PCI_FW_READY_MASK) == MLXSW_PCI_FW_READY_MAGIC) - break; + return 0; cond_resched(); } while (time_before(jiffies, end)); - return 0; + return -EBUSY; } static int mlxsw_pci_alloc_irq_vectors(struct mlxsw_pci *mlxsw_pci) |