Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1470382
| From | robert.foss@collabora.com |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v3 3/5] net: asix: Fix AX88772x resume failures |
| Date | 2016-08-25 22:20 +0200 |
| Message-ID | <sa9i2-5Ly-13@gated-at.bofh.it> (permalink) |
| References | <sa9i1-5Ly-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Allan Chou <allan@asix.com.tw>
The change fixes AX88772x resume failure by
- Restore incorrect AX88772A PHY registers when resetting
- Need to stop MAC operation when suspending
- Need to restart MII when restoring PHY
Signed-off-by: Allan Chou <allan@asix.com.tw>
Signed-off-by: Robert Foss <robert.foss@collabora.com>
Tested-by: Robert Foss <robert.foss@collabora.com>
---
drivers/net/usb/asix_devices.c | 47 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 46 insertions(+), 1 deletion(-)
diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index ebeb730..083dc2e 100644
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -35,6 +35,15 @@
#define PHY_MODE_RTL8211CL 0x000C
+#define AX88772A_PHY14H 0x14
+#define AX88772A_PHY14H_DEFAULT 0x442C
+
+#define AX88772A_PHY15H 0x15
+#define AX88772A_PHY15H_DEFAULT 0x03C8
+
+#define AX88772A_PHY16H 0x16
+#define AX88772A_PHY16H_DEFAULT 0x4044
+
struct ax88172_int_data {
__le16 res1;
u8 link;
@@ -424,7 +433,7 @@ static int ax88772a_hw_reset(struct usbnet *dev, int in_pm)
{
struct asix_data *data = (struct asix_data *)&dev->data;
int ret, embd_phy;
- u16 rx_ctl;
+ u16 rx_ctl, phy14h, phy15h, phy16h;
u8 chipcode = 0;
ret = asix_write_gpio(dev, AX_GPIO_RSE, 5, in_pm);
@@ -482,6 +491,32 @@ static int ax88772a_hw_reset(struct usbnet *dev, int in_pm)
ret);
goto out;
}
+ } else if ((chipcode & AX_CHIPCODE_MASK) == AX_AX88772A_CHIPCODE) {
+ /* Check if the PHY registers have default settings */
+ phy14h = asix_mdio_read_nopm(dev->net, dev->mii.phy_id,
+ AX88772A_PHY14H);
+ phy15h = asix_mdio_read_nopm(dev->net, dev->mii.phy_id,
+ AX88772A_PHY15H);
+ phy16h = asix_mdio_read_nopm(dev->net, dev->mii.phy_id,
+ AX88772A_PHY16H);
+
+ netdev_dbg(dev->net,
+ "772a_hw_reset: MR20=0x%x MR21=0x%x MR22=0x%x\n",
+ phy14h, phy15h, phy16h);
+
+ /* Restore PHY registers default setting if not */
+ if (phy14h != AX88772A_PHY14H_DEFAULT)
+ asix_mdio_write_nopm(dev->net, dev->mii.phy_id,
+ AX88772A_PHY14H,
+ AX88772A_PHY14H_DEFAULT);
+ if (phy15h != AX88772A_PHY15H_DEFAULT)
+ asix_mdio_write_nopm(dev->net, dev->mii.phy_id,
+ AX88772A_PHY15H,
+ AX88772A_PHY15H_DEFAULT);
+ if (phy16h != AX88772A_PHY16H_DEFAULT)
+ asix_mdio_write_nopm(dev->net, dev->mii.phy_id,
+ AX88772A_PHY16H,
+ AX88772A_PHY16H_DEFAULT);
}
ret = asix_write_cmd(dev, AX_CMD_WRITE_IPG0,
@@ -543,6 +578,15 @@ static const struct net_device_ops ax88772_netdev_ops = {
static void ax88772_suspend(struct usbnet *dev)
{
struct asix_common_private *priv = dev->driver_priv;
+ u16 medium;
+
+ /* Stop MAC operation */
+ medium = asix_read_medium_status(dev, 0);
+ medium &= ~AX_MEDIUM_RE;
+ asix_write_medium_mode(dev, medium, 0);
+
+ netdev_dbg(dev->net, "ax88772_suspend: medium=0x%04x\n",
+ asix_read_medium_status(dev, 0));
/* Preserve BMCR for restoring */
priv->presvd_phy_bmcr =
@@ -577,6 +621,7 @@ static void ax88772_restore_phy(struct usbnet *dev)
asix_mdio_write_nopm(dev->net, dev->mii.phy_id, MII_BMCR,
priv->presvd_phy_bmcr);
+ mii_nway_restart(&dev->mii);
priv->presvd_phy_advertise = 0;
priv->presvd_phy_bmcr = 0;
}
--
2.7.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v3 0/5] net/usb: asix driver improvements robert.foss@collabora.com - 2016-08-25 22:20 +0200
[PATCH v3 4/5] net: asix: see 802.3 spec for phy reset robert.foss@collabora.com - 2016-08-25 22:20 +0200
[PATCH v3 4/5] net: asix: see 802.3 spec for phy reset robert.foss@collabora.com - 2016-08-25 22:20 +0200
[PATCH v3 3/5] net: asix: Fix AX88772x resume failures robert.foss@collabora.com - 2016-08-25 22:20 +0200
[PATCH v3 5/5] net: asix: autoneg will set WRITE_MEDIUM reg robert.foss@collabora.com - 2016-08-25 22:20 +0200
[PATCH v3 1/5] net: asix: Add in_pm parameter robert.foss@collabora.com - 2016-08-25 22:20 +0200
[PATCH v3 3/5] net: asix: Fix AX88772x resume failures robert.foss@collabora.com - 2016-08-25 22:20 +0200
[PATCH v3 5/5] net: asix: autoneg will set WRITE_MEDIUM reg robert.foss@collabora.com - 2016-08-25 22:20 +0200
Re: [PATCH v3 5/5] net: asix: autoneg will set WRITE_MEDIUM reg Robert Foss <robert.foss@collabora.com> - 2016-09-01 18:50 +0200
Re: [PATCH v3 5/5] net: asix: autoneg will set WRITE_MEDIUM reg Eric Dumazet <eric.dumazet@gmail.com> - 2016-09-01 23:10 +0200
Re: [PATCH v3 5/5] net: asix: autoneg will set WRITE_MEDIUM reg Grant Grundler <grundler@google.com> - 2016-09-06 18:50 +0200
Re: [PATCH v3 5/5] net: asix: autoneg will set WRITE_MEDIUM reg Robert Foss <robert.foss@collabora.com> - 2016-09-06 23:50 +0200
Re: [PATCH v3 5/5] net: asix: autoneg will set WRITE_MEDIUM reg Eric Dumazet <eric.dumazet@gmail.com> - 2016-09-01 18:50 +0200
[PATCH v3 2/5] net: asix: Avoid looping when the device is disconnected robert.foss@collabora.com - 2016-08-25 22:20 +0200
[PATCH v3 1/5] net: asix: Add in_pm parameter robert.foss@collabora.com - 2016-08-25 22:20 +0200
Re: [PATCH v3 0/5] net/usb: asix driver improvements David Miller <davem@davemloft.net> - 2016-08-27 06:30 +0200
[PATCH v3 3/5] net: asix: Fix AX88772x resume failures robert.foss@collabora.com - 2016-08-29 15:40 +0200
[PATCH v3 5/5] net: asix: autoneg will set WRITE_MEDIUM reg robert.foss@collabora.com - 2016-08-29 15:40 +0200
[PATCH v3 2/5] net: asix: Avoid looping when the device is disconnected robert.foss@collabora.com - 2016-08-29 15:40 +0200
[PATCH v3 1/5] net: asix: Add in_pm parameter robert.foss@collabora.com - 2016-08-29 15:40 +0200
[PATCH v3 4/5] net: asix: see 802.3 spec for phy reset robert.foss@collabora.com - 2016-08-29 15:40 +0200
Re: [PATCH v3 0/5] net/usb: asix driver improvements Robert Foss <robert.foss@collabora.com> - 2016-08-31 19:30 +0200
Re: [PATCH v3 0/5] net/usb: asix driver improvements David Miller <davem@davemloft.net> - 2016-09-01 06:10 +0200
csiph-web