r8169: remove support for chip version 50

Detection of this chip version has been disabled for few kernel versions now.
Nobody complained, so remove support for this chip version.

v3:
- rebase patch

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/realtek/r8169.h b/drivers/net/ethernet/realtek/r8169.h
index 7c85c469637decbf2bcc365d5c1be0d585534b38..68cd71289bd7f5ddf3a671de415c5d4775d405e7 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.h
+++ b/drivers/net/ethernet/realtek/r8169.h
@@ -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,

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index cc2bed903f09f1b3d0f9059d7a23f9e827b70a71..0fa478e22d2aa9ab72cfdbb0c21931f6d9b71256 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -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",                   },
@@ -1197,7 +1196,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_50 ... RTL_GIGA_MAC_VER_53:
+       case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_53:
                return r8168ep_check_dash(tp) ? RTL_DASH_EP : RTL_DASH_NONE;
        default:
                return RTL_DASH_NONE;
@@ -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:

diff --git a/drivers/net/ethernet/realtek/r8169_phy_config.c b/drivers/net/ethernet/realtek/r8169_phy_config.c
index de1d78df41c36daf7873b12c66a3f5a3b514375a..99e4f06f8a206f2c0f5e845fa47ff10c919cf20d 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
+++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
@@ -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,