Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1449682 > unrolled thread
| Started by | robert.foss@collabora.com |
|---|---|
| First post | 2016-07-25 19:50 +0200 |
| Last post | 2016-07-25 23:50 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 3/3] net: asix: Fix AX88772x resume failures robert.foss@collabora.com - 2016-07-25 19:50 +0200
Re: [PATCH 3/3] net: asix: Fix AX88772x resume failures Grant Grundler <grundler@chromium.org> - 2016-07-25 23:50 +0200
| From | robert.foss@collabora.com |
|---|---|
| Date | 2016-07-25 19:50 +0200 |
| Subject | [PATCH 3/3] net: asix: Fix AX88772x resume failures |
| Message-ID | <rYSaR-7sC-7@gated-at.bofh.it> |
From: WK Tsai <wk.tsai@nvidia.com>
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: WK Tsai <wk.tsai@nvidia.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
[toc] | [next] | [standalone]
| From | Grant Grundler <grundler@chromium.org> |
|---|---|
| Date | 2016-07-25 23:50 +0200 |
| Message-ID | <rYVV9-1ty-85@gated-at.bofh.it> |
| In reply to | #1449682 |
Robert,
This patch content LGTM but isn't including the correct "meta data"
regarding it's origin.
On Mon, Jul 25, 2016 at 10:40 AM, <robert.foss@collabora.com> wrote:
> From: WK Tsai <wk.tsai@nvidia.com>
WK Tsai is not the author of this patch.
I believe Allan Chou <allan@asix.com.tw> is the author.
> 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: WK Tsai <wk.tsai@nvidia.com>
This patch was applied to four different chromium.org kernel branches:
https://chromium-review.googlesource.com/#/q/Fix+AX88772x+resume+failures
And has substantial meta data regarding author and reviewers:
(summarized from https://chromium-review.googlesource.com/#/c/314520/)
Signed-off-by: Allan Chou <allan@asix.com.tw>
Signed-off-by: WK Tsai <wk.tsai@nvidia.com>
Tested-by: Grant Grundler <grundler@chromium.org>
Reviewed-by: Wang-Kai Tsai <gis555t@gmail.com>
Reviewed-by: Mark Kuo <mkuo@nvidia.com>
Reviewed-by: Grant Grundler <grundler@chromium.org>
Reviewed-by: Allan Chou <allanchou1357@gmail.com>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
cheers,
grant
> ---
> 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
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web