Skip to content

Commit 5823a28

Browse files
hkallweitdavem330
authored andcommitted
r8169: move setting ERI register 0x1d0 for RTL8106
Writing this ERI register is a MAC setting, so move it to rtl_hw_start_8106(). Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent a5798e1 commit 5823a28

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/ethernet/realtek/r8169_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3425,8 +3425,6 @@ static void rtl8106e_hw_phy_config(struct rtl8169_private *tp,
34253425

34263426
rtl_eri_write(tp, 0x1b0, ERIAR_MASK_0011, 0x0000);
34273427
rtl_writephy_batch(phydev, phy_reg_init);
3428-
3429-
rtl_eri_write(tp, 0x1d0, ERIAR_MASK_0011, 0x0000);
34303428
}
34313429

34323430
static void rtl8125_1_hw_phy_config(struct rtl8169_private *tp,
@@ -4999,6 +4997,8 @@ static void rtl_hw_start_8106(struct rtl8169_private *tp)
49994997
RTL_W8(tp, MCU, RTL_R8(tp, MCU) | EN_NDP | EN_OOB_RESET);
50004998
RTL_W8(tp, DLLPR, RTL_R8(tp, DLLPR) & ~PFM_EN);
50014999

5000+
rtl_eri_write(tp, 0x1d0, ERIAR_MASK_0011, 0x0000);
5001+
50025002
rtl_pcie_state_l2l3_disable(tp);
50035003
rtl_hw_aspm_clkreq_enable(tp, true);
50045004
}

0 commit comments

Comments
 (0)