Commit 811a2f2d authored by Eilon Greenstein's avatar Eilon Greenstein Committed by David S. Miller
Browse files

bnx2x: EMAC reset 



The NIG_ENABLE does not reset the emac. Replace it with explicit reset

Signed-off-by: default avatarYaniv Rosner <yanivr@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a35da8db

drivers/net/bnx2x_link.c

+4 −2
Original line number Diff line number Diff line
@@ -297,8 +297,10 @@ static u8 bnx2x_emac_enable(struct link_params *params, 
			   port*4, 0);

	}



	/* enable emac */

	REG_WR(bp, NIG_REG_NIG_EMAC0_EN + port*4, 1);

	bnx2x_bits_en(bp, emac_base + EMAC_REG_EMAC_RX_MODE,

		    EMAC_RX_MODE_RESET);

	bnx2x_bits_en(bp, emac_base + EMAC_REG_EMAC_TX_MODE,

		    EMAC_TX_MODE_RESET);



	if (CHIP_REV_IS_SLOW(bp)) {

		/* config GMII mode */

drivers/net/bnx2x_reg.h

+2 −0
Original line number Diff line number Diff line
@@ -5173,9 +5173,11 @@ 
#define EMAC_RX_MODE_FLOW_EN					 (1L<<2)

#define EMAC_RX_MODE_KEEP_VLAN_TAG				 (1L<<10)

#define EMAC_RX_MODE_PROMISCUOUS				 (1L<<8)

#define EMAC_RX_MODE_RESET					 (1L<<0)

#define EMAC_RX_MTU_SIZE_JUMBO_ENA				 (1L<<31)

#define EMAC_TX_MODE_EXT_PAUSE_EN				 (1L<<3)

#define EMAC_TX_MODE_FLOW_EN					 (1L<<4)

#define EMAC_TX_MODE_RESET					 (1L<<0)

#define MISC_REGISTERS_GPIO_0					 0

#define MISC_REGISTERS_GPIO_1					 1

#define MISC_REGISTERS_GPIO_2					 2