diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 14:58:23 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 14:58:23 +0100 |
| commit | ebf8889bd1fe3615991ff4494635d237280652a2 (patch) | |
| tree | 10fb735717122bbb86474339eac07f26e7ccdf40 /drivers/net/mlx4/cmd.c | |
| parent | b160292cc216a50fd0cd386b0bda2cd48352c73b (diff) | |
| parent | 752097cec53eea111d087c545179b421e2bde98a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/mlx4/cmd.c')
| -rw-r--r-- | drivers/net/mlx4/cmd.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/mlx4/cmd.c b/drivers/net/mlx4/cmd.c index a9f31753661..db49051b97b 100644 --- a/drivers/net/mlx4/cmd.c +++ b/drivers/net/mlx4/cmd.c @@ -95,7 +95,7 @@ enum { }; enum { - GO_BIT_TIMEOUT = 10000 + GO_BIT_TIMEOUT_MSECS = 10000 }; struct mlx4_cmd_context { @@ -155,7 +155,7 @@ static int mlx4_cmd_post(struct mlx4_dev *dev, u64 in_param, u64 out_param, end = jiffies; if (event) - end += HZ * 10; + end += msecs_to_jiffies(GO_BIT_TIMEOUT_MSECS); while (cmd_pending(dev)) { if (time_after_eq(jiffies, end)) @@ -184,6 +184,13 @@ static int mlx4_cmd_post(struct mlx4_dev *dev, u64 in_param, u64 out_param, (event ? (1 << HCR_E_BIT) : 0) | (op_modifier << HCR_OPMOD_SHIFT) | op), hcr + 6); + + /* + * Make sure that our HCR writes don't get mixed in with + * writes from another CPU starting a FW command. + */ + mmiowb(); + cmd->toggle = cmd->toggle ^ 1; ret = 0; |