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

Commit 279abdf5 authored by Eilon Greenstein's avatar Eilon Greenstein Committed by David S. Miller
Browse files

bnx2x: Stop management traffic in loopback test 



Since management traffic cannot go on the wire while configured to loopback,
simply stop it to avoid race condition when the MAC is set to loopback in the
middle of a packet

Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3c2b8d18

drivers/net/bnx2x_main.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -9691,8 +9691,15 @@ static void bnx2x_self_test(struct net_device *dev, 
		etest->flags &= ~ETH_TEST_FL_OFFLINE;

		etest->flags &= ~ETH_TEST_FL_OFFLINE;





	if (etest->flags & ETH_TEST_FL_OFFLINE) {

	if (etest->flags & ETH_TEST_FL_OFFLINE) {

		int port = BP_PORT(bp);

		u32 val;

		u8 link_up;

		u8 link_up;





		/* save current value of input enable for TX port IF */

		val = REG_RD(bp, NIG_REG_EGRESS_UMP0_IN_EN + port*4);

		/* disable input for TX port IF */

		REG_WR(bp, NIG_REG_EGRESS_UMP0_IN_EN + port*4, 0);



		link_up = bp->link_vars.link_up;

		link_up = bp->link_vars.link_up;

		bnx2x_nic_unload(bp, UNLOAD_NORMAL);

		bnx2x_nic_unload(bp, UNLOAD_NORMAL);

		bnx2x_nic_load(bp, LOAD_DIAG);

		bnx2x_nic_load(bp, LOAD_DIAG);
@@ -9712,6 +9719,10 @@ static void bnx2x_self_test(struct net_device *dev, 
			etest->flags |= ETH_TEST_FL_FAILED;

			etest->flags |= ETH_TEST_FL_FAILED;





		bnx2x_nic_unload(bp, UNLOAD_NORMAL);

		bnx2x_nic_unload(bp, UNLOAD_NORMAL);



		/* restore input for TX port IF */

		REG_WR(bp, NIG_REG_EGRESS_UMP0_IN_EN + port*4, val);



		bnx2x_nic_load(bp, LOAD_NORMAL);

		bnx2x_nic_load(bp, LOAD_NORMAL);

		/* wait until link state is restored */

		/* wait until link state is restored */

		bnx2x_wait_for_link(bp, link_up);

		bnx2x_wait_for_link(bp, link_up);

drivers/net/bnx2x_reg.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -1660,6 +1660,8 @@ 
#define NIG_REG_EGRESS_PBF0_IN_EN				 0x100cc

#define NIG_REG_EGRESS_PBF0_IN_EN				 0x100cc

/* [RW 1] Input enable for TX PBF user packet port1 IF */

/* [RW 1] Input enable for TX PBF user packet port1 IF */

#define NIG_REG_EGRESS_PBF1_IN_EN				 0x100d0

#define NIG_REG_EGRESS_PBF1_IN_EN				 0x100d0

/* [RW 1] Input enable for TX UMP management packet port0 IF */

#define NIG_REG_EGRESS_UMP0_IN_EN				 0x100d4

/* [RW 1] Input enable for RX_EMAC0 IF */

/* [RW 1] Input enable for RX_EMAC0 IF */

#define NIG_REG_EMAC0_IN_EN					 0x100a4

#define NIG_REG_EMAC0_IN_EN					 0x100a4

/* [RW 1] output enable for TX EMAC pause port 0 IF */

/* [RW 1] output enable for TX EMAC pause port 0 IF */