r8169: remove support for few unused chip versions
Heiner Kallweit
maintainerv2 cover r8169: remove support for few unused chip versions
There's a number of chip versions that apparently never made it to the mass market. Detection of these chip versions has been disabled for few kernel versions now and nobody complained. Therefore remove support for these chip versions.
Heiner Kallweit (5):
r8169: remove support for chip version 41
r8169: remove support for chip versions 45 and 47
r8169: remove support for chip version 49
r8169: remove support for chip version 50
r8169: remove support for chip version 60
v2:
- fix a typo in patch 3
drivers/net/ethernet/realtek/r8169.h | 12 +- drivers/net/ethernet/realtek/r8169_main.c | 124 ++--------------- .../net/ethernet/realtek/r8169_phy_config.c | 130 ------------------ 3 files changed, 18 insertions(+), 248 deletions(-)
Signature · 1 line
2.37.2
Heiner Kallweit
maintainerPATCH v2 1/5 r8169: remove support for chip version 41
Detection of this chip version has been disabled for few kernel versions now. Nobody complained, so remove support for this chip version.
--- drivers/net/ethernet/realtek/r8169.h | 2 +- drivers/net/ethernet/realtek/r8169_main.c | 3 --- drivers/net/ethernet/realtek/r8169_phy_config.c | 1 - 3 files changed, 1 insertion(+), 5 deletions(-)
drivers/net/ethernet/realtek/r8169.h +1 -1
@@ -51,7 +51,7 @@ enum mac_version {RTL_GIGA_MAC_VER_38 ,RTL_GIGA_MAC_VER_39 ,RTL_GIGA_MAC_VER_40 , -RTL_GIGA_MAC_VER_41 , +/* support for RTL_GIGA_MAC_VER_41 has been removed */ RTL_GIGA_MAC_VER_42 ,RTL_GIGA_MAC_VER_43 , RTL_GIGA_MAC_VER_44,
drivers/net/ethernet/realtek/r8169_main.c +0 -3
@@ -131,7 +131,6 @@ static const struct { [RTL_GIGA_MAC_VER_38] = {"RTL8411", FIRMWARE_8411_1 }, [RTL_GIGA_MAC_VER_39] = {"RTL8106e", FIRMWARE_8106E_1}, [RTL_GIGA_MAC_VER_40] = {"RTL8168g/8111g", FIRMWARE_8168G_2}, - [RTL_GIGA_MAC_VER_41] = {"RTL8168g/8111g" }, [RTL_GIGA_MAC_VER_42] = {"RTL8168gu/8111gu", FIRMWARE_8168G_3}, [RTL_GIGA_MAC_VER_43] = {"RTL8106eus", FIRMWARE_8106E_2}, [RTL_GIGA_MAC_VER_44] = {"RTL8411b", FIRMWARE_8411_2 },
@@ -892,7 +891,6 @@ static void rtl8168g_phy_suspend_quirk(struct rtl8169_private *tp, int value) {switch (tp->mac_version) {case RTL_GIGA_MAC_VER_40 : -case RTL_GIGA_MAC_VER_41 :case RTL_GIGA_MAC_VER_49 :if (value &BMCR_RESET || !(value &BMCR_PDOWN ))rtl_eri_set_bits (tp,0x1a8 ,0xfc000000 );
@@ -3748,7 +3746,6 @@ static void rtl_hw_config(struct rtl8169_private *tp) [RTL_GIGA_MAC_VER_38] = rtl_hw_start_8411, [RTL_GIGA_MAC_VER_39] = rtl_hw_start_8106, [RTL_GIGA_MAC_VER_40] = rtl_hw_start_8168g_1, - [RTL_GIGA_MAC_VER_41] = rtl_hw_start_8168g_1, [RTL_GIGA_MAC_VER_42] = rtl_hw_start_8168g_2, [RTL_GIGA_MAC_VER_43] = rtl_hw_start_8168g_2, [RTL_GIGA_MAC_VER_44] = rtl_hw_start_8411_2,
drivers/net/ethernet/realtek/r8169_phy_config.c +0 -1
@@ -1266,7 +1266,6 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev, [RTL_GIGA_MAC_VER_38] = rtl8411_hw_phy_config, [RTL_GIGA_MAC_VER_39] = rtl8106e_hw_phy_config, [RTL_GIGA_MAC_VER_40] = rtl8168g_1_hw_phy_config, - [RTL_GIGA_MAC_VER_41] = NULL, [RTL_GIGA_MAC_VER_42] = rtl8168g_2_hw_phy_config, [RTL_GIGA_MAC_VER_43] = rtl8168g_2_hw_phy_config, [RTL_GIGA_MAC_VER_44] = rtl8168g_2_hw_phy_config,
Signature · 1 line
2.37.2
Heiner Kallweit
maintainerPATCH v2 2/5 r8169: remove support for chip versions 45 and 47
In reply to Heiner KallweitDetection of these chip versions has been disabled for few kernel versions now. Nobody complained, so remove support for this chip version.
--- drivers/net/ethernet/realtek/r8169.h | 4 +- drivers/net/ethernet/realtek/r8169_main.c | 16 +---- .../net/ethernet/realtek/r8169_phy_config.c | 67 ------------------- 3 files changed, 5 insertions(+), 82 deletions(-)
drivers/net/ethernet/realtek/r8169.h +2 -2
@@ -55,9 +55,9 @@ enum mac_version {RTL_GIGA_MAC_VER_42 ,RTL_GIGA_MAC_VER_43 ,RTL_GIGA_MAC_VER_44 , -RTL_GIGA_MAC_VER_45 , +/* support for RTL_GIGA_MAC_VER_45 has been removed */ RTL_GIGA_MAC_VER_46 , -RTL_GIGA_MAC_VER_47 , +/* support for RTL_GIGA_MAC_VER_47 has been removed */ RTL_GIGA_MAC_VER_48 ,RTL_GIGA_MAC_VER_49 , RTL_GIGA_MAC_VER_50,
drivers/net/ethernet/realtek/r8169_main.c +3 -13
@@ -49,10 +49,8 @@#define FIRMWARE_8106E_2 "rtl_nic/rtl8106e-2.fw"#define FIRMWARE_8168G_2 "rtl_nic/rtl8168g-2.fw"#define FIRMWARE_8168G_3 "rtl_nic/rtl8168g-3.fw" -#define FIRMWARE_8168H_1 "rtl_nic/rtl8168h-1.fw"#define FIRMWARE_8168H_2 "rtl_nic/rtl8168h-2.fw"#define FIRMWARE_8168FP_3 "rtl_nic/rtl8168fp-3.fw" -#define FIRMWARE_8107E_1 "rtl_nic/rtl8107e-1.fw"#define FIRMWARE_8107E_2 "rtl_nic/rtl8107e-2.fw"#define FIRMWARE_8125A_3 "rtl_nic/rtl8125a-3.fw"#define FIRMWARE_8125B_2 "rtl_nic/rtl8125b-2.fw"
@@ -134,9 +132,7 @@ static const struct { [RTL_GIGA_MAC_VER_42] = {"RTL8168gu/8111gu", FIRMWARE_8168G_3}, [RTL_GIGA_MAC_VER_43] = {"RTL8106eus", FIRMWARE_8106E_2}, [RTL_GIGA_MAC_VER_44] = {"RTL8411b", FIRMWARE_8411_2 }, - [RTL_GIGA_MAC_VER_45] = {"RTL8168h/8111h", FIRMWARE_8168H_1}, [RTL_GIGA_MAC_VER_46] = {"RTL8168h/8111h", FIRMWARE_8168H_2}, - [RTL_GIGA_MAC_VER_47] = {"RTL8107e", FIRMWARE_8107E_1}, [RTL_GIGA_MAC_VER_48] = {"RTL8107e", FIRMWARE_8107E_2}, [RTL_GIGA_MAC_VER_49] = {"RTL8168ep/8111ep" }, [RTL_GIGA_MAC_VER_50] = {"RTL8168ep/8111ep" },
@@ -657,10 +653,8 @@ MODULE_FIRMWARE(FIRMWARE_8106E_1);MODULE_FIRMWARE (FIRMWARE_8106E_2 );MODULE_FIRMWARE (FIRMWARE_8168G_2 );MODULE_FIRMWARE (FIRMWARE_8168G_3 ); -MODULE_FIRMWARE (FIRMWARE_8168H_1 );MODULE_FIRMWARE (FIRMWARE_8168H_2 );MODULE_FIRMWARE (FIRMWARE_8168FP_3 ); -MODULE_FIRMWARE (FIRMWARE_8107E_1 );MODULE_FIRMWARE (FIRMWARE_8107E_2 );MODULE_FIRMWARE (FIRMWARE_8125A_3 );MODULE_FIRMWARE (FIRMWARE_8125B_2 );
@@ -2086,8 +2080,6 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii)if (ver !=RTL_GIGA_MAC_NONE && !gmii) {if (ver ==RTL_GIGA_MAC_VER_42 ) ver =RTL_GIGA_MAC_VER_43 ; -else if (ver ==RTL_GIGA_MAC_VER_45 ) - ver =RTL_GIGA_MAC_VER_47 ;else if (ver ==RTL_GIGA_MAC_VER_46 ) ver =RTL_GIGA_MAC_VER_48 ; }
@@ -2698,7 +2690,7 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)RTL_W8 (tp, Config2,RTL_R8 (tp, Config2) | ClkReqEn);switch (tp->mac_version) { - case RTL_GIGA_MAC_VER_45 ... RTL_GIGA_MAC_VER_48: + case RTL_GIGA_MAC_VER_46 ... RTL_GIGA_MAC_VER_48: case RTL_GIGA_MAC_VER_60 ... RTL_GIGA_MAC_VER_63:/* reset ephy tx/rx disable timer */ r8168_mac_ocp_modify (tp,0xe094 ,0xff00 ,0 );
@@ -2710,7 +2702,7 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable) } }else {switch (tp->mac_version) { - case RTL_GIGA_MAC_VER_45 ... RTL_GIGA_MAC_VER_48: + case RTL_GIGA_MAC_VER_46 ... RTL_GIGA_MAC_VER_48: case RTL_GIGA_MAC_VER_60 ... RTL_GIGA_MAC_VER_63:r8168_mac_ocp_modify (tp,0xe092 ,0x00ff ,0 );break ;
@@ -3749,9 +3741,7 @@ static void rtl_hw_config(struct rtl8169_private *tp) [RTL_GIGA_MAC_VER_42] = rtl_hw_start_8168g_2, [RTL_GIGA_MAC_VER_43] = rtl_hw_start_8168g_2, [RTL_GIGA_MAC_VER_44] = rtl_hw_start_8411_2, - [RTL_GIGA_MAC_VER_45] = rtl_hw_start_8168h_1, [RTL_GIGA_MAC_VER_46] = rtl_hw_start_8168h_1, - [RTL_GIGA_MAC_VER_47] = rtl_hw_start_8168h_1, [RTL_GIGA_MAC_VER_48] = rtl_hw_start_8168h_1, [RTL_GIGA_MAC_VER_49] = rtl_hw_start_8168ep_1, [RTL_GIGA_MAC_VER_50] = rtl_hw_start_8168ep_2,
@@ -5375,7 +5365,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)*/ if (rtl_aspm_is_safe (tp)) rc =0 ; -else if (tp->mac_version >=RTL_GIGA_MAC_VER_45 ) +else if (tp->mac_version >=RTL_GIGA_MAC_VER_46 ) rc =pci_disable_link_state (pdev,PCIE_LINK_STATE_L1_2 );else rc =pci_disable_link_state (pdev,PCIE_LINK_STATE_L1 );
drivers/net/ethernet/realtek/r8169_phy_config.c +0 -67
80 lines not on this page · raw message
Signature · 1 line
2.37.2
Heiner Kallweit
maintainerPATCH v2 3/5 r8169: remove support for chip version 49
In reply to Heiner KallweitDetection of this chip version has been disabled for few kernel versions now. Nobody complained, so remove support for this chip version.
v2:
- fix a typo: RTL_GIGA_MAC_VER_40 -> RTL_GIGA_MAC_VER_50
--- drivers/net/ethernet/realtek/r8169.h | 2 +- drivers/net/ethernet/realtek/r8169_main.c | 26 ++----------------- .../net/ethernet/realtek/r8169_phy_config.c | 22 ---------------- 3 files changed, 3 insertions(+), 47 deletions(-)
drivers/net/ethernet/realtek/r8169.h +1 -1
@@ -59,7 +59,7 @@ enum mac_version {RTL_GIGA_MAC_VER_46 ,/* support for RTL_GIGA_MAC_VER_47 has been removed */ RTL_GIGA_MAC_VER_48 , -RTL_GIGA_MAC_VER_49 , +/* support for RTL_GIGA_MAC_VER_49 has been removed */ RTL_GIGA_MAC_VER_50 ,RTL_GIGA_MAC_VER_51 , RTL_GIGA_MAC_VER_52,
drivers/net/ethernet/realtek/r8169_main.c +2 -24
@@ -134,7 +134,6 @@ static const struct { [RTL_GIGA_MAC_VER_44] = {"RTL8411b", FIRMWARE_8411_2 }, [RTL_GIGA_MAC_VER_46] = {"RTL8168h/8111h", FIRMWARE_8168H_2}, [RTL_GIGA_MAC_VER_48] = {"RTL8107e", FIRMWARE_8107E_2}, - [RTL_GIGA_MAC_VER_49] = {"RTL8168ep/8111ep" }, [RTL_GIGA_MAC_VER_50] = {"RTL8168ep/8111ep" }, [RTL_GIGA_MAC_VER_51] = {"RTL8168ep/8111ep" }, [RTL_GIGA_MAC_VER_52] = {"RTL8168fp/RTL8117", FIRMWARE_8168FP_3},
@@ -885,7 +884,6 @@ static void rtl8168g_phy_suspend_quirk(struct rtl8169_private *tp, int value) {switch (tp->mac_version) {case RTL_GIGA_MAC_VER_40 : -case RTL_GIGA_MAC_VER_49 :if (value &BMCR_RESET || !(value &BMCR_PDOWN ))rtl_eri_set_bits (tp,0x1a8 ,0xfc000000 );else
@@ -1199,7 +1197,7 @@ static enum rtl_dash_type rtl_check_dash(struct rtl8169_private *tp)case RTL_GIGA_MAC_VER_28 :case RTL_GIGA_MAC_VER_31 :return r8168dp_check_dash (tp) ?RTL_DASH_DP :RTL_DASH_NONE ; - case RTL_GIGA_MAC_VER_49 ... RTL_GIGA_MAC_VER_53: + case RTL_GIGA_MAC_VER_50 ... RTL_GIGA_MAC_VER_53:return r8168ep_check_dash (tp) ?RTL_DASH_EP :RTL_DASH_NONE ;default :return RTL_DASH_NONE ;
@@ -3278,25 +3276,6 @@ static void rtl_hw_start_8168ep(struct rtl8169_private *tp)rtl_pcie_state_l2l3_disable (tp); } -static void rtl_hw_start_8168ep_1 (struct rtl8169_private *tp) -{ -static const struct ephy_info e_info_8168ep_1[] = { - {0x00 ,0xffff ,0x10ab }, - {0x06 ,0xffff ,0xf030 }, - {0x08 ,0xffff ,0x2006 }, - {0x0d ,0xffff ,0x1666 }, - {0x0c ,0x3ff0 ,0x0000 } - }; - -/* disable aspm and clock request before access ephy */ -rtl_hw_aspm_clkreq_enable (tp, false); -rtl_ephy_init (tp, e_info_8168ep_1); - -rtl_hw_start_8168ep (tp); - -rtl_hw_aspm_clkreq_enable (tp, true); -} -static void rtl_hw_start_8168ep_2 (struct rtl8169_private *tp) {static const struct ephy_info e_info_8168ep_2[] = {
@@ -3743,7 +3722,6 @@ static void rtl_hw_config(struct rtl8169_private *tp) [RTL_GIGA_MAC_VER_44] = rtl_hw_start_8411_2, [RTL_GIGA_MAC_VER_46] = rtl_hw_start_8168h_1, [RTL_GIGA_MAC_VER_48] = rtl_hw_start_8168h_1, - [RTL_GIGA_MAC_VER_49] = rtl_hw_start_8168ep_1, [RTL_GIGA_MAC_VER_50] = rtl_hw_start_8168ep_2, [RTL_GIGA_MAC_VER_51] = rtl_hw_start_8168ep_3, [RTL_GIGA_MAC_VER_52] = rtl_hw_start_8117,
@@ -5181,7 +5159,7 @@ static void rtl_hw_init_8125(struct rtl8169_private *tp)static void rtl_hw_initialize (struct rtl8169_private *tp) {switch (tp->mac_version) { - case RTL_GIGA_MAC_VER_49 ... RTL_GIGA_MAC_VER_53: + case RTL_GIGA_MAC_VER_50 ... RTL_GIGA_MAC_VER_53:rtl8168ep_stop_cmac (tp); fallthrough; case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_48:
drivers/net/ethernet/realtek/r8169_phy_config.c +0 -22
@@ -830,27 +830,6 @@ static void rtl8168h_2_hw_phy_config(struct rtl8169_private *tp,rtl8168g_config_eee_phy (phydev); } -static void rtl8168ep_1_hw_phy_config (struct rtl8169_private *tp, -struct phy_device *phydev) -{ -/* Enable PHY auto speed down */ -phy_modify_paged (phydev,0x0a44 ,0x11 ,0 ,BIT (3 ) |BIT (2 )); - -rtl8168g_phy_adjust_10m_aldps (phydev); - -/* Enable EEE auto-fallback function */ -phy_modify_paged (phydev,0x0a4b ,0x11 ,0 ,BIT (2 )); - -/* Enable UC LPF tune function */ -r8168g_phy_param (phydev,0x8012 ,0x0000 ,0x8000 ); - -/* set rg_sel_sdm_rate */ -phy_modify_paged (phydev,0x0c42 ,0x11 ,BIT (13 ),BIT (14 )); - -rtl8168g_disable_aldps (phydev); -rtl8168g_config_eee_phy (phydev); -} -static void rtl8168ep_2_hw_phy_config (struct rtl8169_private *tp,struct phy_device *phydev) {
@@ -1206,7 +1185,6 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev, [RTL_GIGA_MAC_VER_44] = rtl8168g_2_hw_phy_config, [RTL_GIGA_MAC_VER_46] = rtl8168h_2_hw_phy_config, [RTL_GIGA_MAC_VER_48] = rtl8168h_2_hw_phy_config, - [RTL_GIGA_MAC_VER_49] = rtl8168ep_1_hw_phy_config, [RTL_GIGA_MAC_VER_50] = rtl8168ep_2_hw_phy_config, [RTL_GIGA_MAC_VER_51] = rtl8168ep_2_hw_phy_config, [RTL_GIGA_MAC_VER_52] = rtl8117_hw_phy_config,
Signature · 1 line
2.37.2
Heiner Kallweit
maintainerPATCH v2 4/5 r8169: remove support for chip version 50
In reply to Heiner KallweitDetection of this chip version has been disabled for few kernel versions now. Nobody complained, so remove support for this chip version.
--- drivers/net/ethernet/realtek/r8169.h | 2 +- drivers/net/ethernet/realtek/r8169_main.c | 24 +------------------ .../net/ethernet/realtek/r8169_phy_config.c | 1 - 3 files changed, 2 insertions(+), 25 deletions(-)
drivers/net/ethernet/realtek/r8169.h +1 -1
@@ -60,7 +60,7 @@ enum mac_version {/* support for RTL_GIGA_MAC_VER_47 has been removed */ RTL_GIGA_MAC_VER_48 ,/* support for RTL_GIGA_MAC_VER_49 has been removed */ -RTL_GIGA_MAC_VER_50 , +/* support for RTL_GIGA_MAC_VER_50 has been removed */ RTL_GIGA_MAC_VER_51 ,RTL_GIGA_MAC_VER_52 , RTL_GIGA_MAC_VER_53,
drivers/net/ethernet/realtek/r8169_main.c +1 -23
@@ -134,7 +134,6 @@ static const struct { [RTL_GIGA_MAC_VER_44] = {"RTL8411b", FIRMWARE_8411_2 }, [RTL_GIGA_MAC_VER_46] = {"RTL8168h/8111h", FIRMWARE_8168H_2}, [RTL_GIGA_MAC_VER_48] = {"RTL8107e", FIRMWARE_8107E_2}, - [RTL_GIGA_MAC_VER_50] = {"RTL8168ep/8111ep" }, [RTL_GIGA_MAC_VER_51] = {"RTL8168ep/8111ep" }, [RTL_GIGA_MAC_VER_52] = {"RTL8168fp/RTL8117", FIRMWARE_8168FP_3}, [RTL_GIGA_MAC_VER_53] = {"RTL8168fp/RTL8117", },
@@ -3276,26 +3275,6 @@ static void rtl_hw_start_8168ep(struct rtl8169_private *tp)rtl_pcie_state_l2l3_disable (tp); } -static void rtl_hw_start_8168ep_2 (struct rtl8169_private *tp) -{ -static const struct ephy_info e_info_8168ep_2[] = { - {0x00 ,0xffff ,0x10a3 }, - {0x19 ,0xffff ,0xfc00 }, - {0x1e ,0xffff ,0x20ea } - }; - -/* disable aspm and clock request before access ephy */ -rtl_hw_aspm_clkreq_enable (tp, false); -rtl_ephy_init (tp, e_info_8168ep_2); - -rtl_hw_start_8168ep (tp); - -RTL_W8 (tp,DLLPR ,RTL_R8 (tp,DLLPR ) & ~PFM_EN ); -RTL_W8 (tp,MISC_1 ,RTL_R8 (tp,MISC_1 ) & ~PFM_D3COLD_EN ); - -rtl_hw_aspm_clkreq_enable (tp, true); -} -static void rtl_hw_start_8168ep_3 (struct rtl8169_private *tp) {static const struct ephy_info e_info_8168ep_3[] = {
@@ -3722,7 +3701,6 @@ static void rtl_hw_config(struct rtl8169_private *tp) [RTL_GIGA_MAC_VER_44] = rtl_hw_start_8411_2, [RTL_GIGA_MAC_VER_46] = rtl_hw_start_8168h_1, [RTL_GIGA_MAC_VER_48] = rtl_hw_start_8168h_1, - [RTL_GIGA_MAC_VER_50] = rtl_hw_start_8168ep_2, [RTL_GIGA_MAC_VER_51] = rtl_hw_start_8168ep_3, [RTL_GIGA_MAC_VER_52] = rtl_hw_start_8117, [RTL_GIGA_MAC_VER_53] = rtl_hw_start_8117,
@@ -5159,7 +5137,7 @@ static void rtl_hw_init_8125(struct rtl8169_private *tp)static void rtl_hw_initialize (struct rtl8169_private *tp) {switch (tp->mac_version) { - case RTL_GIGA_MAC_VER_50 ... RTL_GIGA_MAC_VER_53: + case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_53:rtl8168ep_stop_cmac (tp); fallthrough; case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_48:
drivers/net/ethernet/realtek/r8169_phy_config.c +0 -1
@@ -1185,7 +1185,6 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev, [RTL_GIGA_MAC_VER_44] = rtl8168g_2_hw_phy_config, [RTL_GIGA_MAC_VER_46] = rtl8168h_2_hw_phy_config, [RTL_GIGA_MAC_VER_48] = rtl8168h_2_hw_phy_config, - [RTL_GIGA_MAC_VER_50] = rtl8168ep_2_hw_phy_config, [RTL_GIGA_MAC_VER_51] = rtl8168ep_2_hw_phy_config, [RTL_GIGA_MAC_VER_52] = rtl8117_hw_phy_config, [RTL_GIGA_MAC_VER_53] = rtl8117_hw_phy_config,
Signature · 1 line
2.37.2
Heiner Kallweit
maintainerPATCH v2 5/5 r8169: remove support for chip version 60
In reply to Heiner KallweitDetection of this chip version has been disabled for few kernel versions now. Nobody complained, so remove support for this chip version.
--- drivers/net/ethernet/realtek/r8169.h | 2 +- drivers/net/ethernet/realtek/r8169_main.c | 57 +++---------------- .../net/ethernet/realtek/r8169_phy_config.c | 39 ------------- 3 files changed, 8 insertions(+), 90 deletions(-)
drivers/net/ethernet/realtek/r8169.h +1 -1
@@ -64,7 +64,7 @@ enum mac_version {RTL_GIGA_MAC_VER_51 ,RTL_GIGA_MAC_VER_52 ,RTL_GIGA_MAC_VER_53 , -RTL_GIGA_MAC_VER_60 , +/* support for RTL_GIGA_MAC_VER_60 has been removed */ RTL_GIGA_MAC_VER_61 ,RTL_GIGA_MAC_VER_63 ,RTL_GIGA_MAC_NONE
drivers/net/ethernet/realtek/r8169_main.c +7 -50
123 lines not on this page · raw message
drivers/net/ethernet/realtek/r8169_phy_config.c +0 -39
@@ -995,44 +995,6 @@ static void rtl8125_legacy_force_mode(struct phy_device *phydev)phy_modify_paged (phydev,0xa5b ,0x12 ,BIT (15 ),0 ); } -static void rtl8125a_1_hw_phy_config (struct rtl8169_private *tp, -struct phy_device *phydev) -{ -phy_modify_paged (phydev,0xad4 ,0x10 ,0x03ff ,0x0084 ); -phy_modify_paged (phydev,0xad4 ,0x17 ,0x0000 ,0x0010 ); -phy_modify_paged (phydev,0xad1 ,0x13 ,0x03ff ,0x0006 ); -phy_modify_paged (phydev,0xad3 ,0x11 ,0x003f ,0x0006 ); -phy_modify_paged (phydev,0xac0 ,0x14 ,0x0000 ,0x1100 ); -phy_modify_paged (phydev,0xac8 ,0x15 ,0xf000 ,0x7000 ); -phy_modify_paged (phydev,0xad1 ,0x14 ,0x0000 ,0x0400 ); -phy_modify_paged (phydev,0xad1 ,0x15 ,0x0000 ,0x03ff ); -phy_modify_paged (phydev,0xad1 ,0x16 ,0x0000 ,0x03ff ); - -r8168g_phy_param (phydev,0x80ea ,0xff00 ,0xc400 ); -r8168g_phy_param (phydev,0x80eb ,0x0700 ,0x0300 ); -r8168g_phy_param (phydev,0x80f8 ,0xff00 ,0x1c00 ); -r8168g_phy_param (phydev,0x80f1 ,0xff00 ,0x3000 ); -r8168g_phy_param (phydev,0x80fe ,0xff00 ,0xa500 ); -r8168g_phy_param (phydev,0x8102 ,0xff00 ,0x5000 ); -r8168g_phy_param (phydev,0x8105 ,0xff00 ,0x3300 ); -r8168g_phy_param (phydev,0x8100 ,0xff00 ,0x7000 ); -r8168g_phy_param (phydev,0x8104 ,0xff00 ,0xf000 ); -r8168g_phy_param (phydev,0x8106 ,0xff00 ,0x6500 ); -r8168g_phy_param (phydev,0x80dc ,0xff00 ,0xed00 ); -r8168g_phy_param (phydev,0x80df ,0x0000 ,0x0100 ); -r8168g_phy_param (phydev,0x80e1 ,0x0100 ,0x0000 ); - -phy_modify_paged (phydev,0xbf0 ,0x13 ,0x003f ,0x0038 ); -r8168g_phy_param (phydev,0x819f ,0xffff ,0xd0b6 ); - -phy_write_paged (phydev,0xbc3 ,0x12 ,0x5555 ); -phy_modify_paged (phydev,0xbf0 ,0x15 ,0x0e00 ,0x0a00 ); -phy_modify_paged (phydev,0xa5c ,0x10 ,0x0400 ,0x0000 ); -rtl8168g_enable_gphy_10m (phydev); - -rtl8125a_config_eee_phy (phydev); -} -static void rtl8125a_2_hw_phy_config (struct rtl8169_private *tp,struct phy_device *phydev) {
@@ -1188,7 +1150,6 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev, [RTL_GIGA_MAC_VER_51] = rtl8168ep_2_hw_phy_config, [RTL_GIGA_MAC_VER_52] = rtl8117_hw_phy_config, [RTL_GIGA_MAC_VER_53] = rtl8117_hw_phy_config, - [RTL_GIGA_MAC_VER_60] = rtl8125a_1_hw_phy_config, [RTL_GIGA_MAC_VER_61] = rtl8125a_2_hw_phy_config, [RTL_GIGA_MAC_VER_63] = rtl8125b_hw_phy_config, };
Signature · 1 line
2.37.2