Commit df2d59a2 authored by Dmitry Bezrukov's avatar Dmitry Bezrukov Committed by David S. Miller
Browse files

net: usb: aqc111: Add support for getting and setting of MAC address 



Signed-off-by: default avatarDmitry Bezrukov <dmitry.bezrukov@aquantia.com>
Signed-off-by: default avatarIgor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7b8b0654

drivers/net/usb/aqc111.c

+47 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/netdevice.h>

#include <linux/mii.h>

#include <linux/usb.h>

#include <linux/if_vlan.h>

#include <linux/usb/cdc.h>

#include <linux/usb/usbnet.h>
@@ -204,11 +205,43 @@ static void aqc111_set_phy_speed(struct usbnet *dev, u8 autoneg, u16 speed) 
	aqc111_write32_cmd(dev, AQ_PHY_OPS, 0, 0, &aqc111_data->phy_cfg);

}



static int aqc111_set_mac_addr(struct net_device *net, void *p)

{

	struct usbnet *dev = netdev_priv(net);

	int ret = 0;



	ret = eth_mac_addr(net, p);

	if (ret < 0)

		return ret;



	/* Set the MAC address */

	return aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_NODE_ID, ETH_ALEN,

				ETH_ALEN, net->dev_addr);

}



static const struct net_device_ops aqc111_netdev_ops = {

	.ndo_open		= usbnet_open,

	.ndo_stop		= usbnet_stop,

	.ndo_set_mac_address	= aqc111_set_mac_addr,

	.ndo_validate_addr	= eth_validate_addr,

};



static int aqc111_read_perm_mac(struct usbnet *dev)

{

	u8 buf[ETH_ALEN];

	int ret;



	ret = aqc111_read_cmd(dev, AQ_FLASH_PARAMETERS, 0, 0, ETH_ALEN, buf);

	if (ret < 0)

		goto out;



	ether_addr_copy(dev->net->perm_addr, buf);



	return 0;

out:

	return ret;

}



static void aqc111_read_fw_version(struct usbnet *dev,

				   struct aqc111_data *aqc111_data)

{
@@ -251,6 +284,12 @@ static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf) 
	/* store aqc111_data pointer in device data field */

	dev->driver_priv = aqc111_data;



	/* Init the MAC address */

	ret = aqc111_read_perm_mac(dev);

	if (ret)

		goto out;



	ether_addr_copy(dev->net->dev_addr, dev->net->perm_addr);

	dev->net->netdev_ops = &aqc111_netdev_ops;



	aqc111_read_fw_version(dev, aqc111_data);
@@ -259,6 +298,10 @@ static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf) 
					 SPEED_5000 : SPEED_1000;



	return 0;



out:

	kfree(aqc111_data);

	return ret;

}



static void aqc111_unbind(struct usbnet *dev, struct usb_interface *intf)
@@ -467,6 +510,10 @@ static int aqc111_reset(struct usbnet *dev) 
	aqc111_write32_cmd(dev, AQ_PHY_OPS, 0, 0,

			   &aqc111_data->phy_cfg);



	/* Set the MAC address */

	aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_NODE_ID, ETH_ALEN,

			 ETH_ALEN, dev->net->dev_addr);



	reg8 = 0xFF;

	aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_BM_INT_MASK, 1, 1, &reg8);

drivers/net/usb/aqc111.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#define __LINUX_USBNET_AQC111_H



#define AQ_ACCESS_MAC			0x01

#define AQ_FLASH_PARAMETERS		0x20

#define AQ_PHY_POWER			0x31

#define AQ_PHY_OPS			0x61