| Message ID | 20241015093820.16581-2-en-wei.wu@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | r8169: transmit queue 0 timed out error when re-plugging the Ethernet cable | expand |
Acked-by: Guoqing Jiang <guoqing.jiang@canonical.com> On 10/15/24 17:38, En-Wei Wu wrote: > From: Heiner Kallweit <hkallweit1@gmail.com> > > BugLink: https://bugs.launchpad.net/bugs/2084526 > > En-Wei reported that traffic breaks if cable is unplugged for more > than 3s and then re-plugged. This was supposed to be fixed by > 621735f59064 ("r8169: fix rare issue with broken rx after link-down on > RTL8125"). But apparently this didn't fix the issue for everybody. > The 3s threshold rang a bell, as this is the delay after which ALDPS > kicks in. And indeed disabling ALDPS fixes the issue for this user. > Maybe this fixes the issue in general. In a follow-up step we could > remove the first fix attempt and see whether anybody complains. > > Fixes: f1bce4ad2f1c ("r8169: add support for RTL8125") > Tested-by: En-Wei WU <en-wei.wu@canonical.com> > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > Link: https://patch.msgid.link/778b9d86-05c4-4856-be59-cde4487b9e52@gmail.com > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > (cherry picked from commit b9c7ac4fe22c608acf6153a3329df2b6b6cd416c) > Signed-off-by: En-Wei Wu <en-wei.wu@canonical.com> > --- > drivers/net/ethernet/realtek/r8169_phy_config.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/ethernet/realtek/r8169_phy_config.c b/drivers/net/ethernet/realtek/r8169_phy_config.c > index 1f74317beb88..e1e5d9672ae4 100644 > --- a/drivers/net/ethernet/realtek/r8169_phy_config.c > +++ b/drivers/net/ethernet/realtek/r8169_phy_config.c > @@ -1060,6 +1060,7 @@ static void rtl8125a_2_hw_phy_config(struct rtl8169_private *tp, > phy_modify_paged(phydev, 0xa86, 0x15, 0x0001, 0x0000); > rtl8168g_enable_gphy_10m(phydev); > > + rtl8168g_disable_aldps(phydev); > rtl8125a_config_eee_phy(phydev); > } > > @@ -1099,6 +1100,7 @@ static void rtl8125b_hw_phy_config(struct rtl8169_private *tp, > phy_modify_paged(phydev, 0xbf8, 0x12, 0xe000, 0xa000); > > rtl8125_legacy_force_mode(phydev); > + rtl8168g_disable_aldps(phydev); > rtl8125b_config_eee_phy(phydev); > } >
diff --git a/drivers/net/ethernet/realtek/r8169_phy_config.c b/drivers/net/ethernet/realtek/r8169_phy_config.c index 1f74317beb88..e1e5d9672ae4 100644 --- a/drivers/net/ethernet/realtek/r8169_phy_config.c +++ b/drivers/net/ethernet/realtek/r8169_phy_config.c @@ -1060,6 +1060,7 @@ static void rtl8125a_2_hw_phy_config(struct rtl8169_private *tp, phy_modify_paged(phydev, 0xa86, 0x15, 0x0001, 0x0000); rtl8168g_enable_gphy_10m(phydev); + rtl8168g_disable_aldps(phydev); rtl8125a_config_eee_phy(phydev); } @@ -1099,6 +1100,7 @@ static void rtl8125b_hw_phy_config(struct rtl8169_private *tp, phy_modify_paged(phydev, 0xbf8, 0x12, 0xe000, 0xa000); rtl8125_legacy_force_mode(phydev); + rtl8168g_disable_aldps(phydev); rtl8125b_config_eee_phy(phydev); }