---

yaml
---
r: 341727
b: refs/heads/master
c: 27c1151
h: refs/heads/master
i:
  341725: c4101c7
  341723: f5c3017
  341719: 17a5746
  341711: dbfe439
  341695: c9b3ac8
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b343d0025b08a1ef543e3cabf8b753d84b938d48
+refs/heads/master: 27c1151c324b5a7dacd2d03e54b7c99aa5b67f27

trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

@@ -915,6 +915,7 @@ struct bnx2x_common {
 #define BNX2X_IGU_STAS_MSG_VF_CNT 64
 #define BNX2X_IGU_STAS_MSG_PF_CNT 4
 
+#define MAX_IGU_ATTN_ACK_TO       100
 /* end of common */
 
 /* port */

trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

@@ -3588,6 +3588,21 @@ static void bnx2x_attn_int_asserted(struct bnx2x *bp, u32 asserted)
 
 	/* now set back the mask */
 	if (asserted & ATTN_NIG_FOR_FUNC) {
+		/* Verify that IGU ack through BAR was written before restoring
+		 * NIG mask. This loop should exit after 2-3 iterations max.
+		 */
+		if (bp->common.int_block != INT_BLOCK_HC) {
+			u32 cnt = 0, igu_acked;
+			do {
+				igu_acked = REG_RD(bp,
+						   IGU_REG_ATTENTION_ACK_BITS);
+			} while (((igu_acked & ATTN_NIG_FOR_FUNC) == 0) &&
+				 (++cnt < MAX_IGU_ATTN_ACK_TO));
+			if (!igu_acked)
+				DP(NETIF_MSG_HW,
+				   "Failed to verify IGU ack on time\n");
+			barrier();
+		}
 		REG_WR(bp, nig_int_mask_addr, nig_mask);
 		bnx2x_release_phy_lock(bp);
 	}