* [PATCH net] r8169: fix firmware not resetting tp->ocp_base
@ 2020-06-18 21:25 Heiner Kallweit
2020-06-21 0:32 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Heiner Kallweit @ 2020-06-18 21:25 UTC (permalink / raw)
To: Realtek linux nic maintainers, David Miller, Jakub Kicinski,
Aaron Ma
Cc: netdev@vger.kernel.org
Typically the firmware takes care that tp->ocp_base is reset to its
default value. That's not the case (at least) for RTL8117.
As a result subsequent PHY access reads/writes the wrong page and
the link is broken. Fix this be resetting tp->ocp_base explicitly.
Fixes: 229c1e0dfd3d ("r8169: load firmware for RTL8168fp/RTL8117")
Reported-by: Aaron Ma <mapengyu@gmail.com>
Tested-by: Aaron Ma <mapengyu@gmail.com>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169_main.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index a3c4187d9..98391797b 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -2116,8 +2116,11 @@ static void rtl_release_firmware(struct rtl8169_private *tp)
void r8169_apply_firmware(struct rtl8169_private *tp)
{
/* TODO: release firmware if rtl_fw_write_firmware signals failure. */
- if (tp->rtl_fw)
+ if (tp->rtl_fw) {
rtl_fw_write_firmware(tp, tp->rtl_fw);
+ /* At least one firmware doesn't reset tp->ocp_base. */
+ tp->ocp_base = OCP_STD_PHY_BASE;
+ }
}
static void rtl8168_config_eee_mac(struct rtl8169_private *tp)
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH net] r8169: fix firmware not resetting tp->ocp_base
2020-06-18 21:25 [PATCH net] r8169: fix firmware not resetting tp->ocp_base Heiner Kallweit
@ 2020-06-21 0:32 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-06-21 0:32 UTC (permalink / raw)
To: hkallweit1; +Cc: nic_swsd, kuba, mapengyu, netdev
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Thu, 18 Jun 2020 23:25:50 +0200
> Typically the firmware takes care that tp->ocp_base is reset to its
> default value. That's not the case (at least) for RTL8117.
> As a result subsequent PHY access reads/writes the wrong page and
> the link is broken. Fix this be resetting tp->ocp_base explicitly.
>
> Fixes: 229c1e0dfd3d ("r8169: load firmware for RTL8168fp/RTL8117")
> Reported-by: Aaron Ma <mapengyu@gmail.com>
> Tested-by: Aaron Ma <mapengyu@gmail.com>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Applied and queued up for v5.5 -stable, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-21 0:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-18 21:25 [PATCH net] r8169: fix firmware not resetting tp->ocp_base Heiner Kallweit
2020-06-21 0:32 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox