From 31e5fe71b1a64ba0efa2dd7affc25c792d7bf935 Mon Sep 17 00:00:00 2001 From: Eugenia Emantayev Date: Sun, 18 Mar 2012 04:32:08 +0000 Subject: [PATCH] --- yaml --- r: 291619 b: refs/heads/master c: 58a3de0592454c216c68427fa3c31a34823f5115 h: refs/heads/master i: 291617: 2400a2813a38830d9fbef7b1649cfd0a9eb43381 291615: e96031cf0b6ed202dbc072d07b1d36da778b4ecb v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/cmd.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 09f8788c939c..41f1caba7c15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c3ac4289a0e4d60cbd4787b4a91de4a0c785df1 +refs/heads/master: 58a3de0592454c216c68427fa3c31a34823f5115 diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/cmd.c b/trunk/drivers/net/ethernet/mellanox/mlx4/cmd.c index 48d5c48d7ce8..773c70ea3f62 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/cmd.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/cmd.c @@ -239,6 +239,7 @@ static int mlx4_comm_cmd_wait(struct mlx4_dev *dev, u8 op, { struct mlx4_cmd *cmd = &mlx4_priv(dev)->cmd; struct mlx4_cmd_context *context; + unsigned long end; int err = 0; down(&cmd->event_sem); @@ -268,6 +269,14 @@ static int mlx4_comm_cmd_wait(struct mlx4_dev *dev, u8 op, } out: + /* wait for comm channel ready + * this is necessary for prevention the race + * when switching between event to polling mode + */ + end = msecs_to_jiffies(timeout) + jiffies; + while (comm_pending(dev) && time_before(jiffies, end)) + cond_resched(); + spin_lock(&cmd->context_lock); context->next = cmd->free_head; cmd->free_head = context - cmd->context;