r8169: add support for RTL8125cp

This patch adds support for chip RTL8125cp. Its XID is 0x708. We apply
different configuration and firmware for RTL8125cp.

Signed-off-by: Javen Xu <javen_xu@realsil.com.cn>
Link: https://patch.msgid.link/20260303094611.450-1-javen_xu@realsil.com.cn
[pabeni@redhat.com: changelog cleanup]
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/realtek/r8169.h b/drivers/net/ethernet/realtek/r8169.h
index aed4cf852091cccd1d266da0c16760d52cb98904..0b9c1d4eb48ba7d016dbf5528c65ad0192a47f1e 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.h
+++ b/drivers/net/ethernet/realtek/r8169.h
@@ -68,6 +68,7 @@ enum mac_version {
        RTL_GIGA_MAC_VER_61,
        RTL_GIGA_MAC_VER_63,
        RTL_GIGA_MAC_VER_64,
+       RTL_GIGA_MAC_VER_65,
        RTL_GIGA_MAC_VER_66,
        RTL_GIGA_MAC_VER_70,
        RTL_GIGA_MAC_VER_80,

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 58788d196c57da7cbc37def9f6a9457fc5db86bd..791277e750bad4647f6e554ef303945be80d59b1 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -60,6 +60,7 @@
 #define FIRMWARE_8125D_2       "rtl_nic/rtl8125d-2.fw"
 #define FIRMWARE_8125K_1       "rtl_nic/rtl8125k-1.fw"
 #define FIRMWARE_8125BP_2      "rtl_nic/rtl8125bp-2.fw"
+#define FIRMWARE_8125CP_1      "rtl_nic/rtl8125cp-1.fw"
 #define FIRMWARE_9151A_1       "rtl_nic/rtl9151a-1.fw"
 #define FIRMWARE_8126A_2       "rtl_nic/rtl8126a-2.fw"
 #define FIRMWARE_8126A_3       "rtl_nic/rtl8126a-3.fw"
@@ -112,6 +113,9 @@ static const struct rtl_chip_info {
        /* 8125BP family. */
        { 0x7cf, 0x681, RTL_GIGA_MAC_VER_66, "RTL8125BP", FIRMWARE_8125BP_2 },
 
+       /* 8125CP family*/
+       { 0x7cf, 0x708, RTL_GIGA_MAC_VER_65, "RTL8125CP", FIRMWARE_8125CP_1 },
+
        /* 8125D family. */
        { 0x7cf, 0x68b, RTL_GIGA_MAC_VER_64, "RTL9151A", FIRMWARE_9151A_1 },
        { 0x7cf, 0x68a, RTL_GIGA_MAC_VER_64, "RTL8125K", FIRMWARE_8125K_1 },
@@ -802,6 +806,7 @@ MODULE_FIRMWARE(FIRMWARE_8125D_1);
 MODULE_FIRMWARE(FIRMWARE_8125D_2);
 MODULE_FIRMWARE(FIRMWARE_8125K_1);
 MODULE_FIRMWARE(FIRMWARE_8125BP_2);
+MODULE_FIRMWARE(FIRMWARE_8125CP_1);
 MODULE_FIRMWARE(FIRMWARE_9151A_1);
 MODULE_FIRMWARE(FIRMWARE_8126A_2);
 MODULE_FIRMWARE(FIRMWARE_8126A_3);
@@ -4021,6 +4026,7 @@ static void rtl_hw_config(struct rtl8169_private *tp)
                [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,
+               [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_80] = rtl_hw_start_8127a,
@@ -4040,6 +4046,7 @@ static void rtl_hw_start_8125(struct rtl8169_private *tp)
        switch (tp->mac_version) {
        case RTL_GIGA_MAC_VER_61:
        case RTL_GIGA_MAC_VER_64:
+       case RTL_GIGA_MAC_VER_65:
        case RTL_GIGA_MAC_VER_66:
        case RTL_GIGA_MAC_VER_80:
                for (i = 0xa00; i < 0xb00; i += 4)

diff --git a/drivers/net/ethernet/realtek/r8169_phy_config.c b/drivers/net/ethernet/realtek/r8169_phy_config.c
index 032d9d2cfa2a0ab3dd18a9a3c932f9546ed46455..4f1d447136ec1dfebaf2567dad4193d79a927c45 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
+++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
@@ -14,6 +14,9 @@
 
 #include "r8169.h"
 
+#define LINK_SPEED_10M_PLL_OFF         BIT(0)
+#define ALDPS_PLL_OFF                  BIT(1)
+
 typedef void (*rtl_phy_cfg_fct)(struct rtl8169_private *tp,
                                struct phy_device *phydev);
 
@@ -1102,6 +1105,28 @@ static void rtl8125d_hw_phy_config(struct rtl8169_private *tp,
        rtl8125_config_eee_phy(phydev);
 }
 
+static void rtl8125cp_hw_phy_config(struct rtl8169_private *tp,
+                                   struct phy_device *phydev)
+{
+       r8169_apply_firmware(tp);
+       rtl8168g_enable_gphy_10m(phydev);
+
+       phy_modify_paged(phydev, 0xad0, 0x17, 0x007f, 0x000b);
+       phy_modify_paged(phydev, 0xad7, 0x14, 0x0000, BIT(4));
+       rtl8125_phy_param(phydev, 0x807f, 0xff00, 0x5300);
+       r8168g_phy_param(phydev, 0x81b8, 0xffff, 0x00b4);
+       r8168g_phy_param(phydev, 0x81ba, 0xffff, 0x00e4);
+       r8168g_phy_param(phydev, 0x81c5, 0xffff, 0x0104);
+       r8168g_phy_param(phydev, 0x81d0, 0xffff, 0x054d);
+       phy_modify_paged(phydev, 0x0a43, 0x10, 0x0000,
+                        LINK_SPEED_10M_PLL_OFF | ALDPS_PLL_OFF);
+       phy_modify_paged(phydev, 0x0a44, 0x11, 0x0000, BIT(7));
+
+       rtl8125_legacy_force_mode(phydev);
+       rtl8168g_disable_aldps(phydev);
+       rtl8125_config_eee_phy(phydev);
+}
+
 static void rtl8125bp_hw_phy_config(struct rtl8169_private *tp,
                                    struct phy_device *phydev)
 {
@@ -1344,6 +1369,7 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,
                [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,
+               [RTL_GIGA_MAC_VER_65] = rtl8125cp_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_80] = rtl8127a_1_hw_phy_config,