RE: [PATCH v2 5/5] wifi: rtw88: rtw8822c: Implement RTL8822CS (SDIO) efuse parsing

[Ping-Ke Shih <pkshih@realtek.com>]

> -----Original Message-----
> From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> Sent: Saturday, February 18, 2023 11:30 PM
> To: linux-wireless@vger.kernel.org
> Cc: tony0620emma@gmail.com; kvalo@kernel.org; netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Neo
> Jou <neojou@gmail.com>; Jernej Skrabec <jernej.skrabec@gmail.com>; Ping-Ke Shih <pkshih@realtek.com>;
> Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> Subject: [PATCH v2 5/5] wifi: rtw88: rtw8822c: Implement RTL8822CS (SDIO) efuse parsing
> 
> The efuse of the SDIO RTL8822CS chip has only one known member: the mac
> address is at offset 0x16a. Add a struct rtw8822cs_efuse describing this
> and use it for copying the mac address when the SDIO bus is used.
> 
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>

> ---
> - add the new function/union member/case statement last (after USB)
> - while here, also sort the union members to be consistent with
>   the switch case (PCIe first, USB second, SDIO last)
> 
> 
>  drivers/net/wireless/realtek/rtw88/rtw8822c.c | 9 +++++++++
>  drivers/net/wireless/realtek/rtw88/rtw8822c.h | 8 +++++++-
>  2 files changed, 16 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
> b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
> index 964e27887fe2..5a2c004b12df 100644
> --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
> +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
> @@ -35,6 +35,12 @@ static void rtw8822cu_efuse_parsing(struct rtw_efuse *efuse,
>         ether_addr_copy(efuse->addr, map->u.mac_addr);
>  }
> 
> +static void rtw8822cs_efuse_parsing(struct rtw_efuse *efuse,
> +                                   struct rtw8822c_efuse *map)
> +{
> +       ether_addr_copy(efuse->addr, map->s.mac_addr);
> +}
> +
>  static int rtw8822c_read_efuse(struct rtw_dev *rtwdev, u8 *log_map)
>  {
>         struct rtw_efuse *efuse = &rtwdev->efuse;
> @@ -67,6 +73,9 @@ static int rtw8822c_read_efuse(struct rtw_dev *rtwdev, u8 *log_map)
>         case RTW_HCI_TYPE_USB:
>                 rtw8822cu_efuse_parsing(efuse, map);
>                 break;
> +       case RTW_HCI_TYPE_SDIO:
> +               rtw8822cs_efuse_parsing(efuse, map);
> +               break;
>         default:
>                 /* unsupported now */
>                 return -ENOTSUPP;
> diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.h
> b/drivers/net/wireless/realtek/rtw88/rtw8822c.h
> index 479d5d769c52..1bc0e7f5d6bb 100644
> --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.h
> +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.h
> @@ -16,6 +16,11 @@ struct rtw8822cu_efuse {
>         u8 res2[0x3d];
>  };
> 
> +struct rtw8822cs_efuse {
> +       u8 res0[0x4a];                  /* 0x120 */
> +       u8 mac_addr[ETH_ALEN];          /* 0x16a */
> +} __packed;
> +
>  struct rtw8822ce_efuse {
>         u8 mac_addr[ETH_ALEN];          /* 0x120 */
>         u8 vender_id[2];
> @@ -91,8 +96,9 @@ struct rtw8822c_efuse {
>         u8 res9;
>         u8 res10[0x42];
>         union {
> -               struct rtw8822cu_efuse u;
>                 struct rtw8822ce_efuse e;
> +               struct rtw8822cu_efuse u;
> +               struct rtw8822cs_efuse s;
>         };
>  };
> 
> --
> 2.39.2