Re: [PATCH v3 2/4] wifi: ath12k: add BIOS SAR capability for WCN7850

[Jeff Johnson <quic_jjohnson@xxxxxxxxxxx>]

On 9/7/2023 3:17 AM, Lingbo Kong wrote:
> ath12k get the latest BIOS SAR power table by using ACPI _DSM method, then
> pass this table to the firmware.ath12k register a notification callback for

since you need to respin for the guid_is_null() issue can you fix the 
nit: add space after hard stop (.)

And as a more generic comment on commit text, ideally you should be 
using imperative voice:

<https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#commit_messages>


> ACPI event so ACPI can notify ath12k to get the latest BIOS SAR table.
>
> Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4
>
> Signed-off-by: Lingbo Kong <quic_lingbok@xxxxxxxxxxx>
> ---
> v3:
> 1.adjust the order of the macros
> 2.apply jeff's advice
> 3.remove unnecessary cpu_to_le32()
>
> v2:
> no change
>
>   drivers/net/wireless/ath/ath12k/acpi.c | 103 +++++++++++++++++++++++++
>   drivers/net/wireless/ath/ath12k/acpi.h |  18 +++++
>   drivers/net/wireless/ath/ath12k/core.h |   3 +
>   drivers/net/wireless/ath/ath12k/wmi.c  |  92 ++++++++++++++++++++++
>   drivers/net/wireless/ath/ath12k/wmi.h  |  21 +++++
>   5 files changed, 237 insertions(+)
>
> diff --git a/drivers/net/wireless/ath/ath12k/acpi.c b/drivers/net/wireless/ath/ath12k/acpi.c
> index 384e01748b32..ae1ce7b99d2d 100644
> --- a/drivers/net/wireless/ath/ath12k/acpi.c
> +++ b/drivers/net/wireless/ath/ath12k/acpi.c
> @@ -52,6 +52,26 @@ static int ath12k_acpi_dsm_get_data(struct ath12k_base *ab, int func)
>   			memcpy(&ab->acdata->tas_sar_power_table, obj->buffer.pointer,
>   			       obj->buffer.length);
>   			break;
> +		case ATH12K_ACPI_DSM_FUNC_INDEX_BIOS_SAR:
> +			if (obj->buffer.length != ATH12K_ACPI_DSM_BIOS_SAR_DATA_SIZE) {
> +				ath12k_err(ab, "Invalid BIOS SAR data size %d\n",
> +					   obj->buffer.length);
> +				ret = -EINVAL;
> +				goto out;
> +			}
> +			memcpy(&ab->acdata->bios_sar_data, obj->buffer.pointer,
> +			       obj->buffer.length);
> +			break;
> +		case ATH12K_ACPI_DSM_FUNC_INDEX_GEO_OFFSET:
> +			if (obj->buffer.length != ATH12K_ACPI_DSM_GEO_OFFSET_DATA_SIZE) {
> +				ath12k_err(ab, "Invalid GEO OFFSET data size %d\n",
> +					   obj->buffer.length);
> +				ret = -EINVAL;
> +				goto out;
> +			}
> +			memcpy(&ab->acdata->geo_offset_data, obj->buffer.pointer,
> +			       obj->buffer.length);
> +			break;
>   		}
>   	} else {
>   		ath12k_err(ab,
> @@ -83,6 +103,24 @@ static int ath12k_set_tas_power_limit_data(struct ath12k_base *ab)
>   	return ret;
>   }
>   
> +static int ath12k_set_bios_sar_power_limit_data(struct ath12k_base *ab)
> +{
> +	int ret;
> +
> +	if (ab->acdata->bios_sar_data[0] == ATH12K_ACPI_POWER_LIMIT_VERSION &&
> +	    ab->acdata->bios_sar_data[1] == ATH12K_ACPI_POWER_LIMIT_ENABLE_FLAG) {
> +		ret = ath12k_wmi_pdev_set_bios_sar_table_param(ab,
> +							       ab->acdata->bios_sar_data);
> +		if (ret)
> +			ath12k_err(ab, "failed to pass bios sar table %d\n", ret);
> +	} else {
> +		ath12k_err(ab, "the latest bios sar data is invalid\n");
> +		ret = -EINVAL;
> +	}
> +
> +	return ret;
> +}
> +
>   void acpi_dsm_notify(acpi_handle handle, u32 event, void *data)
>   {
>   	int ret;
> @@ -101,6 +139,20 @@ void acpi_dsm_notify(acpi_handle handle, u32 event, void *data)
>   			if (ret)
>   				return;
>   		}
> +
> +		if (ab->acdata->acpi_bios_sar_enable) {
> +			ret = ath12k_acpi_dsm_get_data(ab,
> +						       ATH12K_ACPI_DSM_FUNC_INDEX_BIOS_SAR);
> +			if (ret) {
> +				ath12k_err(ab, "failed to update bios sar %d\n", ret);
> +				return;
> +			}
> +
> +			ret = ath12k_set_bios_sar_power_limit_data(ab);
> +			if (ret)
> +				return;
> +		}
> +
>   	} else {
>   		ath12k_err(ab, "unknown acpi notify %u\n", event);
>   	}
> @@ -113,6 +165,27 @@ void ath12k_acpi_remove_notify(struct ath12k_base *ab)
>   				   acpi_dsm_notify);
>   }
>   
> +static int ath12k_pass_acpi_bios_sar_and_geo_to_fw(struct ath12k_base *ab)
> +{
> +	int ret;
> +
> +	ret = ath12k_wmi_pdev_set_bios_sar_table_param(ab,
> +						       ab->acdata->bios_sar_data);
> +
> +	if (ret) {
> +		ath12k_err(ab, "failed to pass bios sar table to fw %d\n", ret);
> +		return ret;
> +	}
> +
> +	ret = ath12k_wmi_pdev_set_bios_geo_table_param(ab,
> +						       ab->acdata->geo_offset_data);
> +
> +	if (ret)
> +		ath12k_err(ab, "failed to pass bios geo table to fw %d\n", ret);
> +
> +	return ret;
> +}
> +
>   static int ath12k_pass_acpi_cfg_and_data_to_fw(struct ath12k_base *ab)
>   {
>   	int ret;
> @@ -172,12 +245,42 @@ int ath12k_get_acpi_all_data(struct ath12k_base *ab)
>   			ab->acdata->acpi_tas_enable = true;
>   	}
>   
> +	if (ATH12K_ACPI_FUNC_BIT_VALID(ab->acdata, ATH12K_ACPI_FUNC_BIT_BIOS_SAR)) {
> +		ret = ath12k_acpi_dsm_get_data(ab,
> +					       ATH12K_ACPI_DSM_FUNC_INDEX_BIOS_SAR);
> +		if (ret) {
> +			ath12k_err(ab, "failed to get bios sar data %d\n", ret);
> +			goto err_free_acdata;
> +		}
> +	}
> +
> +	if (ATH12K_ACPI_FUNC_BIT_VALID(ab->acdata, ATH12K_ACPI_FUNC_BIT_GEO_OFFSET)) {
> +		ret = ath12k_acpi_dsm_get_data(ab,
> +					       ATH12K_ACPI_DSM_FUNC_INDEX_GEO_OFFSET);
> +		if (ret) {
> +			ath12k_err(ab, "failed to get geo offset data %d\n", ret);
> +			goto err_free_acdata;
> +		}
> +
> +		if (ATH12K_ACPI_FUNC_BIT_VALID(ab->acdata, ATH12K_ACPI_FUNC_BIT_BIOS_SAR) &&
> +		    ab->acdata->bios_sar_data[0] == ATH12K_ACPI_POWER_LIMIT_VERSION &&
> +		    ab->acdata->bios_sar_data[1] == ATH12K_ACPI_POWER_LIMIT_ENABLE_FLAG &&
> +		    !ab->acdata->acpi_tas_enable)
> +			ab->acdata->acpi_bios_sar_enable = true;
> +	}
> +
>   	if (ab->acdata->acpi_tas_enable) {
>   		ret = ath12k_pass_acpi_cfg_and_data_to_fw(ab);
>   		if (ret)
>   			goto err_free_acdata;
>   	}
>   
> +	if (ab->acdata->acpi_bios_sar_enable) {
> +		ret = ath12k_pass_acpi_bios_sar_and_geo_to_fw(ab);
> +		if (ret)
> +			goto err_free_acdata;
> +	}
> +
>   	status = acpi_install_notify_handler(ACPI_HANDLE(ab->dev),
>   					     ACPI_DEVICE_NOTIFY,
>   					     acpi_dsm_notify, ab);
> diff --git a/drivers/net/wireless/ath/ath12k/acpi.h b/drivers/net/wireless/ath/ath12k/acpi.h
> index 2331b8e3e035..2f930f0718da 100644
> --- a/drivers/net/wireless/ath/ath12k/acpi.h
> +++ b/drivers/net/wireless/ath/ath12k/acpi.h
> @@ -9,9 +9,13 @@
>   #include <linux/acpi.h>
>   
>   #define ATH12K_ACPI_DSM_FUNC_INDEX_SUPPORT_FUNCS	0
> +#define ATH12K_ACPI_DSM_FUNC_INDEX_BIOS_SAR             4
> +#define ATH12K_ACPI_DSM_FUNC_INDEX_GEO_OFFSET           5
>   #define ATH12K_ACPI_DSM_FUNC_INDEX_TAS_CFG		8
>   #define ATH12K_ACPI_DSM_FUNC_INDEX_TAS_DATA		9
>   
> +#define ATH12K_ACPI_FUNC_BIT_BIOS_SAR			BIT(3)
> +#define ATH12K_ACPI_FUNC_BIT_GEO_OFFSET			BIT(4)
>   #define ATH12K_ACPI_FUNC_BIT_TAS_CFG			BIT(7)
>   #define ATH12K_ACPI_FUNC_BIT_TAS_DATA			BIT(8)
>   
> @@ -20,10 +24,24 @@
>   
>   #define ATH12K_ACPI_TAS_DATA_VERSION		0x1
>   #define ATH12K_ACPI_TAS_DATA_ENABLE_FLAG	0x1
> +#define ATH12K_ACPI_POWER_LIMIT_VERSION		0x1
> +#define ATH12K_ACPI_POWER_LIMIT_ENABLE_FLAG	0x1
> +
> +#define ATH12K_ACPI_GEO_OFFSET_DATA_OFFSET	1
> +#define ATH12K_ACPI_DBS_BACKOFF_DATA_OFFSET	2
> +#define ATH12K_ACPI_BIOS_SAR_DBS_BACKOFF_LEN	10
> +#define ATH12K_ACPI_POWER_LIMIT_DATA_OFFSET	12
> +#define ATH12K_ACPI_BIOS_SAR_GEO_OFFSET_LEN	18
> +#define ATH12K_ACPI_BIOS_SAR_TABLE_LEN		22
>   
>   #define ATH12K_ACPI_DSM_TAS_DATA_SIZE			69
>   #define ATH12K_ACPI_DSM_TAS_CFG_SIZE			108
>   
> +#define ATH12K_ACPI_DSM_GEO_OFFSET_DATA_SIZE (ATH12K_ACPI_GEO_OFFSET_DATA_OFFSET + \
> +					      ATH12K_ACPI_BIOS_SAR_GEO_OFFSET_LEN)
> +#define ATH12K_ACPI_DSM_BIOS_SAR_DATA_SIZE (ATH12K_ACPI_POWER_LIMIT_DATA_OFFSET + \
> +					    ATH12K_ACPI_BIOS_SAR_TABLE_LEN)
> +
>   int ath12k_get_acpi_all_data(struct ath12k_base *ab);
>   void acpi_dsm_notify(acpi_handle handle, u32 event, void *data);
>   #endif
> diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
> index cba4f176c018..6fe4f0ddee4a 100644
> --- a/drivers/net/wireless/ath/ath12k/core.h
> +++ b/drivers/net/wireless/ath/ath12k/core.h
> @@ -775,8 +775,11 @@ struct ath12k_base {
>   	struct {
>   		u32 func_bit;
>   		bool acpi_tas_enable;
> +		bool acpi_bios_sar_enable;
>   		u8 tas_cfg[ATH12K_ACPI_DSM_TAS_CFG_SIZE];
>   		u8 tas_sar_power_table[ATH12K_ACPI_DSM_TAS_DATA_SIZE];
> +		u8 bios_sar_data[ATH12K_ACPI_DSM_BIOS_SAR_DATA_SIZE];
> +		u8 geo_offset_data[ATH12K_ACPI_DSM_GEO_OFFSET_DATA_SIZE];
>   	} *acdata;
>   
>   	/* must be last */
> diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c
> index f49f4325edff..9ad588897b09 100644
> --- a/drivers/net/wireless/ath/ath12k/wmi.c
> +++ b/drivers/net/wireless/ath/ath12k/wmi.c
> @@ -6998,3 +6998,95 @@ int ath12k_wmi_pdev_set_tas_data_table_param(struct ath12k_base *ab,
>   
>   	return ret;
>   }
> +
> +int ath12k_wmi_pdev_set_bios_sar_table_param(struct ath12k_base *ab,
> +					     u8 *psar_table)
> +{
> +	struct ath12k_wmi_base *wmi_ab = &ab->wmi_ab;
> +	struct wmi_pdev_set_bios_sar_table_cmd *cmd;
> +	struct wmi_tlv *tlv;
> +	struct sk_buff *skb;
> +	int ret;
> +	u8 *buf_ptr;
> +	u32 len, sar_table_len_aligned, sar_dbs_backoff_len_aligned;
> +	u8 *psar_value = psar_table + ATH12K_ACPI_POWER_LIMIT_DATA_OFFSET;
> +	u8 *pdbs_value = psar_table + ATH12K_ACPI_DBS_BACKOFF_DATA_OFFSET;
> +
> +	sar_table_len_aligned = roundup(ATH12K_ACPI_BIOS_SAR_TABLE_LEN, sizeof(u32));
> +	sar_dbs_backoff_len_aligned = roundup(ATH12K_ACPI_BIOS_SAR_DBS_BACKOFF_LEN, sizeof(u32));
> +	len = sizeof(*cmd) + TLV_HDR_SIZE + sar_table_len_aligned +
> +		TLV_HDR_SIZE + sar_dbs_backoff_len_aligned;
> +
> +	skb = ath12k_wmi_alloc_skb(wmi_ab, len);
> +	if (!skb)
> +		return -ENOMEM;
> +
> +	cmd = (struct wmi_pdev_set_bios_sar_table_cmd *)skb->data;
> +	cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_SET_BIOS_SAR_TABLE_CMD_PARAMS,
> +						 sizeof(*cmd));
> +	cmd->pdev_id = cpu_to_le32(WMI_PDEV_ID_SOC);
> +	cmd->sar_len = cpu_to_le32(ATH12K_ACPI_BIOS_SAR_TABLE_LEN);
> +	cmd->dbs_backoff_len = cpu_to_le32(ATH12K_ACPI_BIOS_SAR_DBS_BACKOFF_LEN);
> +
> +	buf_ptr = skb->data + sizeof(*cmd);
> +	tlv = (struct wmi_tlv *)buf_ptr;
> +	tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE,
> +					 sar_table_len_aligned);
> +	buf_ptr += TLV_HDR_SIZE;
> +	memcpy(buf_ptr, psar_value, ATH12K_ACPI_BIOS_SAR_TABLE_LEN);
> +
> +	buf_ptr += sar_table_len_aligned;
> +	tlv = (struct wmi_tlv *)buf_ptr;
> +	tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE,
> +					 sar_dbs_backoff_len_aligned);
> +	buf_ptr += TLV_HDR_SIZE;
> +	memcpy(buf_ptr, pdbs_value, ATH12K_ACPI_BIOS_SAR_DBS_BACKOFF_LEN);
> +
> +	ret = ath12k_wmi_cmd_send(&wmi_ab->wmi[0], skb, WMI_PDEV_SET_BIOS_SAR_TABLE_CMDID);
> +	if (ret) {
> +		ath12k_warn(ab, "failed to send WMI_PDEV_SET_BIOS_INTERFACE_CMDID %d\n", ret);
> +		dev_kfree_skb(skb);
> +	}
> +
> +	return ret;
> +}
> +
> +int ath12k_wmi_pdev_set_bios_geo_table_param(struct ath12k_base *ab,
> +					     u8 *pgeo_table)
> +{
> +	struct ath12k_wmi_base *wmi_ab = &ab->wmi_ab;
> +	struct wmi_pdev_set_bios_geo_table_cmd *cmd;
> +	struct wmi_tlv *tlv;
> +	struct sk_buff *skb;
> +	int ret;
> +	u8 *buf_ptr;
> +	u32 len, sar_geo_len_aligned;
> +	u8 *pgeo_value = pgeo_table + ATH12K_ACPI_GEO_OFFSET_DATA_OFFSET;
> +
> +	sar_geo_len_aligned = roundup(ATH12K_ACPI_BIOS_SAR_GEO_OFFSET_LEN, sizeof(u32));
> +	len = sizeof(*cmd) + TLV_HDR_SIZE + sar_geo_len_aligned;
> +
> +	skb = ath12k_wmi_alloc_skb(wmi_ab, len);
> +	if (!skb)
> +		return -ENOMEM;
> +
> +	cmd = (struct wmi_pdev_set_bios_geo_table_cmd *)skb->data;
> +	cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_SET_BIOS_GEO_TABLE_CMD_PARAMS,
> +						 sizeof(*cmd));
> +	cmd->pdev_id = cpu_to_le32(WMI_PDEV_ID_SOC);
> +	cmd->geo_len = cpu_to_le32(ATH12K_ACPI_BIOS_SAR_GEO_OFFSET_LEN);
> +
> +	buf_ptr = skb->data + sizeof(*cmd);
> +	tlv = (struct wmi_tlv *)buf_ptr;
> +	tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, sar_geo_len_aligned);
> +	buf_ptr += TLV_HDR_SIZE;
> +	memcpy(buf_ptr, pgeo_value, ATH12K_ACPI_BIOS_SAR_GEO_OFFSET_LEN);
> +
> +	ret = ath12k_wmi_cmd_send(&wmi_ab->wmi[0], skb, WMI_PDEV_SET_BIOS_GEO_TABLE_CMDID);
> +	if (ret) {
> +		ath12k_warn(ab, "failed to send WMI_PDEV_SET_BIOS_GEO_TABLE_CMDID %d\n", ret);
> +		dev_kfree_skb(skb);
> +	}
> +
> +	return ret;
> +}
> diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h
> index 38bbf59fc6b7..8a774655fe9f 100644
> --- a/drivers/net/wireless/ath/ath12k/wmi.h
> +++ b/drivers/net/wireless/ath/ath12k/wmi.h
> @@ -361,6 +361,8 @@ enum wmi_tlv_cmd_id {
>   	WMI_PDEV_DMA_RING_CFG_REQ_CMDID,
>   	WMI_PDEV_HE_TB_ACTION_FRM_CMDID,
>   	WMI_PDEV_PKTLOG_FILTER_CMDID,
> +	WMI_PDEV_SET_BIOS_SAR_TABLE_CMDID = 0x4044,
> +	WMI_PDEV_SET_BIOS_GEO_TABLE_CMDID = 0x4045,
>   	WMI_PDEV_SET_BIOS_INTERFACE_CMDID = 0x404A,
>   	WMI_VDEV_CREATE_CMDID = WMI_TLV_CMD(WMI_GRP_VDEV),
>   	WMI_VDEV_DELETE_CMDID,
> @@ -1932,6 +1934,8 @@ enum wmi_tlv_tag {
>   	WMI_TAG_REGULATORY_RULE_EXT_STRUCT = 0x3A9,
>   	WMI_TAG_REG_CHAN_LIST_CC_EXT_EVENT,
>   	WMI_TAG_EHT_RATE_SET = 0x3C4,
> +	WMI_TAG_PDEV_SET_BIOS_SAR_TABLE_CMD_PARAMS = 0x3D8,
> +	WMI_TAG_PDEV_SET_BIOS_GEO_TABLE_CMD_PARAMS = 0x3D9,
>   	WMI_TAG_PDEV_SET_BIOS_INTERFACE_CMD_PARAMS = 0x3FB,
>   	WMI_TAG_MAX
>   };
> @@ -4806,6 +4810,19 @@ enum bios_param_type {
>   	WMI_BIOS_PARAM_TYPE_MAX,
>   };
>   
> +struct wmi_pdev_set_bios_sar_table_cmd {
> +	__le32 tlv_header;
> +	__le32 pdev_id;
> +	__le32 sar_len;
> +	__le32 dbs_backoff_len;
> +} __packed;
> +
> +struct wmi_pdev_set_bios_geo_table_cmd {
> +	__le32 tlv_header;
> +	__le32 pdev_id;
> +	__le32 geo_len;
> +} __packed;
> +
>   #define ATH12K_FW_STATS_BUF_SIZE (1024 * 1024)
>   
>   void ath12k_wmi_init_qcn9274(struct ath12k_base *ab,
> @@ -4931,4 +4948,8 @@ int ath12k_wmi_pdev_set_tas_cfg_table_param(struct ath12k_base *ab,
>   					    const u8 *ptas_cfg);
>   int ath12k_wmi_pdev_set_tas_data_table_param(struct ath12k_base *ab,
>   					     const u8 *ptas_data);
> +int ath12k_wmi_pdev_set_bios_sar_table_param(struct ath12k_base *ab,
> +					     u8 *psar_table);
> +int ath12k_wmi_pdev_set_bios_geo_table_param(struct ath12k_base *ab,
> +					     u8 *pgeo_table);
>   #endif