Subject: RE: [RFC PATCH v1 06/19] rtw88: rtw8821c: Add support for parsing the RTL8821CS (SDIO) efuse

From: Ping-Ke Shih <[email-masked]>
Date: Wed, 28 Dec 2022 06:21:27 +0000

> -----Original Message-----
> From: Martin Blumenstingl <[email-masked]>
> Sent: Wednesday, December 28, 2022 7:30 AM
> To: [email-masked]
> Cc: Yan-Hsuan Chuang <[email-masked]>; Kalle Valo <[email-masked]>; Ulf Hansson
> <[email-masked]>; [email-masked]; [email-masked];
> [email-masked]; Chris Morgan <[email-masked]>; Nitin Gupta <[email-masked]>;
> Neo Jou <[email-masked]>; Ping-Ke Shih <[email-masked]>; Jernej Skrabec <[email-masked]>;
> Martin Blumenstingl <[email-masked]>
> Subject: [RFC PATCH v1 06/19] rtw88: rtw8821c: Add support for parsing the RTL8821CS (SDIO) efuse
> 
> The efuse of the SDIO RTL8821CS chip has only one known member: the mac
> address is at offset 0x11a. Add a struct rtw8821cs_efuse describing this
> and use it for copying the mac address when the SDIO bus is used.
> 
> Signed-off-by: Martin Blumenstingl <[email-masked]>
> ---
>  drivers/net/wireless/realtek/rtw88/rtw8821c.c | 9 +++++++++
>  drivers/net/wireless/realtek/rtw88/rtw8821c.h | 6 ++++++
>  2 files changed, 15 insertions(+)
> 
> diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
> b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
> index 17f800f6efbd..dd01b22f9770 100644
> --- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
> +++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
> @@ -26,6 +26,12 @@ static void rtw8821ce_efuse_parsing(struct rtw_efuse *efuse,
>  	ether_addr_copy(efuse->addr, map->e.mac_addr);
>  }
> 
> +static void rtw8821cs_efuse_parsing(struct rtw_efuse *efuse,
> +				    struct rtw8821c_efuse *map)
> +{
> +	ether_addr_copy(efuse->addr, map->s.mac_addr);
> +}
> +
>  static void rtw8821cu_efuse_parsing(struct rtw_efuse *efuse,
>  				    struct rtw8821c_efuse *map)
>  {
> @@ -74,6 +80,9 @@ static int rtw8821c_read_efuse(struct rtw_dev *rtwdev, u8 *log_map)
>  	case RTW_HCI_TYPE_PCIE:
>  		rtw8821ce_efuse_parsing(efuse, map);
>  		break;
> +	case RTW_HCI_TYPE_SDIO:
> +		rtw8821cs_efuse_parsing(efuse, map);
> +		break;
>  	case RTW_HCI_TYPE_USB:
>  		rtw8821cu_efuse_parsing(efuse, map);
>  		break;
> diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.h
> b/drivers/net/wireless/realtek/rtw88/rtw8821c.h
> index 1c81260f3a54..1deea54575b5 100644
> --- a/drivers/net/wireless/realtek/rtw88/rtw8821c.h
> +++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.h
> @@ -65,6 +65,11 @@ struct rtw8821ce_efuse {
>  	u8 res7;
>  };
> 
> +struct rtw8821cs_efuse {
> +	u8 res4[0x4a];			/* 0xd0 */
> +	u8 mac_addr[ETH_ALEN];		/* 0x11a */
> +};
> +

This struct should be __packed, as well as rtw8821c_efuse.

Would you mind to create additional patch to add __packed to these struct of
efuse layout?

>  struct rtw8821c_efuse {
>  	__le16 rtl_id;
>  	u8 res0[0x0e];
> @@ -93,6 +98,7 @@ struct rtw8821c_efuse {
>  	u8 res[3];
>  	union {
>  		struct rtw8821ce_efuse e;
> +		struct rtw8821cs_efuse s;
>  		struct rtw8821cu_efuse u;
>  	};
>  };
> --
> 2.39.0