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

Commit a7483b0a authored by Narender Kumar's avatar Narender Kumar Committed by David S. Miller
Browse files

netxen: fix promisc for NX2031. 



Kernel crashes, if promisc mode set without disabling rx queue.
Before changing mode in NX2031 chip, wait till rx queue drains.

Signed-off-by: default avatarNarender Kumar <narender.kumar@qlogic.com>
Signed-off-by: default avatarAmit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5d521fd3

drivers/net/netxen/netxen_nic_hdr.h

+2 −0
Original line number Diff line number Diff line
@@ -545,6 +545,8 @@ enum { 
#define	NETXEN_NIU_TEST_MUX_CTL		(NETXEN_CRB_NIU + 0x00094)

#define	NETXEN_NIU_XG_PAUSE_CTL		(NETXEN_CRB_NIU + 0x00098)

#define	NETXEN_NIU_XG_PAUSE_LEVEL	(NETXEN_CRB_NIU + 0x000dc)

#define	NETXEN_NIU_FRAME_COUNT_SELECT	(NETXEN_CRB_NIU + 0x000ac)

#define	NETXEN_NIU_FRAME_COUNT		(NETXEN_CRB_NIU + 0x000b0)

#define	NETXEN_NIU_XG_SEL		(NETXEN_CRB_NIU + 0x00128)

#define NETXEN_NIU_GB_PAUSE_CTL		(NETXEN_CRB_NIU + 0x0030c)

drivers/net/netxen/netxen_nic_hw.c

+38 −11
Original line number Diff line number Diff line
@@ -383,13 +383,35 @@ int netxen_niu_disable_xg_port(struct netxen_adapter *adapter) 


int netxen_p2_nic_set_promisc(struct netxen_adapter *adapter, u32 mode)

{

	__u32 reg;

	u32 mac_cfg;

	u32 cnt = 0;

	__u32 reg = 0x0200;

	u32 port = adapter->physical_port;

	u16 board_type = adapter->ahw.board_type;



	if (port > NETXEN_NIU_MAX_XG_PORTS)

		return -EINVAL;



	reg = NXRD32(adapter, NETXEN_NIU_XGE_CONFIG_1 + (0x10000 * port));

	mac_cfg = NXRD32(adapter, NETXEN_NIU_XGE_CONFIG_0 + (0x10000 * port));

	mac_cfg &= ~0x4;

	NXWR32(adapter, NETXEN_NIU_XGE_CONFIG_0 + (0x10000 * port), mac_cfg);



	if ((board_type == NETXEN_BRDTYPE_P2_SB31_10G_IMEZ) ||

			(board_type == NETXEN_BRDTYPE_P2_SB31_10G_HMEZ))

		reg = (0x20 << port);



	NXWR32(adapter, NETXEN_NIU_FRAME_COUNT_SELECT, reg);



	mdelay(10);



	while (NXRD32(adapter, NETXEN_NIU_FRAME_COUNT) && ++cnt < 20)

		mdelay(10);



	if (cnt < 20) {



		reg = NXRD32(adapter,

			NETXEN_NIU_XGE_CONFIG_1 + (0x10000 * port));



		if (mode == NETXEN_NIU_PROMISC_MODE)

			reg = (reg | 0x2000UL);

		else
@@ -400,7 +422,12 @@ int netxen_p2_nic_set_promisc(struct netxen_adapter *adapter, u32 mode) 
		else

			reg = (reg & ~0x1000UL);



	NXWR32(adapter, NETXEN_NIU_XGE_CONFIG_1 + (0x10000 * port), reg);

		NXWR32(adapter,

			NETXEN_NIU_XGE_CONFIG_1 + (0x10000 * port), reg);

	}



	mac_cfg |= 0x4;

	NXWR32(adapter, NETXEN_NIU_XGE_CONFIG_0 + (0x10000 * port), mac_cfg);



	return 0;

}