Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b98eba52 authored by Eddie Wai's avatar Eddie Wai Committed by David S. Miller
Browse files

bnx2: Fix register printouts during NETEV_WATCHDOG. 



Dump the correct MCP registers and add EMAC_RX_STATUS register during
NETDEV_WATCHDOG for debugging.

Signed-off-by: default avatarEddie Wai <waie@broadcom.com>
Signed-off-by: default avatarBenjamin Li <benli@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a7fc948f

drivers/net/bnx2.c

+12 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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