diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2020-06-18 23:25:50 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-06-20 17:31:26 -0700 |
| commit | 89fbd26cca7ec9e82ec4787a4b6e95939b57d073 (patch) | |
| tree | ea3ed8e8ab504314bd304a4a012f0ec72e965ce7 | |
| parent | ibmvnic: continue to init in CRQ reset returns H_CLOSED (diff) | |
| download | wireguard-linux-89fbd26cca7ec9e82ec4787a4b6e95939b57d073.tar.xz wireguard-linux-89fbd26cca7ec9e82ec4787a4b6e95939b57d073.zip | |
r8169: fix firmware not resetting tp->ocp_base
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index dad84ecf5a77..b660ddbe4025 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2114,8 +2114,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) |