r8169: merge chip versions 52 and 53 (RTL8117)

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/ae866b71-c904-434e-befb-848c831e33ff@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 1878c44ece91aa9ccd36ee0596a487b30f2b1177..f05231030925efc6670585152fe0f0725c29069c 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.h
+++ b/drivers/net/ethernet/realtek/r8169.h
@@ -64,7 +64,6 @@ enum mac_version {
        /* 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,
        /* support for RTL_GIGA_MAC_VER_60 has been removed */
        RTL_GIGA_MAC_VER_61,
        RTL_GIGA_MAC_VER_63,

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index dfd356a76e9505b33d63fab9bf69d36181975555..7bf71a675362b03ab057c6e08e8596f0f8b3067a 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -116,7 +116,7 @@ static const struct rtl_chip_info {
        { 0x7cf, 0x609, RTL_GIGA_MAC_VER_61, "RTL8125A", FIRMWARE_8125A_3 },
 
        /* RTL8117 */
-       { 0x7cf, 0x54b, RTL_GIGA_MAC_VER_53, "RTL8168fp/RTL8117" },
+       { 0x7cf, 0x54b, RTL_GIGA_MAC_VER_52, "RTL8168fp/RTL8117" },
        { 0x7cf, 0x54a, RTL_GIGA_MAC_VER_52, "RTL8168fp/RTL8117",
          FIRMWARE_8168FP_3 },
 
@@ -830,7 +830,7 @@ static bool rtl_is_8168evl_up(struct rtl8169_private *tp)
 {
        return tp->mac_version >= RTL_GIGA_MAC_VER_34 &&
               tp->mac_version != RTL_GIGA_MAC_VER_39 &&
-              tp->mac_version <= RTL_GIGA_MAC_VER_53;
+              tp->mac_version <= RTL_GIGA_MAC_VER_52;
 }
 
 static bool rtl_supports_eee(struct rtl8169_private *tp)
@@ -998,9 +998,7 @@ void r8169_get_led_name(struct rtl8169_private *tp, int idx,
 static void r8168fp_adjust_ocp_cmd(struct rtl8169_private *tp, u32 *cmd, int type)
 {
        /* based on RTL8168FP_OOBMAC_BASE in vendor driver */
-       if (type == ERIAR_OOB &&
-           (tp->mac_version == RTL_GIGA_MAC_VER_52 ||
-            tp->mac_version == RTL_GIGA_MAC_VER_53))
+       if (type == ERIAR_OOB && tp->mac_version == RTL_GIGA_MAC_VER_52)
                *cmd |= 0xf70 << 18;
 }
 
@@ -1500,7 +1498,7 @@ static enum rtl_dash_type rtl_get_dash_type(struct rtl8169_private *tp)
        case RTL_GIGA_MAC_VER_28:
        case RTL_GIGA_MAC_VER_31:
                return RTL_DASH_DP;
-       case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_53:
+       case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_52:
                return RTL_DASH_EP;
        case RTL_GIGA_MAC_VER_66:
                return RTL_DASH_25_BP;
@@ -2485,7 +2483,7 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp)
        case RTL_GIGA_MAC_VER_38:
                RTL_W32(tp, RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST);
                break;
-       case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_53:
+       case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_52:
                RTL_W32(tp, RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST | RX_EARLY_OFF);
                break;
        case RTL_GIGA_MAC_VER_61:
@@ -2616,7 +2614,7 @@ DECLARE_RTL_COND(rtl_rxtx_empty_cond_2)
 static void rtl_wait_txrx_fifo_empty(struct rtl8169_private *tp)
 {
        switch (tp->mac_version) {
-       case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_53:
+       case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_52:
                rtl_loop_wait_high(tp, &rtl_txcfg_empty_cond, 100, 42);
                rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond, 100, 42);
                break;
@@ -3826,7 +3824,6 @@ static void rtl_hw_config(struct rtl8169_private *tp)
                [RTL_GIGA_MAC_VER_48] = rtl_hw_start_8168h_1,
                [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,
                [RTL_GIGA_MAC_VER_61] = rtl_hw_start_8125a_2,
                [RTL_GIGA_MAC_VER_63] = rtl_hw_start_8125b,
                [RTL_GIGA_MAC_VER_64] = rtl_hw_start_8125d,
@@ -5285,7 +5282,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_51 ... RTL_GIGA_MAC_VER_53:
+       case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_52:
                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 e3adfafa2b1b6aaa3cd38f9de29b2d39c28da631..5403f8202c7979779b014f148d3730b47113d4e4 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
+++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
@@ -1176,7 +1176,6 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,
                [RTL_GIGA_MAC_VER_48] = rtl8168h_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,
                [RTL_GIGA_MAC_VER_61] = rtl8125a_2_hw_phy_config,
                [RTL_GIGA_MAC_VER_63] = rtl8125b_hw_phy_config,
                [RTL_GIGA_MAC_VER_64] = rtl8125d_hw_phy_config,