r8169: align RTL8125 EEE config with vendor driver

hkallweit · kuba-moo · commit eb90f876b796 · 2024-11-03T14:47:23.000-08:00
Align the EEE config for RTL8125A/RTL8125B with vendor driver r8125. This should help to avoid compatibility issues. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Link: https://patch.msgid.link/044c925e-8669-4b98-87df-95b4056f4f5f@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/drivers/net/ethernet/realtek/r8169_phy_config.c b/drivers/net/ethernet/realtek/r8169_phy_config.c
@@ -89,19 +89,25 @@ static void rtl8168h_config_eee_phy(struct phy_device *phydev)
 	phy_modify_paged(phydev, 0xa42, 0x14, 0x0000, 0x0080);
 }
 
-static void rtl8125a_config_eee_phy(struct phy_device *phydev)
+static void rtl8125_common_config_eee_phy(struct phy_device *phydev)
 {
-	rtl8168h_config_eee_phy(phydev);
+	phy_modify_paged(phydev, 0xa6d, 0x14, 0x0010, 0x0000);
+	phy_modify_paged(phydev, 0xa42, 0x14, 0x0080, 0x0000);
+	phy_modify_paged(phydev, 0xa4a, 0x11, 0x0200, 0x0000);
+}
 
+static void rtl8125a_config_eee_phy(struct phy_device *phydev)
+{
+	rtl8168g_config_eee_phy(phydev);
+	/* disable EEE at 2.5Gbps */
 	phy_modify_paged(phydev, 0xa6d, 0x12, 0x0001, 0x0000);
-	phy_modify_paged(phydev, 0xa6d, 0x14, 0x0010, 0x0000);
+	rtl8125_common_config_eee_phy(phydev);
 }
 
 static void rtl8125b_config_eee_phy(struct phy_device *phydev)
 {
-	phy_modify_paged(phydev, 0xa6d, 0x14, 0x0010, 0x0000);
-	phy_modify_paged(phydev, 0xa42, 0x14, 0x0080, 0x0000);
-	phy_modify_paged(phydev, 0xa4a, 0x11, 0x0200, 0x0000);
+	rtl8168g_config_eee_phy(phydev);
+	rtl8125_common_config_eee_phy(phydev);
 }
 
 static void rtl8169s_hw_phy_config(struct rtl8169_private *tp,

Original file line number	Diff line number	Diff line change
`@@ -89,19 +89,25 @@ static void rtl8168h_config_eee_phy(struct phy_device *phydev)`
`89`	`89`	`phy_modify_paged(phydev, 0xa42, 0x14, 0x0000, 0x0080);`
`90`	`90`	`}`
`91`	`91`
`92`		`-static void rtl8125a_config_eee_phy(struct phy_device *phydev)`
	`92`	`+static void rtl8125_common_config_eee_phy(struct phy_device *phydev)`
`93`	`93`	`{`
`94`		`- rtl8168h_config_eee_phy(phydev);`
	`94`	`+ phy_modify_paged(phydev, 0xa6d, 0x14, 0x0010, 0x0000);`
	`95`	`+ phy_modify_paged(phydev, 0xa42, 0x14, 0x0080, 0x0000);`
	`96`	`+ phy_modify_paged(phydev, 0xa4a, 0x11, 0x0200, 0x0000);`
	`97`	`+}`
`95`	`98`
	`99`	`+static void rtl8125a_config_eee_phy(struct phy_device *phydev)`
	`100`	`+{`
	`101`	`+ rtl8168g_config_eee_phy(phydev);`
	`102`	`+ /* disable EEE at 2.5Gbps */`
`96`	`103`	`phy_modify_paged(phydev, 0xa6d, 0x12, 0x0001, 0x0000);`
`97`		`- phy_modify_paged(phydev, 0xa6d, 0x14, 0x0010, 0x0000);`
	`104`	`+ rtl8125_common_config_eee_phy(phydev);`
`98`	`105`	`}`
`99`	`106`
`100`	`107`	`static void rtl8125b_config_eee_phy(struct phy_device *phydev)`
`101`	`108`	`{`
`102`		`- phy_modify_paged(phydev, 0xa6d, 0x14, 0x0010, 0x0000);`
`103`		`- phy_modify_paged(phydev, 0xa42, 0x14, 0x0080, 0x0000);`
`104`		`- phy_modify_paged(phydev, 0xa4a, 0x11, 0x0200, 0x0000);`
	`109`	`+ rtl8168g_config_eee_phy(phydev);`
	`110`	`+ rtl8125_common_config_eee_phy(phydev);`
`105`	`111`	`}`
`106`	`112`
`107`	`113`	`static void rtl8169s_hw_phy_config(struct rtl8169_private *tp,`