| Message ID | 8deeeddc-6b71-129b-1918-495a12dc11e3@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7fdc77665f3d45c9da7c6edd4beadee9790f43aa |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] Revert "net: phy: meson-gxl: improve link-up behavior" | expand |
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Wed, 31 Aug 2022 21:20:49 +0200 you wrote: > This reverts commit 2c87c6f9fbddc5b84d67b2fa3f432fcac6d99d93. > Meanwhile it turned out that the following commit is the proper > workaround for the issue that 2c87c6f9fbdd tries to address. > a3a57bf07de2 ("net: stmmac: work around sporadic tx issue on link-up") > It's nor clear why the to be reverted commit helped for one user, > for others it didn't make a difference. > > [...] Here is the summary with links: - [net] Revert "net: phy: meson-gxl: improve link-up behavior" https://git.kernel.org/netdev/net/c/7fdc77665f3d You are awesome, thank you!
diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c index 73f7962a37d3..c49062ad72c6 100644 --- a/drivers/net/phy/meson-gxl.c +++ b/drivers/net/phy/meson-gxl.c @@ -243,13 +243,7 @@ static irqreturn_t meson_gxl_handle_interrupt(struct phy_device *phydev) irq_status == INTSRC_ENERGY_DETECT) return IRQ_HANDLED; - /* Give PHY some time before MAC starts sending data. This works - * around an issue where network doesn't come up properly. - */ - if (!(irq_status & INTSRC_LINK_DOWN)) - phy_queue_state_machine(phydev, msecs_to_jiffies(100)); - else - phy_trigger_machine(phydev); + phy_trigger_machine(phydev); return IRQ_HANDLED; }
This reverts commit 2c87c6f9fbddc5b84d67b2fa3f432fcac6d99d93. Meanwhile it turned out that the following commit is the proper workaround for the issue that 2c87c6f9fbdd tries to address. a3a57bf07de2 ("net: stmmac: work around sporadic tx issue on link-up") It's nor clear why the to be reverted commit helped for one user, for others it didn't make a difference. Fixes: 2c87c6f9fbdd ("net: phy: meson-gxl: improve link-up behavior") Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/net/phy/meson-gxl.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)