This is a note to let you know that I've just added the patch titled
net: stmmac: start phylink instance before stmmac_hw_setup()
to the 5.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-stmmac-start-phylink-instance-before-stmmac_hw_setup.patch
and it can be found in the queue-5.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sat Dec 19 11:38:43 AM CET 2020
From: Fugang Duan <fugang.duan@xxxxxxx>
Date: Mon, 7 Dec 2020 18:51:38 +0800
Subject: net: stmmac: start phylink instance before stmmac_hw_setup()
From: Fugang Duan <fugang.duan@xxxxxxx>
[ Upstream commit 36d18b5664ef617ccf4da266291d2f2342fab89d ]
Start phylink instance and resume back the PHY to supply
RX clock to MAC before MAC layer initialization by calling
.stmmac_hw_setup(), since DMA reset depends on the RX clock,
otherwise DMA reset cost maximum timeout value then finally
timeout.
Fixes: 74371272f97f ("net: stmmac: Convert to phylink and remove phylib logic")
Signed-off-by: Fugang Duan <fugang.duan@xxxxxxx>
Signed-off-by: Joakim Zhang <qiangqing.zhang@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -5170,6 +5170,14 @@ int stmmac_resume(struct device *dev)
return ret;
}
+ if (!device_may_wakeup(priv->device) || !priv->plat->pmt) {
+ rtnl_lock();
+ phylink_start(priv->phylink);
+ /* We may have called phylink_speed_down before */
+ phylink_speed_up(priv->phylink);
+ rtnl_unlock();
+ }
+
rtnl_lock();
mutex_lock(&priv->lock);
@@ -5188,14 +5196,6 @@ int stmmac_resume(struct device *dev)
mutex_unlock(&priv->lock);
rtnl_unlock();
- if (!device_may_wakeup(priv->device) || !priv->plat->pmt) {
- rtnl_lock();
- phylink_start(priv->phylink);
- /* We may have called phylink_speed_down before */
- phylink_speed_up(priv->phylink);
- rtnl_unlock();
- }
-
phylink_mac_change(priv->phylink, true);
netif_device_attach(ndev);
Patches currently in stable-queue which might be from fugang.duan@xxxxxxx are
queue-5.9/net-stmmac-free-tx-skb-buffer-in-stmmac_resume.patch
queue-5.9/net-stmmac-overwrite-the-dma_cap.addr64-according-to-hw-design.patch
queue-5.9/net-stmmac-start-phylink-instance-before-stmmac_hw_setup.patch
queue-5.9/net-stmmac-delete-the-eee_ctrl_timer-after-napi-disabled.patch
queue-5.9/net-stmmac-increase-the-timeout-for-dma-reset.patch
