Skip to content

Commit

Permalink
Revert "net: phy: meson-gxl: improve link-up behavior"
Browse files Browse the repository at this point in the history
[ Upstream commit 7fdc776 ]

This reverts commit 2c87c6f.
Meanwhile it turned out that the following commit is the proper
workaround for the issue that 2c87c6f tries to address.
a3a57bf ("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: 2c87c6f ("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>
  • Loading branch information
hkallweit authored and gregkh committed Sep 15, 2022
1 parent 2f6640b commit b0b35b4
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/net/phy/meson-gxl.c
Expand Up @@ -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;
}
Expand Down

0 comments on commit b0b35b4

Please sign in to comment.