Commit d00a90ca authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'asix-pm-improvements' 



Robert Foss says:

====================
net/usb: asix driver improvements

This is a resubmission of v3, since the netdev
mailinlist was not sent the previous submission.

This series improves power management of the asix driver.

 - Suspend/resume support is improved to save needed registers.
 - Device disconnection is improved.
 - Fixes AX88772x resume failures
 - Implementes IEEE 802.3 spec section "22.2.4.1.1 Reset" correctly
 - Fixes AX_CMD_WRITE_MEDIUM_MODE being set incorrectly

Changes since v1:
- Added proper metadata tags to series.
- Added two more patches to series.

Changes since v2:
- Added coverletter
- Tested patches on AX88772A/AX88772B/AX88178/AX88179 hardware
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c7735f1b 535baf85

drivers/net/usb/asix.h

+30 −10
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#define AX_CMD_SET_SW_MII		0x06

#define AX_CMD_READ_MII_REG		0x07

#define AX_CMD_WRITE_MII_REG		0x08

#define AX_CMD_STATMNGSTS_REG		0x09

#define AX_CMD_SET_HW_MII		0x0a

#define AX_CMD_READ_EEPROM		0x0b

#define AX_CMD_WRITE_EEPROM		0x0c
@@ -71,6 +72,17 @@ 
#define AX_CMD_SW_RESET			0x20

#define AX_CMD_SW_PHY_STATUS		0x21

#define AX_CMD_SW_PHY_SELECT		0x22

#define AX_QCTCTRL			0x2A



#define AX_CHIPCODE_MASK		0x70

#define AX_AX88772_CHIPCODE		0x00

#define AX_AX88772A_CHIPCODE		0x10

#define AX_AX88772B_CHIPCODE		0x20

#define AX_HOST_EN			0x01



#define AX_PHYSEL_PSEL			0x01

#define AX_PHYSEL_SSMII			0

#define AX_PHYSEL_SSEN			0x10



#define AX_PHY_SELECT_MASK		(BIT(3) | BIT(2))

#define AX_PHY_SELECT_INTERNAL		0
@@ -173,6 +185,10 @@ struct asix_rx_fixup_info { 
};



struct asix_common_private {

	void (*resume)(struct usbnet *dev);

	void (*suspend)(struct usbnet *dev);

	u16 presvd_phy_advertise;

	u16 presvd_phy_bmcr;

	struct asix_rx_fixup_info rx_fixup_info;

};
@@ -182,10 +198,10 @@ extern const struct driver_info ax88172a_info; 
#define FLAG_EEPROM_MAC		(1UL << 0)  /* init device MAC from eeprom */



int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,

		  u16 size, void *data);

		  u16 size, void *data, int in_pm);



int asix_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,

		   u16 size, void *data);

		   u16 size, void *data, int in_pm);



void asix_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value,

			  u16 index, u16 size, void *data);
@@ -197,27 +213,31 @@ int asix_rx_fixup_common(struct usbnet *dev, struct sk_buff *skb); 
struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb,

			      gfp_t flags);



int asix_set_sw_mii(struct usbnet *dev);

int asix_set_hw_mii(struct usbnet *dev);

int asix_set_sw_mii(struct usbnet *dev, int in_pm);

int asix_set_hw_mii(struct usbnet *dev, int in_pm);



int asix_read_phy_addr(struct usbnet *dev, int internal);

int asix_get_phy_addr(struct usbnet *dev);



int asix_sw_reset(struct usbnet *dev, u8 flags);

int asix_sw_reset(struct usbnet *dev, u8 flags, int in_pm);



u16 asix_read_rx_ctl(struct usbnet *dev);

int asix_write_rx_ctl(struct usbnet *dev, u16 mode);

u16 asix_read_rx_ctl(struct usbnet *dev, int in_pm);

int asix_write_rx_ctl(struct usbnet *dev, u16 mode, int in_pm);



u16 asix_read_medium_status(struct usbnet *dev);

int asix_write_medium_mode(struct usbnet *dev, u16 mode);

u16 asix_read_medium_status(struct usbnet *dev, int in_pm);

int asix_write_medium_mode(struct usbnet *dev, u16 mode, int in_pm);



int asix_write_gpio(struct usbnet *dev, u16 value, int sleep);

int asix_write_gpio(struct usbnet *dev, u16 value, int sleep, int in_pm);



void asix_set_multicast(struct net_device *net);



int asix_mdio_read(struct net_device *netdev, int phy_id, int loc);

void asix_mdio_write(struct net_device *netdev, int phy_id, int loc, int val);



int asix_mdio_read_nopm(struct net_device *netdev, int phy_id, int loc);

void asix_mdio_write_nopm(struct net_device *netdev, int phy_id, int loc,

			  int val);



void asix_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo);

int asix_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo);

drivers/net/usb/asix_common.c

+169 −43
Original line number Diff line number Diff line
@@ -22,24 +22,49 @@ 
#include "asix.h"



int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,

		  u16 size, void *data)

		  u16 size, void *data, int in_pm)

{

	int ret;

	ret = usbnet_read_cmd(dev, cmd,

			       USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

	int (*fn)(struct usbnet *, u8, u8, u16, u16, void *, u16);



	BUG_ON(!dev);



	if (!in_pm)

		fn = usbnet_read_cmd;

	else

		fn = usbnet_read_cmd_nopm;



	ret = fn(dev, cmd, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

		 value, index, data, size);



	if (ret != size && ret >= 0)

		return -EINVAL;

	if (unlikely(ret < 0))

		netdev_warn(dev->net, "Failed to read reg index 0x%04x: %d\n",

			    index, ret);



	return ret;

}



int asix_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,

		   u16 size, void *data)

		   u16 size, void *data, int in_pm)

{

	return usbnet_write_cmd(dev, cmd,

				USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

	int ret;

	int (*fn)(struct usbnet *, u8, u8, u16, u16, const void *, u16);



	BUG_ON(!dev);



	if (!in_pm)

		fn = usbnet_write_cmd;

	else

		fn = usbnet_write_cmd_nopm;



	ret = fn(dev, cmd, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

		 value, index, data, size);



	if (unlikely(ret < 0))

		netdev_warn(dev->net, "Failed to write reg index 0x%04x: %d\n",

			    index, ret);



	return ret;

}



void asix_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index,
@@ -225,19 +250,20 @@ struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb, 
	return skb;

}



int asix_set_sw_mii(struct usbnet *dev)

int asix_set_sw_mii(struct usbnet *dev, int in_pm)

{

	int ret;

	ret = asix_write_cmd(dev, AX_CMD_SET_SW_MII, 0x0000, 0, 0, NULL);

	ret = asix_write_cmd(dev, AX_CMD_SET_SW_MII, 0x0000, 0, 0, NULL, in_pm);



	if (ret < 0)

		netdev_err(dev->net, "Failed to enable software MII access\n");

	return ret;

}



int asix_set_hw_mii(struct usbnet *dev)

int asix_set_hw_mii(struct usbnet *dev, int in_pm)

{

	int ret;

	ret = asix_write_cmd(dev, AX_CMD_SET_HW_MII, 0x0000, 0, 0, NULL);

	ret = asix_write_cmd(dev, AX_CMD_SET_HW_MII, 0x0000, 0, 0, NULL, in_pm);

	if (ret < 0)

		netdev_err(dev->net, "Failed to enable hardware MII access\n");

	return ret;
@@ -247,7 +273,7 @@ int asix_read_phy_addr(struct usbnet *dev, int internal) 
{

	int offset = (internal ? 1 : 0);

	u8 buf[2];

	int ret = asix_read_cmd(dev, AX_CMD_READ_PHY_ID, 0, 0, 2, buf);

	int ret = asix_read_cmd(dev, AX_CMD_READ_PHY_ID, 0, 0, 2, buf, 0);



	netdev_dbg(dev->net, "asix_get_phy_addr()\n");
@@ -270,21 +296,21 @@ int asix_get_phy_addr(struct usbnet *dev) 
}





int asix_sw_reset(struct usbnet *dev, u8 flags)

int asix_sw_reset(struct usbnet *dev, u8 flags, int in_pm)

{

	int ret;



        ret = asix_write_cmd(dev, AX_CMD_SW_RESET, flags, 0, 0, NULL);

	ret = asix_write_cmd(dev, AX_CMD_SW_RESET, flags, 0, 0, NULL, in_pm);

	if (ret < 0)

		netdev_err(dev->net, "Failed to send software reset: %02x\n", ret);



	return ret;

}



u16 asix_read_rx_ctl(struct usbnet *dev)

u16 asix_read_rx_ctl(struct usbnet *dev, int in_pm)

{

	__le16 v;

	int ret = asix_read_cmd(dev, AX_CMD_READ_RX_CTL, 0, 0, 2, &v);

	int ret = asix_read_cmd(dev, AX_CMD_READ_RX_CTL, 0, 0, 2, &v, in_pm);



	if (ret < 0) {

		netdev_err(dev->net, "Error reading RX_CTL register: %02x\n", ret);
@@ -295,12 +321,12 @@ out: 
	return ret;

}



int asix_write_rx_ctl(struct usbnet *dev, u16 mode)

int asix_write_rx_ctl(struct usbnet *dev, u16 mode, int in_pm)

{

	int ret;



	netdev_dbg(dev->net, "asix_write_rx_ctl() - mode = 0x%04x\n", mode);

	ret = asix_write_cmd(dev, AX_CMD_WRITE_RX_CTL, mode, 0, 0, NULL);

	ret = asix_write_cmd(dev, AX_CMD_WRITE_RX_CTL, mode, 0, 0, NULL, in_pm);

	if (ret < 0)

		netdev_err(dev->net, "Failed to write RX_CTL mode to 0x%04x: %02x\n",

			   mode, ret);
@@ -308,10 +334,11 @@ int asix_write_rx_ctl(struct usbnet *dev, u16 mode) 
	return ret;

}



u16 asix_read_medium_status(struct usbnet *dev)

u16 asix_read_medium_status(struct usbnet *dev, int in_pm)

{

	__le16 v;

	int ret = asix_read_cmd(dev, AX_CMD_READ_MEDIUM_STATUS, 0, 0, 2, &v);

	int ret = asix_read_cmd(dev, AX_CMD_READ_MEDIUM_STATUS,

				0, 0, 2, &v, in_pm);



	if (ret < 0) {

		netdev_err(dev->net, "Error reading Medium Status register: %02x\n",
@@ -323,12 +350,13 @@ u16 asix_read_medium_status(struct usbnet *dev) 


}



int asix_write_medium_mode(struct usbnet *dev, u16 mode)

int asix_write_medium_mode(struct usbnet *dev, u16 mode, int in_pm)

{

	int ret;



	netdev_dbg(dev->net, "asix_write_medium_mode() - mode = 0x%04x\n", mode);

	ret = asix_write_cmd(dev, AX_CMD_WRITE_MEDIUM_MODE, mode, 0, 0, NULL);

	ret = asix_write_cmd(dev, AX_CMD_WRITE_MEDIUM_MODE,

			     mode, 0, 0, NULL, in_pm);

	if (ret < 0)

		netdev_err(dev->net, "Failed to write Medium Mode mode to 0x%04x: %02x\n",

			   mode, ret);
@@ -336,12 +364,12 @@ int asix_write_medium_mode(struct usbnet *dev, u16 mode) 
	return ret;

}



int asix_write_gpio(struct usbnet *dev, u16 value, int sleep)

int asix_write_gpio(struct usbnet *dev, u16 value, int sleep, int in_pm)

{

	int ret;



	netdev_dbg(dev->net, "asix_write_gpio() - value = 0x%04x\n", value);

	ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS, value, 0, 0, NULL);

	ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS, value, 0, 0, NULL, in_pm);

	if (ret < 0)

		netdev_err(dev->net, "Failed to write GPIO value 0x%04x: %02x\n",

			   value, ret);
@@ -398,12 +426,27 @@ int asix_mdio_read(struct net_device *netdev, int phy_id, int loc) 
{

	struct usbnet *dev = netdev_priv(netdev);

	__le16 res;

	u8 smsr;

	int i = 0;

	int ret;



	mutex_lock(&dev->phy_mutex);

	asix_set_sw_mii(dev);

	do {

		ret = asix_set_sw_mii(dev, 0);

		if (ret == -ENODEV)

			break;

		usleep_range(1000, 1100);

		ret = asix_read_cmd(dev, AX_CMD_STATMNGSTS_REG,

				    0, 0, 1, &smsr, 0);

	} while (!(smsr & AX_HOST_EN) && (i++ < 30) && (ret != -ENODEV));

	if (ret == -ENODEV) {

		mutex_unlock(&dev->phy_mutex);

		return ret;

	}



	asix_read_cmd(dev, AX_CMD_READ_MII_REG, phy_id,

				(__u16)loc, 2, &res);

	asix_set_hw_mii(dev);

				(__u16)loc, 2, &res, 0);

	asix_set_hw_mii(dev, 0);

	mutex_unlock(&dev->phy_mutex);



	netdev_dbg(dev->net, "asix_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x\n",
@@ -416,13 +459,95 @@ void asix_mdio_write(struct net_device *netdev, int phy_id, int loc, int val) 
{

	struct usbnet *dev = netdev_priv(netdev);

	__le16 res = cpu_to_le16(val);

	u8 smsr;

	int i = 0;

	int ret;



	netdev_dbg(dev->net, "asix_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x\n",

			phy_id, loc, val);



	mutex_lock(&dev->phy_mutex);

	asix_set_sw_mii(dev);

	asix_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id, (__u16)loc, 2, &res);

	asix_set_hw_mii(dev);

	do {

		ret = asix_set_sw_mii(dev, 0);

		if (ret == -ENODEV)

			break;

		usleep_range(1000, 1100);

		ret = asix_read_cmd(dev, AX_CMD_STATMNGSTS_REG,

				    0, 0, 1, &smsr, 0);

	} while (!(smsr & AX_HOST_EN) && (i++ < 30) && (ret != -ENODEV));

	if (ret == -ENODEV) {

		mutex_unlock(&dev->phy_mutex);

		return;

	}



	asix_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id,

		       (__u16)loc, 2, &res, 0);

	asix_set_hw_mii(dev, 0);

	mutex_unlock(&dev->phy_mutex);

}



int asix_mdio_read_nopm(struct net_device *netdev, int phy_id, int loc)

{

	struct usbnet *dev = netdev_priv(netdev);

	__le16 res;

	u8 smsr;

	int i = 0;

	int ret;



	mutex_lock(&dev->phy_mutex);

	do {

		ret = asix_set_sw_mii(dev, 1);

		if (ret == -ENODEV)

			break;

		usleep_range(1000, 1100);

		ret = asix_read_cmd(dev, AX_CMD_STATMNGSTS_REG,

				    0, 0, 1, &smsr, 1);

	} while (!(smsr & AX_HOST_EN) && (i++ < 30) && (ret != -ENODEV));

	if (ret == -ENODEV) {

		mutex_unlock(&dev->phy_mutex);

		return ret;

	}



	asix_read_cmd(dev, AX_CMD_READ_MII_REG, phy_id,

		      (__u16)loc, 2, &res, 1);

	asix_set_hw_mii(dev, 1);

	mutex_unlock(&dev->phy_mutex);



	netdev_dbg(dev->net, "asix_mdio_read_nopm() phy_id=0x%02x, loc=0x%02x, returns=0x%04x\n",

			phy_id, loc, le16_to_cpu(res));



	return le16_to_cpu(res);

}



void

asix_mdio_write_nopm(struct net_device *netdev, int phy_id, int loc, int val)

{

	struct usbnet *dev = netdev_priv(netdev);

	__le16 res = cpu_to_le16(val);

	u8 smsr;

	int i = 0;

	int ret;



	netdev_dbg(dev->net, "asix_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x\n",

			phy_id, loc, val);



	mutex_lock(&dev->phy_mutex);

	do {

		ret = asix_set_sw_mii(dev, 1);

		if (ret == -ENODEV)

			break;

		usleep_range(1000, 1100);

		ret = asix_read_cmd(dev, AX_CMD_STATMNGSTS_REG,

				    0, 0, 1, &smsr, 1);

	} while (!(smsr & AX_HOST_EN) && (i++ < 30) && (ret != -ENODEV));

	if (ret == -ENODEV) {

		mutex_unlock(&dev->phy_mutex);

		return;

	}



	asix_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id,

		       (__u16)loc, 2, &res, 1);

	asix_set_hw_mii(dev, 1);

	mutex_unlock(&dev->phy_mutex);

}
@@ -431,7 +556,8 @@ void asix_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo) 
	struct usbnet *dev = netdev_priv(net);

	u8 opt;



	if (asix_read_cmd(dev, AX_CMD_READ_MONITOR_MODE, 0, 0, 1, &opt) < 0) {

	if (asix_read_cmd(dev, AX_CMD_READ_MONITOR_MODE,

			  0, 0, 1, &opt, 0) < 0) {

		wolinfo->supported = 0;

		wolinfo->wolopts = 0;

		return;
@@ -455,7 +581,7 @@ int asix_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo) 
		opt |= AX_MONITOR_MAGIC;



	if (asix_write_cmd(dev, AX_CMD_WRITE_MONITOR_MODE,

			      opt, 0, 0, NULL) < 0)

			      opt, 0, 0, NULL, 0) < 0)

		return -EINVAL;



	return 0;
@@ -490,7 +616,7 @@ int asix_get_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom, 
	/* ax8817x returns 2 bytes from eeprom on read */

	for (i = first_word; i <= last_word; i++) {

		if (asix_read_cmd(dev, AX_CMD_READ_EEPROM, i, 0, 2,

				  &(eeprom_buff[i - first_word])) < 0) {

				  &eeprom_buff[i - first_word], 0) < 0) {

			kfree(eeprom_buff);

			return -EIO;

		}
@@ -531,7 +657,7 @@ int asix_set_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom, 
	   the EEPROM */

	if (eeprom->offset & 1) {

		ret = asix_read_cmd(dev, AX_CMD_READ_EEPROM, first_word, 0, 2,

				    &(eeprom_buff[0]));

				    &eeprom_buff[0], 0);

		if (ret < 0) {

			netdev_err(net, "Failed to read EEPROM at offset 0x%02x.\n", first_word);

			goto free;
@@ -540,7 +666,7 @@ int asix_set_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom, 


	if ((eeprom->offset + eeprom->len) & 1) {

		ret = asix_read_cmd(dev, AX_CMD_READ_EEPROM, last_word, 0, 2,

				    &(eeprom_buff[last_word - first_word]));

				    &eeprom_buff[last_word - first_word], 0);

		if (ret < 0) {

			netdev_err(net, "Failed to read EEPROM at offset 0x%02x.\n", last_word);

			goto free;
@@ -550,7 +676,7 @@ int asix_set_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom, 
	memcpy((u8 *)eeprom_buff + (eeprom->offset & 1), data, eeprom->len);



	/* write data to EEPROM */

	ret = asix_write_cmd(dev, AX_CMD_WRITE_ENABLE, 0x0000, 0, 0, NULL);

	ret = asix_write_cmd(dev, AX_CMD_WRITE_ENABLE, 0x0000, 0, 0, NULL, 0);

	if (ret < 0) {

		netdev_err(net, "Failed to enable EEPROM write\n");

		goto free;
@@ -561,7 +687,7 @@ int asix_set_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom, 
		netdev_dbg(net, "write to EEPROM at offset 0x%02x, data 0x%04x\n",

			   i, eeprom_buff[i - first_word]);

		ret = asix_write_cmd(dev, AX_CMD_WRITE_EEPROM, i,

				     eeprom_buff[i - first_word], 0, NULL);

				     eeprom_buff[i - first_word], 0, NULL, 0);

		if (ret < 0) {

			netdev_err(net, "Failed to write EEPROM at offset 0x%02x.\n",

				   i);
@@ -570,7 +696,7 @@ int asix_set_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom, 
		msleep(20);

	}



	ret = asix_write_cmd(dev, AX_CMD_WRITE_DISABLE, 0x0000, 0, 0, NULL);

	ret = asix_write_cmd(dev, AX_CMD_WRITE_DISABLE, 0x0000, 0, 0, NULL, 0);

	if (ret < 0) {

		netdev_err(net, "Failed to disable EEPROM write\n");

		goto free;

drivers/net/usb/asix_devices.c

+361 −89

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/usb/ax88172a.c

+15 −14
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void ax88172a_adjust_link(struct net_device *netdev) 
	}



	if (mode != priv->oldmode) {

		asix_write_medium_mode(dev, mode);

		asix_write_medium_mode(dev, mode, 0);

		priv->oldmode = mode;

		netdev_dbg(netdev, "speed %u duplex %d, setting mode to 0x%04x\n",

			   phydev->speed, phydev->duplex, mode);
@@ -176,18 +176,19 @@ static int ax88172a_reset_phy(struct usbnet *dev, int embd_phy) 
{

	int ret;



	ret = asix_sw_reset(dev, AX_SWRESET_IPPD);

	ret = asix_sw_reset(dev, AX_SWRESET_IPPD, 0);

	if (ret < 0)

		goto err;



	msleep(150);

	ret = asix_sw_reset(dev, AX_SWRESET_CLEAR);

	ret = asix_sw_reset(dev, AX_SWRESET_CLEAR, 0);

	if (ret < 0)

		goto err;



	msleep(150);



	ret = asix_sw_reset(dev, embd_phy ? AX_SWRESET_IPRL : AX_SWRESET_IPPD);

	ret = asix_sw_reset(dev, embd_phy ? AX_SWRESET_IPRL : AX_SWRESET_IPPD,

			    0);

	if (ret < 0)

		goto err;
@@ -213,7 +214,7 @@ static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf) 
	dev->driver_priv = priv;



	/* Get the MAC address */

	ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID, 0, 0, ETH_ALEN, buf);

	ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID, 0, 0, ETH_ALEN, buf, 0);

	if (ret < 0) {

		netdev_err(dev->net, "Failed to read MAC address: %d\n", ret);

		goto free;
@@ -224,7 +225,7 @@ static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf) 
	dev->net->ethtool_ops = &ax88172a_ethtool_ops;



	/* are we using the internal or the external phy? */

	ret = asix_read_cmd(dev, AX_CMD_SW_PHY_STATUS, 0, 0, 1, buf);

	ret = asix_read_cmd(dev, AX_CMD_SW_PHY_STATUS, 0, 0, 1, buf, 0);

	if (ret < 0) {

		netdev_err(dev->net, "Failed to read software interface selection register: %d\n",

			   ret);
@@ -303,20 +304,20 @@ static int ax88172a_reset(struct usbnet *dev) 
	ax88172a_reset_phy(dev, priv->use_embdphy);



	msleep(150);

	rx_ctl = asix_read_rx_ctl(dev);

	rx_ctl = asix_read_rx_ctl(dev, 0);

	netdev_dbg(dev->net, "RX_CTL is 0x%04x after software reset\n", rx_ctl);

	ret = asix_write_rx_ctl(dev, 0x0000);

	ret = asix_write_rx_ctl(dev, 0x0000, 0);

	if (ret < 0)

		goto out;



	rx_ctl = asix_read_rx_ctl(dev);

	rx_ctl = asix_read_rx_ctl(dev, 0);

	netdev_dbg(dev->net, "RX_CTL is 0x%04x setting to 0x0000\n", rx_ctl);



	msleep(150);



	ret = asix_write_cmd(dev, AX_CMD_WRITE_IPG0,

			     AX88772_IPG0_DEFAULT | AX88772_IPG1_DEFAULT,

			     AX88772_IPG2_DEFAULT, 0, NULL);

			     AX88772_IPG2_DEFAULT, 0, NULL, 0);

	if (ret < 0) {

		netdev_err(dev->net, "Write IPG,IPG1,IPG2 failed: %d\n", ret);

		goto out;
@@ -325,20 +326,20 @@ static int ax88172a_reset(struct usbnet *dev) 
	/* Rewrite MAC address */

	memcpy(data->mac_addr, dev->net->dev_addr, ETH_ALEN);

	ret = asix_write_cmd(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,

			     data->mac_addr);

			     data->mac_addr, 0);

	if (ret < 0)

		goto out;



	/* Set RX_CTL to default values with 2k buffer, and enable cactus */

	ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL);

	ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL, 0);

	if (ret < 0)

		goto out;



	rx_ctl = asix_read_rx_ctl(dev);

	rx_ctl = asix_read_rx_ctl(dev, 0);

	netdev_dbg(dev->net, "RX_CTL is 0x%04x after all initializations\n",

		   rx_ctl);



	rx_ctl = asix_read_medium_status(dev);

	rx_ctl = asix_read_medium_status(dev, 0);

	netdev_dbg(dev->net, "Medium Status is 0x%04x after all initializations\n",

		   rx_ctl);

CRA Git | Maintained and supported by SUSTech CRA and CCSE