diff options
| author |   Benjamin Poirier <bpoirier@suse.de> | 2015-05-22 16:12:26 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-05-27 13:08:03 -0400 |
| commit | f4ecf29fd78d19a9301e638eaa1419e5c8fbdce1 (patch) | |
| tree | 04d8fa0083cf0ae0b4480a02a86a6d87902d7917 /drivers/net/ethernet/mellanox/mlx4/cmd.c | |
| parent | xen/netback: Properly initialize credit_bytes (diff) | |
| download | wireguard-linux-f4ecf29fd78d19a9301e638eaa1419e5c8fbdce1.tar.xz wireguard-linux-f4ecf29fd78d19a9301e638eaa1419e5c8fbdce1.zip | |
mlx4_core: Fix fallback from MSI-X to INTx
The test in mlx4_load_one() to remove MLX4_FLAG_MSI_X expects mlx4_NOP() to
fail with -EBUSY. It is also necessary to avoid the reset since the device
is not fully reinitialized before calling mlx4_start_hca() a second time.
Note that this will also affect mlx4_test_interrupts(), the only other user
of MLX4_CMD_NOP.
Fixes: f5aef5a ("net/mlx4_core: Activate reset flow upon fatal command cases")
Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/cmd.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/cmd.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c index 4f7dc044601e..529ef0594b90 100644 --- a/drivers/net/ethernet/mellanox/mlx4/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c @@ -714,8 +714,13 @@ static int mlx4_cmd_wait(struct mlx4_dev *dev, u64 in_param, u64 *out_param, msecs_to_jiffies(timeout))) { mlx4_warn(dev, "command 0x%x timed out (go bit not cleared)\n", op); - err = -EIO; - goto out_reset; + if (op == MLX4_CMD_NOP) { + err = -EBUSY; + goto out; + } else { + err = -EIO; + goto out_reset; + } } err = context->result; |