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

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

netxen: fix bonding support 



o Pause traffic during mac addr change.
o Enable setting mac address for NX3031.

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

drivers/net/netxen/netxen_nic.h

+5 −1
Original line number Diff line number Diff line
@@ -1264,9 +1264,10 @@ struct netxen_adapter { 


	int (*enable_phy_interrupts) (struct netxen_adapter *);

	int (*disable_phy_interrupts) (struct netxen_adapter *);

	int (*macaddr_set) (struct netxen_adapter *, netxen_ethernet_macaddr_t);

	int (*macaddr_set) (struct netxen_adapter *, u8 *);

	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 (*init_port) (struct netxen_adapter *, int);
@@ -1331,6 +1332,9 @@ int netxen_niu_gbe_phy_write(struct netxen_adapter *adapter, 
int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu);

int netxen_nic_set_mtu_gb(struct netxen_adapter *adapter, int new_mtu);



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

int netxen_p3_nic_set_mac_addr(struct netxen_adapter *adapter, u8 *addr);



#define NXRD32(adapter, off) \

	(adapter->hw_read_wx(adapter, off))

#define NXWR32(adapter, off, val) \

drivers/net/netxen/netxen_nic_hw.c

+7 −21
Original line number Diff line number Diff line
@@ -321,27 +321,6 @@ static unsigned crb_hub_agt[64] = 


#define NETXEN_WINDOW_ONE 	0x2000000 /*CRB Window: bit 25 of CRB address */



int netxen_nic_set_mac(struct net_device *netdev, void *p)

{

	struct netxen_adapter *adapter = netdev_priv(netdev);

	struct sockaddr *addr = p;



	if (netif_running(netdev))

		return -EBUSY;



	if (!is_valid_ether_addr(addr->sa_data))

		return -EADDRNOTAVAIL;



	memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);



	/* For P3, MAC addr is not set in NIU */

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

		if (adapter->macaddr_set)

			adapter->macaddr_set(adapter, addr->sa_data);



	return 0;

}



#define NETXEN_UNICAST_ADDR(port, index) \

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

#define NETXEN_MCAST_ADDR(port, index) \
@@ -643,6 +622,13 @@ void netxen_p3_free_mac_list(struct netxen_adapter *adapter) 
	}

}



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

{

	/* assuming caller has already copied new addr to netdev */

	netxen_p3_nic_set_multi(adapter->netdev);

	return 0;

}



#define	NETXEN_CONFIG_INTR_COALESCE	3



/*

drivers/net/netxen/netxen_nic_hw.h

+0 −10
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ struct netxen_adapter; 


void netxen_nic_set_link_parameters(struct netxen_adapter *adapter);



typedef u8 netxen_ethernet_macaddr_t[6];



/* Nibble or Byte mode for phy interface (GbE mode only) */



#define _netxen_crb_get_bit(var, bit)  ((var >> bit) & 0x1)
@@ -395,14 +393,6 @@ int netxen_niu_set_promiscuous_mode(struct netxen_adapter *adapter, 
int netxen_niu_xg_set_promiscuous_mode(struct netxen_adapter *adapter,

				       u32 mode);



/* set the MAC address for a given MAC */

int netxen_niu_macaddr_set(struct netxen_adapter *adapter,

			   netxen_ethernet_macaddr_t addr);



/* XG version */

int netxen_niu_xg_macaddr_set(struct netxen_adapter *adapter,

			      netxen_ethernet_macaddr_t addr);



/* Generic enable for GbE ports. Will detect the speed of the link. */

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

drivers/net/netxen/netxen_nic_init.c

+5 −2
Original line number Diff line number Diff line
@@ -319,13 +319,15 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter) 


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;



	switch (adapter->ahw.port_type) {

	case NETXEN_NIC_GBE:

		adapter->enable_phy_interrupts =

		    netxen_niu_gbe_enable_phy_interrupts;

		adapter->disable_phy_interrupts =

		    netxen_niu_gbe_disable_phy_interrupts;

		adapter->macaddr_set = netxen_niu_macaddr_set;

		adapter->set_mtu = netxen_nic_set_mtu_gb;

		adapter->set_promisc = netxen_niu_set_promiscuous_mode;

		adapter->phy_read = netxen_niu_gbe_phy_read;
@@ -339,7 +341,6 @@ void netxen_initialize_adapter_ops(struct netxen_adapter *adapter) 
		    netxen_niu_xgbe_enable_phy_interrupts;

		adapter->disable_phy_interrupts =

		    netxen_niu_xgbe_disable_phy_interrupts;

		adapter->macaddr_set = netxen_niu_xg_macaddr_set;

		adapter->set_mtu = netxen_nic_set_mtu_xgb;

		adapter->init_port = netxen_niu_xg_init_port;

		adapter->set_promisc = netxen_niu_xg_set_promiscuous_mode;
@@ -353,6 +354,8 @@ void netxen_initialize_adapter_ops(struct netxen_adapter *adapter) 
	if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {

		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;

	}

}

drivers/net/netxen/netxen_nic_main.c

+32 −13
Original line number Diff line number Diff line
@@ -442,20 +442,38 @@ netxen_read_mac_addr(struct netxen_adapter *adapter) 


	if (!is_valid_ether_addr(netdev->perm_addr))

		dev_warn(&pdev->dev, "Bad MAC address %pM.\n", netdev->dev_addr);

	else

		adapter->macaddr_set(adapter, netdev->dev_addr);



	return 0;

}



int netxen_nic_set_mac(struct net_device *netdev, void *p)

{

	struct netxen_adapter *adapter = netdev_priv(netdev);

	struct sockaddr *addr = p;



	if (!is_valid_ether_addr(addr->sa_data))

		return -EINVAL;



	if (netif_running(netdev)) {

		netif_device_detach(netdev);

		netxen_napi_disable(adapter);

	}



	memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);

	adapter->macaddr_set(adapter, addr->sa_data);



	if (netif_running(netdev)) {

		netif_device_attach(netdev);

		netxen_napi_enable(adapter);

	}

	return 0;

}



static void netxen_set_multicast_list(struct net_device *dev)

{

	struct netxen_adapter *adapter = netdev_priv(dev);



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

		netxen_p3_nic_set_multi(dev);

	else

		netxen_p2_nic_set_multi(dev);

	adapter->set_multi(dev);

}



static const struct net_device_ops netxen_netdev_ops = {
@@ -782,16 +800,13 @@ netxen_nic_up(struct netxen_adapter *adapter, struct net_device *netdev) 
				netxen_nic_driver_name, adapter->portnum);

		return err;

	}

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

		adapter->macaddr_set(adapter, netdev->dev_addr);



	netxen_nic_set_link_parameters(adapter);



	netxen_set_multicast_list(netdev);

	if (adapter->set_mtu)

	adapter->set_multi(netdev);

	adapter->set_mtu(adapter, netdev->mtu);



	adapter->ahw.linkup = 0;

	mod_timer(&adapter->watchdog_timer, jiffies);



	netxen_napi_enable(adapter);
@@ -800,6 +815,10 @@ netxen_nic_up(struct netxen_adapter *adapter, struct net_device *netdev) 


	if (adapter->capabilities & NX_FW_CAPABILITY_LINK_NOTIFICATION)

		netxen_linkevent_request(adapter, 1);

	else

		netxen_nic_set_link_parameters(adapter);



	mod_timer(&adapter->watchdog_timer, jiffies);



	return 0;

}