On 01.02.2021 17:47, Kai-Heng Feng wrote:
> According to the vendor driver, the new chip with XID 0x54b is
> essentially the same as the one with XID 0x54a, but it doesn't need the
> firmware.
>
> So add support accordingly.
>
> Signed-off-by: Kai-Heng Feng <kai.heng.f...@canonical.com>
> ---
> drivers/net/ethernet/realtek/r8169.h | 1 +
> drivers/net/ethernet/realtek/r8169_main.c | 21 +++++++++++++--------
> 2 files changed, 14 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/ethernet/realtek/r8169.h
> b/drivers/net/ethernet/realtek/r8169.h
> index 7be86ef5a584..2728df46ec41 100644
> --- a/drivers/net/ethernet/realtek/r8169.h
> +++ b/drivers/net/ethernet/realtek/r8169.h
> @@ -63,6 +63,7 @@ enum mac_version {
> RTL_GIGA_MAC_VER_50,
> RTL_GIGA_MAC_VER_51,
> RTL_GIGA_MAC_VER_52,
> + RTL_GIGA_MAC_VER_53,
> RTL_GIGA_MAC_VER_60,
> 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 a569abe7f5ef..ee1f72a9d453 100644
> --- a/drivers/net/ethernet/realtek/r8169_main.c
> +++ b/drivers/net/ethernet/realtek/r8169_main.c
> @@ -145,6 +145,7 @@ static const struct {
> [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", },
> [RTL_GIGA_MAC_VER_60] = {"RTL8125A" },
> [RTL_GIGA_MAC_VER_61] = {"RTL8125A", FIRMWARE_8125A_3},
> /* reserve 62 for CFG_METHOD_4 in the vendor driver */
> @@ -682,7 +683,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_52;
> + tp->mac_version <= RTL_GIGA_MAC_VER_53;
> }
>
> static bool rtl_supports_eee(struct rtl8169_private *tp)
> @@ -1012,7 +1013,9 @@ static u16 rtl_ephy_read(struct rtl8169_private *tp,
> int reg_addr)
> static void r8168fp_adjust_ocp_cmd(struct rtl8169_private *tp, u32 *cmd, int
> type)
> {
> /* based on RTL8168FP_OOBMAC_BASE in vendor driver */
> - if (tp->mac_version == RTL_GIGA_MAC_VER_52 && type == ERIAR_OOB)
> + if (type == ERIAR_OOB &&
> + (tp->mac_version == RTL_GIGA_MAC_VER_52 ||
> + tp->mac_version == RTL_GIGA_MAC_VER_53))
> *cmd |= 0x7f0 << 18;
> }
>
> @@ -1164,7 +1167,7 @@ static void rtl8168_driver_start(struct rtl8169_private
> *tp)
> case RTL_GIGA_MAC_VER_31:
> rtl8168dp_driver_start(tp);
> break;
> - case RTL_GIGA_MAC_VER_49 ... RTL_GIGA_MAC_VER_52:
> + case RTL_GIGA_MAC_VER_49 ... RTL_GIGA_MAC_VER_53:
> rtl8168ep_driver_start(tp);
> break;
> default:
> @@ -1195,7 +1198,7 @@ static void rtl8168_driver_stop(struct rtl8169_private
> *tp)
> case RTL_GIGA_MAC_VER_31:
> rtl8168dp_driver_stop(tp);
> break;
> - case RTL_GIGA_MAC_VER_49 ... RTL_GIGA_MAC_VER_52:
> + case RTL_GIGA_MAC_VER_49 ... RTL_GIGA_MAC_VER_53:
> rtl8168ep_driver_stop(tp);
> break;
> default:
> @@ -1223,7 +1226,7 @@ static bool r8168_check_dash(struct rtl8169_private *tp)
> case RTL_GIGA_MAC_VER_28:
> case RTL_GIGA_MAC_VER_31:
> return r8168dp_check_dash(tp);
> - case RTL_GIGA_MAC_VER_49 ... RTL_GIGA_MAC_VER_52:
> + case RTL_GIGA_MAC_VER_49 ... RTL_GIGA_MAC_VER_53:
> return r8168ep_check_dash(tp);
> default:
> return false;
> @@ -1930,6 +1933,7 @@ static enum mac_version rtl8169_get_mac_version(u16
> xid, bool gmii)
> { 0x7c8, 0x608, RTL_GIGA_MAC_VER_61 },
>
> /* RTL8117 */
> + { 0x7cf, 0x54b, RTL_GIGA_MAC_VER_53 },
> { 0x7cf, 0x54a, RTL_GIGA_MAC_VER_52 },
>
> /* 8168EP family. */
> @@ -2274,7 +2278,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_52:
> + case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_53:
> RTL_W32(tp, RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST
> | RX_EARLY_OFF);
> break;
> case RTL_GIGA_MAC_VER_60 ... RTL_GIGA_MAC_VER_63:
> @@ -2449,7 +2453,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_52:
> + case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_53:
> rtl_loop_wait_high(tp, &rtl_txcfg_empty_cond, 100, 42);
> rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond, 100, 42);
> break;
> @@ -3708,6 +3712,7 @@ static void rtl_hw_config(struct rtl8169_private *tp)
> [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,
> [RTL_GIGA_MAC_VER_60] = rtl_hw_start_8125a_1,
> [RTL_GIGA_MAC_VER_61] = rtl_hw_start_8125a_2,
> [RTL_GIGA_MAC_VER_63] = rtl_hw_start_8125b,
> @@ -5101,7 +5106,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_49 ... RTL_GIGA_MAC_VER_52:
> + case RTL_GIGA_MAC_VER_49 ... RTL_GIGA_MAC_VER_53:
> rtl8168ep_stop_cmac(tp);
> fallthrough;
> case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_48:
>
I think you have to add the following in r8169_phy_config.c
[RTL_GIGA_MAC_VER_53] = rtl8117_hw_phy_config,
Or doesn't VER_53 need this?
