Re: [PATCH net-next] r8169: add support for RTL8125D rev.b

[Heiner Kallweit <hkallweit1@gmail.com>]

On 11.12.2024 07:29, ChunHao Lin wrote:
> Add support for RTL8125D rev.b. Its XID is 0x689. It is basically
> based on the one with XID 0x688, but with different firmware file.
> 
> Signed-off-by: ChunHao Lin <hau@realtek.com>
> ---
>  drivers/net/ethernet/realtek/r8169.h          |  1 +
>  drivers/net/ethernet/realtek/r8169_main.c     | 32 +++++++++++--------
>  .../net/ethernet/realtek/r8169_phy_config.c   |  1 +
>  3 files changed, 21 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/net/ethernet/realtek/r8169.h b/drivers/net/ethernet/realtek/r8169.h
> index 8904aae41aca..5b87c89363b3 100644
> --- a/drivers/net/ethernet/realtek/r8169.h
> +++ b/drivers/net/ethernet/realtek/r8169.h
> @@ -71,6 +71,7 @@ enum mac_version {
>  	RTL_GIGA_MAC_VER_64,
>  	RTL_GIGA_MAC_VER_65,
>  	RTL_GIGA_MAC_VER_66,
> +	RTL_GIGA_MAC_VER_67,
>  	RTL_GIGA_MAC_NONE
>  };
>  
> diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
> index 6934bdee2a91..c97cfbf876af 100644
> --- a/drivers/net/ethernet/realtek/r8169_main.c
> +++ b/drivers/net/ethernet/realtek/r8169_main.c
> @@ -57,6 +57,7 @@
>  #define FIRMWARE_8125A_3	"rtl_nic/rtl8125a-3.fw"
>  #define FIRMWARE_8125B_2	"rtl_nic/rtl8125b-2.fw"
>  #define FIRMWARE_8125D_1	"rtl_nic/rtl8125d-1.fw"
> +#define FIRMWARE_8125D_2	"rtl_nic/rtl8125d-2.fw"
>  #define FIRMWARE_8126A_2	"rtl_nic/rtl8126a-2.fw"
>  #define FIRMWARE_8126A_3	"rtl_nic/rtl8126a-3.fw"
>  
> @@ -142,6 +143,7 @@ static const struct {
>  	[RTL_GIGA_MAC_VER_64] = {"RTL8125D",		FIRMWARE_8125D_1},
>  	[RTL_GIGA_MAC_VER_65] = {"RTL8126A",		FIRMWARE_8126A_2},
>  	[RTL_GIGA_MAC_VER_66] = {"RTL8126A",		FIRMWARE_8126A_3},
> +	[RTL_GIGA_MAC_VER_67] = {"RTL8125D",		FIRMWARE_8125D_2},
>  };
>  

Thanks for the patch, Hau. I think I will change the numbering of the RTL8125/8126
chip versions to be a little bit more consistent and leave room for further chip
versions. I will then submit the patch with the SoB from both of us.