From 620c135a928cf687f3ca35e2e72ad73c0de3b681 Mon Sep 17 00:00:00 2001
From: Roland Dreier <rolandd@cisco.com>
Date: Tue, 9 Oct 2007 19:59:18 -0700
Subject: [PATCH] --- yaml --- r: 67143 b: refs/heads/master c:
 2e61c646edfa013203e3428762f8d6a72e10bdea h: refs/heads/master i:   67141:
 04b6e46861c5fc519f898746c98c85ba84cb03bb   67139:
 8044e4b8aae6e5ef43298b02dd58025b38248e17   67135:
 e536e70cc79f3f0eaa59ec907bd9c4150b109f03 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/net/mlx4/cmd.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6e46e0722d5a..b6f16c49cf6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76d7cc0345a037e8eea426f8abc710abd22946dd
+refs/heads/master: 2e61c646edfa013203e3428762f8d6a72e10bdea
diff --git a/trunk/drivers/net/mlx4/cmd.c b/trunk/drivers/net/mlx4/cmd.c
index b540820e9c25..db49051b97b1 100644
--- a/trunk/drivers/net/mlx4/cmd.c
+++ b/trunk/drivers/net/mlx4/cmd.c
@@ -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;