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

Commit 68c9f75a authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[BNX2]: Fix occasional NETDEV WATCHDOG on 5709. 



Tweak a register setting to prevent the tx mailbox from halting.

Update version to 1.5.8.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0bcbc926

drivers/net/bnx2.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -54,8 +54,8 @@ 




#define DRV_MODULE_NAME		"bnx2"

#define DRV_MODULE_NAME		"bnx2"

#define PFX DRV_MODULE_NAME	": "

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"1.5.7"

#define DRV_MODULE_VERSION	"1.5.8"

#define DRV_MODULE_RELDATE	"March 29, 2007"

#define DRV_MODULE_RELDATE	"April 24, 2007"





#define RUN_AT(x) (jiffies + (x))

#define RUN_AT(x) (jiffies + (x))
@@ -3421,6 +3421,9 @@ bnx2_init_chip(struct bnx2 *bp) 
	val = REG_RD(bp, BNX2_MQ_CONFIG);

	val = REG_RD(bp, BNX2_MQ_CONFIG);

	val &= ~BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE;

	val &= ~BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE;

	val |= BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE_256;

	val |= BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE_256;

	if (CHIP_ID(bp) == CHIP_ID_5709_A0 || CHIP_ID(bp) == CHIP_ID_5709_A1)

		val |= BNX2_MQ_CONFIG_HALT_DIS;



	REG_WR(bp, BNX2_MQ_CONFIG, val);

	REG_WR(bp, BNX2_MQ_CONFIG, val);





	val = 0x10000 + (MAX_CID_CNT * MB_KERNEL_CTX_SIZE);

	val = 0x10000 + (MAX_CID_CNT * MB_KERNEL_CTX_SIZE);

drivers/net/bnx2.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -6518,6 +6518,7 @@ struct bnx2 { 
#define CHIP_ID_5708_B0			0x57081000

#define CHIP_ID_5708_B0			0x57081000

#define CHIP_ID_5708_B1			0x57081010

#define CHIP_ID_5708_B1			0x57081010

#define CHIP_ID_5709_A0			0x57090000

#define CHIP_ID_5709_A0			0x57090000

#define CHIP_ID_5709_A1			0x57090010





#define CHIP_BOND_ID(bp)		(((bp)->chip_id) & 0xf)

#define CHIP_BOND_ID(bp)		(((bp)->chip_id) & 0xf)