r8169: merge chip versions 70 and 71 (RTL8126A)

Handling of both chip versions is the same, only difference is
the firmware. So we can merge handling of both chip versions.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/97d7ae79-d021-4b6b-b424-89e5e305b029@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/realtek/r8169.h b/drivers/net/ethernet/realtek/r8169.h
index 9f784840ea0d21b70cf90e52ca13ea92fdae7c81..3f7182dc8c9ec98c05de3a1748ae39a82ad1f01e 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.h
+++ b/drivers/net/ethernet/realtek/r8169.h
@@ -72,7 +72,6 @@ enum mac_version {
        RTL_GIGA_MAC_VER_65,
        RTL_GIGA_MAC_VER_66,
        RTL_GIGA_MAC_VER_70,
-       RTL_GIGA_MAC_VER_71,
        RTL_GIGA_MAC_NONE,
        RTL_GIGA_MAC_VER_LAST = RTL_GIGA_MAC_NONE - 1
 };

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 3ef7126f8ec507d03d530f0c51d1b88d97b507ae..f2679bca9d0c11cc345b11a6235fe6be02f4d6b9 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -99,7 +99,7 @@ static const struct rtl_chip_info {
        const char *fw_name;
 } rtl_chip_infos[] = {
        /* 8126A family. */
-       { 0x7cf, 0x64a, RTL_GIGA_MAC_VER_71, "RTL8126A", FIRMWARE_8126A_3 },
+       { 0x7cf, 0x64a, RTL_GIGA_MAC_VER_70, "RTL8126A", FIRMWARE_8126A_3 },
        { 0x7cf, 0x649, RTL_GIGA_MAC_VER_70, "RTL8126A", FIRMWARE_8126A_2 },
 
        /* 8125BP family. */
@@ -2939,7 +2939,6 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)
                rtl_mod_config5(tp, 0, ASPM_en);
                switch (tp->mac_version) {
                case RTL_GIGA_MAC_VER_70:
-               case RTL_GIGA_MAC_VER_71:
                        val8 = RTL_R8(tp, INT_CFG0_8125) | INT_CFG0_CLKREQEN;
                        RTL_W8(tp, INT_CFG0_8125, val8);
                        break;
@@ -2971,7 +2970,6 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)
 
                switch (tp->mac_version) {
                case RTL_GIGA_MAC_VER_70:
-               case RTL_GIGA_MAC_VER_71:
                        val8 = RTL_R8(tp, INT_CFG0_8125) & ~INT_CFG0_CLKREQEN;
                        RTL_W8(tp, INT_CFG0_8125, val8);
                        break;
@@ -3691,12 +3689,10 @@ static void rtl_hw_start_8125_common(struct rtl8169_private *tp)
        /* disable new tx descriptor format */
        r8168_mac_ocp_modify(tp, 0xeb58, 0x0001, 0x0000);
 
-       if (tp->mac_version == RTL_GIGA_MAC_VER_70 ||
-           tp->mac_version == RTL_GIGA_MAC_VER_71)
+       if (tp->mac_version == RTL_GIGA_MAC_VER_70)
                RTL_W8(tp, 0xD8, RTL_R8(tp, 0xD8) & ~0x02);
 
-       if (tp->mac_version == RTL_GIGA_MAC_VER_70 ||
-           tp->mac_version == RTL_GIGA_MAC_VER_71)
+       if (tp->mac_version == RTL_GIGA_MAC_VER_70)
                r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0400);
        else if (tp->mac_version == RTL_GIGA_MAC_VER_63)
                r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0200);
@@ -3714,8 +3710,7 @@ static void rtl_hw_start_8125_common(struct rtl8169_private *tp)
        r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0030);
        r8168_mac_ocp_modify(tp, 0xe040, 0x1000, 0x0000);
        r8168_mac_ocp_modify(tp, 0xea1c, 0x0003, 0x0001);
-       if (tp->mac_version == RTL_GIGA_MAC_VER_70 ||
-           tp->mac_version == RTL_GIGA_MAC_VER_71)
+       if (tp->mac_version == RTL_GIGA_MAC_VER_70)
                r8168_mac_ocp_modify(tp, 0xea1c, 0x0300, 0x0000);
        else
                r8168_mac_ocp_modify(tp, 0xea1c, 0x0004, 0x0000);
@@ -3838,7 +3833,6 @@ static void rtl_hw_config(struct rtl8169_private *tp)
                [RTL_GIGA_MAC_VER_65] = rtl_hw_start_8125d,
                [RTL_GIGA_MAC_VER_66] = rtl_hw_start_8125d,
                [RTL_GIGA_MAC_VER_70] = rtl_hw_start_8126a,
-               [RTL_GIGA_MAC_VER_71] = rtl_hw_start_8126a,
        };
 
        if (hw_configs[tp->mac_version])
@@ -3862,7 +3856,6 @@ static void rtl_hw_start_8125(struct rtl8169_private *tp)
                break;
        case RTL_GIGA_MAC_VER_63:
        case RTL_GIGA_MAC_VER_70:
-       case RTL_GIGA_MAC_VER_71:
                for (i = 0xa00; i < 0xa80; i += 4)
                        RTL_W32(tp, i, 0);
                RTL_W16(tp, INT_CFG1_8125, 0x0000);

diff --git a/drivers/net/ethernet/realtek/r8169_phy_config.c b/drivers/net/ethernet/realtek/r8169_phy_config.c
index 748ca8b212ba1210717c86f9765566f3fbf60dae..7f513086ba96c96b70ff5b071266793ebaa6b320 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
+++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
@@ -1183,7 +1183,6 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,
                [RTL_GIGA_MAC_VER_65] = rtl8125d_hw_phy_config,
                [RTL_GIGA_MAC_VER_66] = rtl8125bp_hw_phy_config,
                [RTL_GIGA_MAC_VER_70] = rtl8126a_hw_phy_config,
-               [RTL_GIGA_MAC_VER_71] = rtl8126a_hw_phy_config,
        };
 
        if (phy_configs[ver])