leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: usb: asix: ax88772: manage PHY PM from MAC

Browse Source 
Take over PHY power management, otherwise PHY framework will try to
access ASIX MDIO bus before MAC resume was completed.

Fixes: e532a096be ("net: usb: asix: ax88772: add phylib support")
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reported-by: Jon Hunter <jonathanh@nvidia.com>
Suggested-by: Heiner Kallweit <hkallweit1@gmail.com>
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Oleksij Rempel 2021-06-11 05:55:59 +02:00 committed by David S. Miller
parent d41783b355
commit 4a2c7217cd
1 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/net/usb/asix_devices.c
View File

@ -598,6 +598,9 @@ static void ax88772_suspend(struct usbnet *dev)
struct asix_common_private *priv = dev->driver_priv; struct asix_common_private *priv = dev->driver_priv;
u16 medium; u16 medium;
if (netif_running(dev->net))
phy_stop(priv->phydev);
/* Stop MAC operation */ /* Stop MAC operation */
medium = asix_read_medium_status(dev, 1); medium = asix_read_medium_status(dev, 1);
medium &= ~AX_MEDIUM_RE; medium &= ~AX_MEDIUM_RE;
@ -605,14 +608,6 @@ static void ax88772_suspend(struct usbnet *dev)
netdev_dbg(dev->net, "ax88772_suspend: medium=0x%04x\n", netdev_dbg(dev->net, "ax88772_suspend: medium=0x%04x\n",
asix_read_medium_status(dev, 1)); asix_read_medium_status(dev, 1));
/* Preserve BMCR for restoring */
priv->presvd_phy_bmcr =
asix_mdio_read_nopm(dev->net, dev->mii.phy_id, MII_BMCR);
/* Preserve ANAR for restoring */
priv->presvd_phy_advertise =
asix_mdio_read_nopm(dev->net, dev->mii.phy_id, MII_ADVERTISE);
} }
static int asix_suspend(struct usb_interface *intf, pm_message_t message) static int asix_suspend(struct usb_interface *intf, pm_message_t message)
@ -626,39 +621,22 @@ static int asix_suspend(struct usb_interface *intf, pm_message_t message)
return usbnet_suspend(intf, message); return usbnet_suspend(intf, message);
} }
static void ax88772_restore_phy(struct usbnet *dev)
{
struct asix_common_private *priv = dev->driver_priv;
if (priv->presvd_phy_advertise) {
/* Restore Advertisement control reg */
asix_mdio_write_nopm(dev->net, dev->mii.phy_id, MII_ADVERTISE,
priv->presvd_phy_advertise);
/* Restore BMCR */
if (priv->presvd_phy_bmcr & BMCR_ANENABLE)
priv->presvd_phy_bmcr |= BMCR_ANRESTART;
asix_mdio_write_nopm(dev->net, dev->mii.phy_id, MII_BMCR,
priv->presvd_phy_bmcr);
priv->presvd_phy_advertise = 0;
priv->presvd_phy_bmcr = 0;
}
}
static void ax88772_resume(struct usbnet *dev) static void ax88772_resume(struct usbnet *dev)
{ {
struct asix_common_private *priv = dev->driver_priv;
int i; int i;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
if (!ax88772_hw_reset(dev, 1)) if (!ax88772_hw_reset(dev, 1))
break; break;
ax88772_restore_phy(dev);
if (netif_running(dev->net))
phy_start(priv->phydev);
} }
static void ax88772a_resume(struct usbnet *dev) static void ax88772a_resume(struct usbnet *dev)
{ {
struct asix_common_private *priv = dev->driver_priv;
int i; int i;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@ -666,7 +644,8 @@ static void ax88772a_resume(struct usbnet *dev)
break; break;
} }
ax88772_restore_phy(dev); if (netif_running(dev->net))
phy_start(priv->phydev);
} }
static int asix_resume(struct usb_interface *intf) static int asix_resume(struct usb_interface *intf)
@ -722,6 +701,8 @@ static int ax88772_init_phy(struct usbnet *dev)
return ret; return ret;
} }
priv->phydev->mac_managed_pm = 1;
phy_attached_info(priv->phydev); phy_attached_info(priv->phydev);
return 0; return 0;