]> git.itanic.dy.fi Git - linux-stable/commitdiff
Revert "net: phy: meson-gxl: improve link-up behavior"
authorHeiner Kallweit <hkallweit1@gmail.com>
Wed, 31 Aug 2022 19:20:49 +0000 (21:20 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 15 Sep 2022 09:30:05 +0000 (11:30 +0200)
[ Upstream commit 7fdc77665f3d45c9da7c6edd4beadee9790f43aa ]

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>
Link: https://lore.kernel.org/r/8deeeddc-6b71-129b-1918-495a12dc11e3@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/phy/meson-gxl.c

index 73f7962a37d335508b4a09e82d01132822c3b98f..c49062ad72c6c6922e18a26c68c2d96627da906e 100644 (file)
@@ -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;
 }