r8169: remove support for chip versions 45 and 47

[platform/kernel/linux-starfive.git] / drivers / net / ethernet / realtek / r8169_main.c

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index a2baeb8..0e7d10c 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -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);