[34/35] igb: Fix lack of flush after register write and before delay

From: Greg KH
Date: Sat Aug 27 2011 - 10:59:47 EST


3.0-stable review patch. If anyone has any objections, please let us know.

------------------

From: Carolyn Wyborny <carolyn.wyborny@xxxxxxxxx>

commit 064b43304ed8ede8e13ff7b4338d09fd37bcffb1 upstream.

Register writes followed by a delay are required to have a flush
before the delay in order to commit the values to the register. Without
the flush, the code following the delay may not function correctly.

Reported-by: Tong Ho <tong.ho@xxxxxxxxxxxx>
Reported-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@xxxxxxxxx>
Tested-by: Aaron Brown <aaron.f.brown@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

---
drivers/net/igb/e1000_82575.c | 1 +
1 file changed, 1 insertion(+)

--- a/drivers/net/igb/e1000_82575.c
+++ b/drivers/net/igb/e1000_82575.c
@@ -1735,6 +1735,7 @@ static s32 igb_reset_hw_82580(struct e10
ctrl |= E1000_CTRL_RST;

wr32(E1000_CTRL, ctrl);
+ wrfl();

/* Add delay to insure DEV_RST has time to complete */
if (global_device_reset)


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/