bnx2: Fix register printouts during NETEV_WATCHDOG.
Subsystems (2)
PATCH 1/2 bnx2: Fix register printouts during NETEV_WATCHDOG.
From: Eddie Wai <[email protected]>
Dump the correct MCP registers and add EMAC_RX_STATUS register during NETDEV_WATCHDOG for debugging.
Signed-off-by Eddie Wai <[email protected]>
Signed-off-by Benjamin Li <[email protected]>
Signed-off-by Michael Chan <[email protected]>
--- drivers/net/bnx2.c | 15 ++++++++++++--- drivers/net/bnx2.h | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-)
drivers/net/bnx2.c +12 -3
@@ -6301,14 +6301,23 @@ static void bnx2_dump_state(struct bnx2 *bp) {struct net_device *dev = bp->dev; +u32 mcp_p0, mcp_p1;netdev_err (dev,"DEBUG: intr_sem[%x]\n" ,atomic_read (&bp->intr_sem)); -netdev_err (dev,"DEBUG: EMAC_TX_STATUS[%08x] RPM_MGMT_PKT_CTRL[%08x]\n" , +netdev_err (dev,"DEBUG: EMAC_TX_STATUS[%08x] EMAC_RX_STATUS[%08x]\n" ,REG_RD (bp,BNX2_EMAC_TX_STATUS ), +REG_RD (bp,BNX2_EMAC_RX_STATUS )); +netdev_err (dev,"DEBUG: RPM_MGMT_PKT_CTRL[%08x]\n" ,REG_RD (bp,BNX2_RPM_MGMT_PKT_CTRL )); +if (CHIP_NUM (bp) ==CHIP_NUM_5709 ) { + mcp_p0 =BNX2_MCP_STATE_P0 ; + mcp_p1 =BNX2_MCP_STATE_P1 ; + }else { + mcp_p0 =BNX2_MCP_STATE_P0_5708 ; + mcp_p1 =BNX2_MCP_STATE_P1_5708 ; + }netdev_err (dev,"DEBUG: MCP_STATE_P0[%08x] MCP_STATE_P1[%08x]\n" , -bnx2_reg_rd_ind (bp,BNX2_MCP_STATE_P0 ), -bnx2_reg_rd_ind (bp,BNX2_MCP_STATE_P1 )); +bnx2_reg_rd_ind (bp, mcp_p0),bnx2_reg_rd_ind (bp, mcp_p1));netdev_err (dev,"DEBUG: HC_STATS_INTERRUPT_STATUS[%08x]\n" ,REG_RD (bp,BNX2_HC_STATS_INTERRUPT_STATUS ));if (bp->flags &BNX2_FLAG_USING_MSIX )
drivers/net/bnx2.h +2 -0
@@ -6347,6 +6347,8 @@ struct l2_fhdr {#define BNX2_MCP_SCRATCH 0x00160000#define BNX2_MCP_STATE_P1 0x0016f9c8#define BNX2_MCP_STATE_P0 0x0016fdc8 +#define BNX2_MCP_STATE_P1_5708 0x001699c8 +#define BNX2_MCP_STATE_P0_5708 0x00169dc8#define BNX2_SHM_HDR_SIGNATURE BNX2_MCP_SCRATCH#define BNX2_SHM_HDR_SIGNATURE_SIG_MASK 0xffff0000
Signature · 1 line
1.6.4.GIT
From: "Michael Chan" <[email protected]>
Date: Mon, 10 May 2010 16:18:58 -0700
Quoted 8 lines
From: Eddie Wai <[email protected]>
Dump the correct MCP registers and add
EMAC_RX_STATUSregister duringNETDEV_WATCHDOGfor debugging.Signed-off-by Eddie Wai <[email protected]>Signed-off-by Benjamin Li <[email protected]>Signed-off-by Michael Chan <[email protected]>
Applied.
A message that is not in the archive (sent off-list or not yet received): [email protected]
David Miller
maintainerRe: [PATCH -next 2/2] bnx2: Update 5709 MIPS firmware and version to 2.0.15.
From: "Michael Chan" <[email protected]>
Date: Mon, 10 May 2010 16:18:59 -0700
Quoted 3 lines
New firmware fixes a performance regression on small packets.
Signed-off-by Michael Chan <[email protected]>
Also applied, thanks!