@@ -5142,9 +5142,13 @@ static int __maybe_unused macb_suspend(struct device *dev)
napi_disable(&queue->napi_tx);
}
- if (!(bp->wol & MACB_WOL_ENABLED)) {
+ if (bp->wol & MACB_WOL_ENABLED) {
rtnl_lock();
- phylink_stop(bp->phylink);
+ phylink_suspend(bp->phylink, true);
+ rtnl_unlock();
+ } else {
+ rtnl_lock();
+ phylink_suspend(bp->phylink, false);
phy_exit(bp->sgmii_phy);
rtnl_unlock();
spin_lock_irqsave(&bp->lock, flags);
@@ -5209,13 +5213,6 @@ static int __maybe_unused macb_resume(struct device *dev)
spin_unlock_irqrestore(&bp->lock, flags);
disable_irq_wake(bp->queues[0].irq);
-
- /* Now make sure we disable phy before moving
- * to common restore path
- */
- rtnl_lock();
- phylink_stop(bp->phylink);
- rtnl_unlock();
}
for (q = 0, queue = bp->queues; q < bp->num_queues;
@@ -5238,7 +5235,7 @@ static int __maybe_unused macb_resume(struct device *dev)
if (!device_may_wakeup(&bp->dev->dev))
phy_init(bp->sgmii_phy);
- phylink_start(bp->phylink);
+ phylink_resume(bp->phylink);
rtnl_unlock();
netif_device_attach(netdev);
Use phylink_suspend() and phylink_resume() for macb driver instead of phylink_start()/phylink_stop(). This helps on fixing commit bf0ad1893442 ("net: macb: Specify PHY PM management done by MAC"). Commit bf0ad1893442 ("net: macb: Specify PHY PM management done by MAC") signals to PHY layer that the PHY PM management is done by the MAC driver itself. In case this is done the mdio_bus_phy_suspend() and mdio_bus_phy_resume() will return just at its beginning letting the MAC driver to handle the PHY power management. AT91 devices (e.g. SAMA7G5, SAMA5D2) has a special power saving mode called backup and self-refresh where most of the SoCs parts are shutdown on suspend and RAM is switched to self-refresh. The rail powering the on-board ethernet PHY could also be closed. For scenarios where backup and self-refresh is used the MACB driver needs to re-initialize the PHY device itself when resuming. Otherwise there is poor or missing connectivity (e.g. SAMA7G5-EK uses KSZ9131 in RGMII mode which needs its DLL settings to satisfy RGMII timings). For this call phylink_suspend()/phylink_resume() on suspend/resume path. The patch has been tested on SAMA7G5EK (with KSZ9131 and KSZ8081 PHYs) and SAM9X60EK (with KSZ8081 PHY) boards. Fixes: bf0ad1893442 ("net: macb: Specify PHY PM management done by MAC") Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com> --- This patch depends on patch 1/2 from this series. For proper backporting to older kernel (in case this series is integrated as is) please add the Depends-on tag on this patch after patch 1/2 is integrated in networking tree. Thank you, Claudiu Beznea drivers/net/ethernet/cadence/macb_main.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)