---

yaml --- r: 183471 b: refs/heads/master c: e2eb8e3 h: refs/heads/master i: 183469: 3a8eb30 183467: b6b9b0e 183463: e4f37fc 183455: 49e55b8 v: v3
git-mirror · Jan 8, 2010 · 7a2c6b0 · 7a2c6b0
1 parent f684f51
commit 7a2c6b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 368c0ca2f0a69b0818fbc1796d8e21ff02a61b4c
+refs/heads/master: e2eb8e38592f28d8be4a518f44d3385272dedddb
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
@@ -6145,6 +6145,10 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs)
 	REG_WR(bp, BNX2_PCI_MSIX_TBL_OFF_BIR, BNX2_PCI_GRC_WINDOW2_BASE);
 	REG_WR(bp, BNX2_PCI_MSIX_PBA_OFF_BIT, BNX2_PCI_GRC_WINDOW3_BASE);
 
+	/*  Need to flush the previous three writes to ensure MSI-X
+	 *  is setup properly */
+	REG_RD(bp, BNX2_PCI_MSIX_CONTROL);
+
 	for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) {
 		msix_ent[i].entry = i;
 		msix_ent[i].vector = 0;