aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIra Gusinsky <irenag@mellanox.com>2015-04-02 17:07:27 +0300
committerDavid S. Miller <davem@davemloft.net>2015-04-02 16:33:41 -0400
commit21db507439ec3a76a9587f2ad50ad3e4d13f4440 (patch)
tree8bfdc9ae335f89de7f7219a1273341d224d9733e
parentnet/mlx5_core: Avoid copying outbox in aysnc command completion (diff)
downloadlinux-dev-21db507439ec3a76a9587f2ad50ad3e4d13f4440.tar.xz
linux-dev-21db507439ec3a76a9587f2ad50ad3e4d13f4440.zip
net/mlx5_core: Avoid usage command work entry after writing command doorbell
Avoid usage of command work entry in cmd_work_handler since it can be released by mlx5_cmd_invoke before the work handler returns to running. Signed-off-by: Ira Gusinsky <irenag@mellanox.com> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> Signed-off-by: Eli Cohen <eli@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/cmd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index 290ae87fdef7..0d862696b876 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -515,10 +515,11 @@ static void cmd_work_handler(struct work_struct *work)
ent->ts1 = ktime_get_ns();
/* ring doorbell after the descriptor is valid */
+ mlx5_core_dbg(dev, "writing 0x%x to command doorbell\n", 1 << ent->idx);
wmb();
iowrite32be(1 << ent->idx, &dev->iseg->cmd_dbell);
- mlx5_core_dbg(dev, "write 0x%x to command doorbell\n", 1 << ent->idx);
mmiowb();
+ /* if not in polling don't use ent after this point */
if (cmd->mode == CMD_MODE_POLLING) {
poll_timeout(ent);
/* make sure we read the descriptor after ownership is SW */