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

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

netxen: remove netxen_nic_niu.c 



Consolidate all MAC/PHY access functions into netxen_nic_hw.c

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

drivers/net/netxen/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -31,4 +31,4 @@ 
obj-$(CONFIG_NETXEN_NIC) := netxen_nic.o



netxen_nic-y := netxen_nic_hw.o netxen_nic_main.o netxen_nic_init.o \

	netxen_nic_ethtool.o netxen_nic_niu.o netxen_nic_ctx.o
 
	netxen_nic_ethtool.o netxen_nic_ctx.o

drivers/net/netxen/netxen_nic.h

+18 −9
Original line number Diff line number Diff line
@@ -684,7 +684,19 @@ struct netxen_recv_context { 
#define NX_CDRP_CMD_GET_STATISTICS          0x0000000f

#define NX_CDRP_CMD_DELETE_STATISTICS       0x00000010

#define NX_CDRP_CMD_SET_MTU                 0x00000012

#define NX_CDRP_CMD_MAX                     0x00000013

#define NX_CDRP_CMD_READ_PHY			0x00000013

#define NX_CDRP_CMD_WRITE_PHY			0x00000014

#define NX_CDRP_CMD_READ_HW_REG			0x00000015

#define NX_CDRP_CMD_GET_FLOW_CTL		0x00000016

#define NX_CDRP_CMD_SET_FLOW_CTL		0x00000017

#define NX_CDRP_CMD_READ_MAX_MTU		0x00000018

#define NX_CDRP_CMD_READ_MAX_LRO		0x00000019

#define NX_CDRP_CMD_CONFIGURE_TOE		0x0000001a

#define NX_CDRP_CMD_FUNC_ATTRIB			0x0000001b

#define NX_CDRP_CMD_READ_PEXQ_PARAMETERS	0x0000001c

#define NX_CDRP_CMD_GET_LIC_CAPABILITIES	0x0000001d

#define NX_CDRP_CMD_READ_MAX_LRO_PER_BOARD	0x0000001e

#define NX_CDRP_CMD_MAX				0x0000001f



#define NX_RCODE_SUCCESS		0

#define NX_RCODE_NO_HOST_MEM		1
@@ -1152,8 +1164,8 @@ struct netxen_adapter { 
	int (*set_mtu) (struct netxen_adapter *, int);

	int (*set_promisc) (struct netxen_adapter *, u32);

	void (*set_multi) (struct net_device *);

	int (*phy_read) (struct netxen_adapter *, long reg, u32 *);

	int (*phy_write) (struct netxen_adapter *, long reg, u32 val);

	int (*phy_read) (struct netxen_adapter *, u32 reg, u32 *);

	int (*phy_write) (struct netxen_adapter *, u32 reg, u32 val);

	int (*init_port) (struct netxen_adapter *, int);

	int (*stop_port) (struct netxen_adapter *);
@@ -1185,15 +1197,11 @@ struct netxen_adapter { 
	const struct firmware *fw;

};



int netxen_niu_xg_set_promiscuous_mode(struct netxen_adapter *adapter,

		u32 mode);

int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port);

int netxen_niu_disable_xg_port(struct netxen_adapter *adapter);



int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long reg,

			    __u32 * readval);

int netxen_niu_gbe_phy_write(struct netxen_adapter *adapter,

			     long reg, __u32 val);

int nx_fw_cmd_query_phy(struct netxen_adapter *adapter, u32 reg, u32 *val);

int nx_fw_cmd_set_phy(struct netxen_adapter *adapter, u32 reg, u32 val);



/* Functions available from netxen_nic_hw.c */

int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu);
@@ -1313,6 +1321,7 @@ int netxen_process_rcv_ring(struct nx_host_sds_ring *sds_ring, int max); 
void netxen_p2_nic_set_multi(struct net_device *netdev);

void netxen_p3_nic_set_multi(struct net_device *netdev);

void netxen_p3_free_mac_list(struct netxen_adapter *adapter);

int netxen_p2_nic_set_promisc(struct netxen_adapter *adapter, u32 mode);

int netxen_p3_nic_set_promisc(struct netxen_adapter *adapter, u32);

int netxen_config_intr_coalesce(struct netxen_adapter *adapter);

int netxen_config_rss(struct netxen_adapter *adapter, int enable);

drivers/net/netxen/netxen_nic_ctx.c

+38 −0
Original line number Diff line number Diff line
@@ -380,6 +380,44 @@ nx_fw_cmd_destroy_tx_ctx(struct netxen_adapter *adapter) 
	}

}



int

nx_fw_cmd_query_phy(struct netxen_adapter *adapter, u32 reg, u32 *val)

{

	u32 rcode;



	rcode = netxen_issue_cmd(adapter,

			adapter->ahw.pci_func,

			NXHAL_VERSION,

			reg,

			0,

			0,

			NX_CDRP_CMD_READ_PHY);



	if (rcode != NX_RCODE_SUCCESS)

		return -EIO;



	return NXRD32(adapter, NX_ARG1_CRB_OFFSET);

}



int

nx_fw_cmd_set_phy(struct netxen_adapter *adapter, u32 reg, u32 val)

{

	u32 rcode;



	rcode = netxen_issue_cmd(adapter,

			adapter->ahw.pci_func,

			NXHAL_VERSION,

			reg,

			val,

			0,

			NX_CDRP_CMD_WRITE_PHY);



	if (rcode != NX_RCODE_SUCCESS)

		return -EIO;



	return 0;

}



static u64 ctx_addr_sig_regs[][3] = {

	{NETXEN_NIC_REG(0x188), NETXEN_NIC_REG(0x18c), NETXEN_NIC_REG(0x1c0)},

	{NETXEN_NIC_REG(0x190), NETXEN_NIC_REG(0x194), NETXEN_NIC_REG(0x1c4)},

drivers/net/netxen/netxen_nic_hw.c

+79 −0
Original line number Diff line number Diff line
@@ -348,6 +348,35 @@ netxen_pcie_sem_unlock(struct netxen_adapter *adapter, int sem) 
	val = NXRD32(adapter, NETXEN_PCIE_REG(PCIE_SEM_UNLOCK(sem)));

}



int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port)

{

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

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

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

	}



	return 0;

}



/* Disable an XG interface */

int netxen_niu_disable_xg_port(struct netxen_adapter *adapter)

{

	__u32 mac_cfg;

	u32 port = adapter->physical_port;



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

		return 0;



	if (port > NETXEN_NIU_MAX_XG_PORTS)

		return -EINVAL;



	mac_cfg = 0;

	if (NXWR32(adapter,

			NETXEN_NIU_XGE_CONFIG_0 + (0x10000 * port), mac_cfg))

		return -EIO;

	return 0;

}



#define NETXEN_UNICAST_ADDR(port, index) \

	(NETXEN_UNICAST_ADDR_BASE+(port*32)+(index*8))

#define NETXEN_MCAST_ADDR(port, index) \
@@ -357,6 +386,56 @@ netxen_pcie_sem_unlock(struct netxen_adapter *adapter, int sem) 
#define MAC_LO(addr) \

	((addr[5] << 16) | (addr[4] << 8) | (addr[3]))



int netxen_p2_nic_set_promisc(struct netxen_adapter *adapter, u32 mode)

{

	__u32 reg;

	u32 port = adapter->physical_port;



	if (port > NETXEN_NIU_MAX_XG_PORTS)

		return -EINVAL;



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

	if (mode == NETXEN_NIU_PROMISC_MODE)

		reg = (reg | 0x2000UL);

	else

		reg = (reg & ~0x2000UL);



	if (mode == NETXEN_NIU_ALLMULTI_MODE)

		reg = (reg | 0x1000UL);

	else

		reg = (reg & ~0x1000UL);



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



	return 0;

}



int netxen_p2_nic_set_mac_addr(struct netxen_adapter *adapter, u8 *addr)

{

	u32 mac_hi, mac_lo;

	u32 reg_hi, reg_lo;



	u8 phy = adapter->physical_port;



	if (phy >= NETXEN_NIU_MAX_XG_PORTS)

		return -EINVAL;



	mac_lo = ((u32)addr[0] << 16) | ((u32)addr[1] << 24);

	mac_hi = addr[2] | ((u32)addr[3] << 8) |

		((u32)addr[4] << 16) | ((u32)addr[5] << 24);



	reg_lo = NETXEN_NIU_XGE_STATION_ADDR_0_1 + (0x10000 * phy);

	reg_hi = NETXEN_NIU_XGE_STATION_ADDR_0_HI + (0x10000 * phy);



	/* write twice to flush */

	if (NXWR32(adapter, reg_lo, mac_lo) || NXWR32(adapter, reg_hi, mac_hi))

		return -EIO;

	if (NXWR32(adapter, reg_lo, mac_lo) || NXWR32(adapter, reg_hi, mac_hi))

		return -EIO;



	return 0;

}



static int

netxen_nic_enable_mcast_filter(struct netxen_adapter *adapter)

{

drivers/net/netxen/netxen_nic_init.c

+5 −5
Original line number Diff line number Diff line
@@ -328,17 +328,17 @@ void netxen_initialize_adapter_ops(struct netxen_adapter *adapter) 
		adapter->macaddr_set = netxen_p2_nic_set_mac_addr;

		adapter->set_multi = netxen_p2_nic_set_multi;

		adapter->set_mtu = netxen_nic_set_mtu_xgb;

		adapter->set_promisc = netxen_niu_xg_set_promiscuous_mode;

		adapter->set_promisc = netxen_p2_nic_set_promisc;

	} else {

		adapter->set_mtu = nx_fw_cmd_set_mtu;

		adapter->set_promisc = netxen_p3_nic_set_promisc;

		adapter->macaddr_set = netxen_p3_nic_set_mac_addr;

		adapter->set_multi = netxen_p3_nic_set_multi;

	}



		if (adapter->ahw.port_type == NETXEN_NIC_GBE) {

		adapter->phy_read = netxen_niu_gbe_phy_read;

		adapter->phy_write = netxen_niu_gbe_phy_write;

			adapter->phy_read = nx_fw_cmd_query_phy;

			adapter->phy_write = nx_fw_cmd_set_phy;

		}

	}

}