USB: asix: Detect internal PHY and enable/use accordingly (d0ffff8f) · Commits · 戴 / test

Different AX88772 dongles use different PHYs; the chip is capable of using both a primary and secondary PHY, and supports an internal and external PHY. It appears that some DUB-E100 devices use the internal PHY, so trying to use an external one will not work (note that this is different across revisions, as well; the "A" and "B" revs of the DUB-E100 use different PHYs!). The data sheet for the AX88772 chip specifies that the internal PHY id will be 0x10, so if that's read from the EEPROM, we should use that rather than attempting to use an external PHY. Thanks to Mitch Bradley for pointing this out! Signed-off-by:

Andres Salomon <dilinger@debian.org> Cc: David Hollis <dhollis@davehollis.com> Cc: Chris Ball <cjb@laptop.org> Signed-off-by:

Greg Kroah-Hartman <gregkh@suse.de>

drivers/usb/net/asix.c

+13 −5

Original line number	Diff line number	Diff line
		@@ -898,7 +898,7 @@ static int ax88772_link_reset(struct usbnet *dev)

		static int ax88772_bind(struct usbnet dev, struct usb_interface intf)
		{
		int ret;
		int ret, embd_phy;
		void *buf;
		u16 rx_ctl;
		struct asix_data data = (struct asix_data )&dev->data;
		@@ -919,13 +919,15 @@ static int ax88772_bind(struct usbnet dev, struct usb_interface intf)
		AX_GPIO_RSE \| AX_GPIO_GPO_2 \| AX_GPIO_GPO2EN, 5)) < 0)
		goto out2;

		/* 0x10 is the phy id of the embedded 10/100 ethernet phy */
		embd_phy = ((asix_get_phy_addr(dev) & 0x1f) == 0x10 ? 1 : 0);
		if ((ret = asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT,
		1, 0, 0, buf)) < 0) {
		embd_phy, 0, 0, buf)) < 0) {
		dbg("Select PHY #1 failed: %d", ret);
		goto out2;
		}

		if ((ret = asix_sw_reset(dev, AX_SWRESET_IPPD)) < 0)
		if ((ret = asix_sw_reset(dev, AX_SWRESET_IPPD \| AX_SWRESET_PRL)) < 0)
		goto out2;

		msleep(150);
		@@ -933,8 +935,14 @@ static int ax88772_bind(struct usbnet dev, struct usb_interface intf)
		goto out2;

		msleep(150);
		if ((ret = asix_sw_reset(dev, AX_SWRESET_IPRL \| AX_SWRESET_PRL)) < 0)
		if (embd_phy) {
		if ((ret = asix_sw_reset(dev, AX_SWRESET_IPRL)) < 0)
		goto out2;
		}
		else {
		if ((ret = asix_sw_reset(dev, AX_SWRESET_PRTE)) < 0)
		goto out2;
		}

		msleep(150);
		rx_ctl = asix_read_rx_ctl(dev);

Admin message