1 files changed, 31 insertions, 21 deletions

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index d36aa7621ad9..2c40309e40ad 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -1024,14 +1024,6 @@ static u16 r8168_phy_ocp_read(struct rtl8169_private *tp, u32 reg)
                 (RTL_R32(GPHY_OCP) & 0xffff) : ~0;
 }
 
-static void rtl_w1w0_phy_ocp(struct rtl8169_private *tp, int reg, int p, int m)
-{
-        int val;
-
-        val = r8168_phy_ocp_read(tp, reg);
-        r8168_phy_ocp_write(tp, reg, (val | p) & ~m);
-}
-
 static void r8168_mac_ocp_write(struct rtl8169_private *tp, u32 reg, u32 data)
 {
         void __iomem *ioaddr = tp->mmio_addr;
@@ -3370,23 +3362,41 @@ static void rtl8168g_1_hw_phy_config(struct rtl8169_private *tp)
 {
         rtl_apply_firmware(tp);
 
-        if (r8168_phy_ocp_read(tp, 0xa460) & 0x0100)
-                rtl_w1w0_phy_ocp(tp, 0xbcc4, 0x0000, 0x8000);
-        else
-                rtl_w1w0_phy_ocp(tp, 0xbcc4, 0x8000, 0x0000);
+        rtl_writephy(tp, 0x1f, 0x0a46);
+        if (rtl_readphy(tp, 0x10) & 0x0100) {
+                rtl_writephy(tp, 0x1f, 0x0bcc);
+                rtl_w1w0_phy(tp, 0x12, 0x0000, 0x8000);
+        } else {
+                rtl_writephy(tp, 0x1f, 0x0bcc);
+                rtl_w1w0_phy(tp, 0x12, 0x8000, 0x0000);
+        }
 
-        if (r8168_phy_ocp_read(tp, 0xa466) & 0x0100)
-                rtl_w1w0_phy_ocp(tp, 0xc41a, 0x0002, 0x0000);
-        else
-                rtl_w1w0_phy_ocp(tp, 0xbcc4, 0x0000, 0x0002);
+        rtl_writephy(tp, 0x1f, 0x0a46);
+        if (rtl_readphy(tp, 0x13) & 0x0100) {
+                rtl_writephy(tp, 0x1f, 0x0c41);
+                rtl_w1w0_phy(tp, 0x15, 0x0002, 0x0000);
+        } else {
+                rtl_writephy(tp, 0x1f, 0x0bcc);
+                rtl_w1w0_phy(tp, 0x12, 0x0000, 0x0002);
+        }
 
-        rtl_w1w0_phy_ocp(tp, 0xa442, 0x000c, 0x0000);
-        rtl_w1w0_phy_ocp(tp, 0xa4b2, 0x0004, 0x0000);
+        /* Enable PHY auto speed down */
+        rtl_writephy(tp, 0x1f, 0x0a44);
+        rtl_w1w0_phy(tp, 0x11, 0x000c, 0x0000);
 
-        r8168_phy_ocp_write(tp, 0xa436, 0x8012);
-        rtl_w1w0_phy_ocp(tp, 0xa438, 0x8000, 0x0000);
+        /* EEE auto-fallback function */
+        rtl_writephy(tp, 0x1f, 0x0a4b);
+        rtl_w1w0_phy(tp, 0x11, 0x0004, 0x0000);
 
-        rtl_w1w0_phy_ocp(tp, 0xc422, 0x4000, 0x2000);
+        /* Enable UC LPF tune function */
+        rtl_writephy(tp, 0x1f, 0x0a43);
+        rtl_writephy(tp, 0x13, 0x8012);
+        rtl_w1w0_phy(tp, 0x14, 0x8000, 0x0000);
+
+        rtl_writephy(tp, 0x1f, 0x0c42);
+        rtl_w1w0_phy(tp, 0x11, 0x4000, 0x2000);
+
+        rtl_writephy(tp, 0x1f, 0x0000);
 }
 
 static void rtl8102e_hw_phy_config(struct rtl8169_private *tp)