Re: [1/5][BNX2]: Fix netdev watchdog on 5708.

Re: [1/5][BNX2]: Fix netdev watchdog on 5708.

[Jeff Garzik]

On Mon, Jun 04, 2007 at 05:00:03PM -0700, Michael Chan wrote:
> [BNX2]: Fix netdev watchdog on 5708.
> 
> There's a bug in the driver that only initializes half of the context
> memory on the 5708.  Surprisingly, this works most of the time except
> for some occasional netdev watchdogs when sending a lot of 64-byte
> packets.  The fix is to add the missing code to initialize the 2nd
> halves of all context memory.
> 
> Signed-off-by: Michael Chan <mchan@broadcom.com>

ACK patch 1, and 3-5

[1/5][BNX2]: Fix netdev watchdog on 5708.

[Michael Chan]

[BNX2]: Fix netdev watchdog on 5708.

There's a bug in the driver that only initializes half of the context
memory on the 5708.  Surprisingly, this works most of the time except
for some occasional netdev watchdogs when sending a lot of 64-byte
packets.  The fix is to add the missing code to initialize the 2nd
halves of all context memory.

Signed-off-by: Michael Chan <mchan@broadcom.com>

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 88b33c6..5d69e5b 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -1811,6 +1811,7 @@ bnx2_init_context(struct bnx2 *bp)
 	vcid = 96;
 	while (vcid) {
 		u32 vcid_addr, pcid_addr, offset;
+		int i;
 
 		vcid--;
 
@@ -1831,16 +1832,20 @@ bnx2_init_context(struct bnx2 *bp)
 			pcid_addr = vcid_addr;
 		}
 
-		REG_WR(bp, BNX2_CTX_VIRT_ADDR, 0x00);
-		REG_WR(bp, BNX2_CTX_PAGE_TBL, pcid_addr);
+		for (i = 0; i < (CTX_SIZE / PHY_CTX_SIZE); i++) {
+			vcid_addr += (i << PHY_CTX_SHIFT);
+			pcid_addr += (i << PHY_CTX_SHIFT);
 
-		/* Zero out the context. */
-		for (offset = 0; offset < PHY_CTX_SIZE; offset += 4) {
-			CTX_WR(bp, 0x00, offset, 0);
-		}
+			REG_WR(bp, BNX2_CTX_VIRT_ADDR, 0x00);
+			REG_WR(bp, BNX2_CTX_PAGE_TBL, pcid_addr);
 
-		REG_WR(bp, BNX2_CTX_VIRT_ADDR, vcid_addr);
-		REG_WR(bp, BNX2_CTX_PAGE_TBL, pcid_addr);
+			/* Zero out the context. */
+			for (offset = 0; offset < PHY_CTX_SIZE; offset += 4)
+				CTX_WR(bp, 0x00, offset, 0);
+
+			REG_WR(bp, BNX2_CTX_VIRT_ADDR, vcid_addr);
+			REG_WR(bp, BNX2_CTX_PAGE_TBL, pcid_addr);
+		}
 	}
 }
 

Re: [1/5][BNX2]: Fix netdev watchdog on 5708.

[David Miller]

From: "Michael Chan" <mchan@broadcom.com>
Date: Mon, 04 Jun 2007 17:00:03 -0700

> [BNX2]: Fix netdev watchdog on 5708.
> 
> There's a bug in the driver that only initializes half of the context
> memory on the 5708.  Surprisingly, this works most of the time except
> for some occasional netdev watchdogs when sending a lot of 64-byte
> packets.  The fix is to add the missing code to initialize the 2nd
> halves of all context memory.
> 
> Signed-off-by: Michael Chan <mchan@broadcom.com>

Applied, thanks Michael.