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

Commit d1733460 authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by David S. Miller
Browse files

netxen: fix detection of cut-thru firmware mode 



Fix the detection of cut-thru mode of the hardware (direct dma
to host) to mode configured in SRE (ingress block) rather than
onboard memory control.

Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 73a37079

drivers/net/netxen/netxen_nic_hdr.h

+1 −0
Original line number Diff line number Diff line
@@ -355,6 +355,7 @@ enum { 
#define NETXEN_HW_CRB_HUB_AGT_ADR_LPC	\

	((NETXEN_HW_H6_CH_HUB_ADR << 7) | NETXEN_HW_LPC_CRB_AGT_ADR)



#define NETXEN_SRE_MISC			(NETXEN_CRB_SRE + 0x0002c)

#define NETXEN_SRE_INT_STATUS		(NETXEN_CRB_SRE + 0x00034)

#define NETXEN_SRE_PBI_ACTIVE_STATUS	(NETXEN_CRB_SRE + 0x01014)

#define NETXEN_SRE_L1RE_CTL		(NETXEN_CRB_SRE + 0x03000)

drivers/net/netxen/netxen_nic_hw.c

+2 −2
Original line number Diff line number Diff line
@@ -2041,8 +2041,8 @@ void netxen_nic_get_firmware_info(struct netxen_adapter *adapter) 
			fw_major, fw_minor, fw_build);



	if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {

		i = NXRD32(adapter, NETXEN_MIU_MN_CONTROL);

		adapter->ahw.cut_through = (i & 0x4) ? 1 : 0;

		i = NXRD32(adapter, NETXEN_SRE_MISC);

		adapter->ahw.cut_through = (i & 0x8000) ? 1 : 0;

		dev_info(&pdev->dev, "firmware running in %s mode\n",

		adapter->ahw.cut_through ? "cut-through" : "legacy");

	}