Unverified Commit 88a5f8e6 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoc: qcom: audioreach: Use automatic cleanup of kfree() 



Its common pattern in q6dsp code to allocate temporary buffer
to send gpr/apr packets and free at the function exit.
Now this can be simplified via __free(kfree) mechanism.

No functional changes.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Link: https://patch.msgid.link/20251023102444.88158-12-srinivas.kandagatla@oss.qualcomm.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bcb3f6f5

sound/soc/qcom/qdsp6/audioreach.c

+66 −166
Original line number Diff line number Diff line
@@ -612,18 +612,12 @@ static int audioreach_display_port_set_media_format(struct q6apm_graph *graph, 
	struct apm_module_frame_size_factor_cfg *fs_cfg;

	struct apm_module_param_data *param_data;

	struct apm_module_hw_ep_mf_cfg *hw_cfg;

	int ic_sz, ep_sz, fs_sz;

	int rc, payload_size;

	struct gpr_pkt *pkt;

	int ic_sz = APM_DP_INTF_CFG_PSIZE;

	int ep_sz = APM_HW_EP_CFG_PSIZE;

	int fs_sz = APM_FS_CFG_PSIZE;

	int size = ic_sz + ep_sz + fs_sz;

	void *p;



	ic_sz = APM_DP_INTF_CFG_PSIZE;

	ep_sz = APM_HW_EP_CFG_PSIZE;

	fs_sz = APM_FS_CFG_PSIZE;



	payload_size = ic_sz + ep_sz + fs_sz;



	pkt = audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0);

	struct gpr_pkt *pkt __free(kfree) = audioreach_alloc_apm_cmd_pkt(size, APM_CMD_SET_CFG, 0);

	if (IS_ERR(pkt))

		return PTR_ERR(pkt);
@@ -662,11 +656,7 @@ static int audioreach_display_port_set_media_format(struct q6apm_graph *graph, 
	intf_cfg->cfg.mst_idx = 0;

	intf_cfg->cfg.dptx_idx = cfg->dp_idx;



	rc = q6apm_send_cmd_sync(graph->apm, pkt, 0);



	kfree(pkt);



	return rc;

	return q6apm_send_cmd_sync(graph->apm, pkt, 0);

}



/* LPASS Codec DMA port Module Media Format Setup */
@@ -679,19 +669,13 @@ static int audioreach_codec_dma_set_media_format(struct q6apm_graph *graph, 
	struct apm_module_hw_ep_power_mode_cfg *pm_cfg;

	struct apm_module_param_data *param_data;

	struct apm_module_hw_ep_mf_cfg *hw_cfg;

	int ic_sz, ep_sz, fs_sz, pm_sz;

	int rc, payload_size;

	struct gpr_pkt *pkt;

	int ic_sz = APM_CDMA_INTF_CFG_PSIZE;

	int ep_sz = APM_HW_EP_CFG_PSIZE;

	int fs_sz = APM_FS_CFG_PSIZE;

	int pm_sz = APM_HW_EP_PMODE_CFG_PSIZE;

	int size = ic_sz + ep_sz + fs_sz + pm_sz;

	void *p;



	ic_sz = APM_CDMA_INTF_CFG_PSIZE;

	ep_sz = APM_HW_EP_CFG_PSIZE;

	fs_sz = APM_FS_CFG_PSIZE;

	pm_sz = APM_HW_EP_PMODE_CFG_PSIZE;



	payload_size = ic_sz + ep_sz + fs_sz + pm_sz;



	pkt = audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0);

	struct gpr_pkt *pkt __free(kfree) = audioreach_alloc_apm_cmd_pkt(size, APM_CMD_SET_CFG, 0);

	if (IS_ERR(pkt))

		return PTR_ERR(pkt);
@@ -739,24 +723,17 @@ static int audioreach_codec_dma_set_media_format(struct q6apm_graph *graph, 
	param_data->param_size = pm_sz - APM_MODULE_PARAM_DATA_SIZE;

	pm_cfg->power_mode.power_mode = 0;



	rc = q6apm_send_cmd_sync(graph->apm, pkt, 0);



	kfree(pkt);



	return rc;

	return q6apm_send_cmd_sync(graph->apm, pkt, 0);

}



int audioreach_send_u32_param(struct q6apm_graph *graph, struct audioreach_module *module,

			      uint32_t param_id, uint32_t param_val)

{

	struct apm_module_param_data *param_data;

	struct gpr_pkt *pkt;

	struct gpr_pkt *pkt __free(kfree) = NULL;

	uint32_t *param;

	int rc, payload_size;

	void *p;



	payload_size = sizeof(uint32_t) + APM_MODULE_PARAM_DATA_SIZE;

	p = audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0);

	int payload_size = sizeof(uint32_t) + APM_MODULE_PARAM_DATA_SIZE;

	void *p = audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0);

	if (IS_ERR(p))

		return -ENOMEM;
@@ -773,11 +750,7 @@ int audioreach_send_u32_param(struct q6apm_graph *graph, struct audioreach_modul 
	param = p;

	*param = param_val;



	rc = q6apm_send_cmd_sync(graph->apm, pkt, 0);



	kfree(pkt);



	return rc;

	return q6apm_send_cmd_sync(graph->apm, pkt, 0);

}

EXPORT_SYMBOL_GPL(audioreach_send_u32_param);
@@ -813,24 +786,17 @@ static int audioreach_set_module_config(struct q6apm_graph *graph, 
					struct audioreach_module *module,

					struct audioreach_module_config *cfg)

{

	int payload_size = le32_to_cpu(module->data->size);

	struct gpr_pkt *pkt;

	int rc;

	int size = le32_to_cpu(module->data->size);

	void *p;



	pkt = audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0);

	struct gpr_pkt *pkt __free(kfree) = audioreach_alloc_apm_cmd_pkt(size, APM_CMD_SET_CFG, 0);

	if (IS_ERR(pkt))

		return PTR_ERR(pkt);



	p = (void *)pkt + GPR_HDR_SIZE + APM_CMD_HDR_SIZE;



	memcpy(p, module->data->data, payload_size);



	rc = q6apm_send_cmd_sync(graph->apm, pkt, 0);



	kfree(pkt);

	memcpy(p, module->data->data, size);



	return rc;

	return q6apm_send_cmd_sync(graph->apm, pkt, 0);

}



static int audioreach_mfc_set_media_format(struct q6apm_graph *graph,
@@ -840,15 +806,11 @@ static int audioreach_mfc_set_media_format(struct q6apm_graph *graph, 
	struct apm_module_param_data *param_data;

	struct param_id_mfc_media_format *media_format;

	uint32_t num_channels = cfg->num_channels;

	int payload_size;

	struct gpr_pkt *pkt;

	int rc, i;

	void *p;



	payload_size = APM_MFC_CFG_PSIZE(media_format, num_channels) +

	int payload_size = APM_MFC_CFG_PSIZE(media_format, num_channels) +

				APM_MODULE_PARAM_DATA_SIZE;



	pkt = audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0);

	int i;

	void *p;

	struct gpr_pkt *pkt __free(kfree) = audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0);

	if (IS_ERR(pkt))

		return PTR_ERR(pkt);
@@ -868,11 +830,7 @@ static int audioreach_mfc_set_media_format(struct q6apm_graph *graph, 
	for (i = 0; i < num_channels; i++)

		media_format->channel_mapping[i] = cfg->channel_map[i];



	rc = q6apm_send_cmd_sync(graph->apm, pkt, 0);



	kfree(pkt);



	return rc;

	return q6apm_send_cmd_sync(graph->apm, pkt, 0);

}



static int audioreach_set_compr_media_format(struct media_format *media_fmt_hdr,
@@ -960,31 +918,24 @@ static int audioreach_set_compr_media_format(struct media_format *media_fmt_hdr, 
int audioreach_compr_set_param(struct q6apm_graph *graph, struct audioreach_module_config *mcfg)

{

	struct media_format *header;

	struct gpr_pkt *pkt;

	int iid, payload_size, rc;

	int rc;

	void *p;



	payload_size = sizeof(struct apm_sh_module_media_fmt_cmd);



	iid = q6apm_graph_get_rx_shmem_module_iid(graph);

	pkt = audioreach_alloc_cmd_pkt(payload_size, DATA_CMD_WR_SH_MEM_EP_MEDIA_FORMAT,

	int iid = q6apm_graph_get_rx_shmem_module_iid(graph);

	int payload_size = sizeof(struct apm_sh_module_media_fmt_cmd);

	struct gpr_pkt *pkt __free(kfree) = audioreach_alloc_cmd_pkt(payload_size,

					DATA_CMD_WR_SH_MEM_EP_MEDIA_FORMAT,

					0, graph->port->id, iid);



	if (IS_ERR(pkt))

		return -ENOMEM;





	p = (void *)pkt + GPR_HDR_SIZE;

	header = p;

	rc = audioreach_set_compr_media_format(header, p, mcfg);

	if (rc) {

		kfree(pkt);

	if (rc)

		return rc;

	}



	rc = gpr_send_port_pkt(graph->port, pkt);

	kfree(pkt);



	return rc;

	return gpr_send_port_pkt(graph->port, pkt);

}

EXPORT_SYMBOL_GPL(audioreach_compr_set_param);
@@ -996,18 +947,12 @@ static int audioreach_i2s_set_media_format(struct q6apm_graph *graph, 
	struct apm_module_param_data *param_data;

	struct apm_i2s_module_intf_cfg *intf_cfg;

	struct apm_module_hw_ep_mf_cfg *hw_cfg;

	int ic_sz, ep_sz, fs_sz;

	int rc, payload_size;

	struct gpr_pkt *pkt;

	int ic_sz = APM_I2S_INTF_CFG_PSIZE;

	int ep_sz = APM_HW_EP_CFG_PSIZE;

	int fs_sz = APM_FS_CFG_PSIZE;

	int size = ic_sz + ep_sz + fs_sz;

	void *p;



	ic_sz = APM_I2S_INTF_CFG_PSIZE;

	ep_sz = APM_HW_EP_CFG_PSIZE;

	fs_sz = APM_FS_CFG_PSIZE;



	payload_size = ic_sz + ep_sz + fs_sz;



	pkt = audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0);

	struct gpr_pkt *pkt __free(kfree) = audioreach_alloc_apm_cmd_pkt(size, APM_CMD_SET_CFG, 0);

	if (IS_ERR(pkt))

		return PTR_ERR(pkt);
@@ -1058,11 +1003,7 @@ static int audioreach_i2s_set_media_format(struct q6apm_graph *graph, 
	param_data->param_size = fs_sz - APM_MODULE_PARAM_DATA_SIZE;

	fs_cfg->frame_size_factor = 1;



	rc = q6apm_send_cmd_sync(graph->apm, pkt, 0);



	kfree(pkt);



	return rc;

	return q6apm_send_cmd_sync(graph->apm, pkt, 0);

}



static int audioreach_logging_set_media_format(struct q6apm_graph *graph,
@@ -1070,12 +1011,9 @@ static int audioreach_logging_set_media_format(struct q6apm_graph *graph, 
{

	struct apm_module_param_data *param_data;

	struct data_logging_config *cfg;

	int rc, payload_size;

	struct gpr_pkt *pkt;

	int size = sizeof(*cfg) + APM_MODULE_PARAM_DATA_SIZE;

	void *p;



	payload_size = sizeof(*cfg) + APM_MODULE_PARAM_DATA_SIZE;

	pkt = audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0);

	struct gpr_pkt *pkt __free(kfree) = audioreach_alloc_apm_cmd_pkt(size, APM_CMD_SET_CFG, 0);

	if (IS_ERR(pkt))

		return PTR_ERR(pkt);
@@ -1085,7 +1023,7 @@ static int audioreach_logging_set_media_format(struct q6apm_graph *graph, 
	param_data->module_instance_id = module->instance_id;

	param_data->error_code = 0;

	param_data->param_id = PARAM_ID_DATA_LOGGING_CONFIG;

	param_data->param_size = payload_size - APM_MODULE_PARAM_DATA_SIZE;

	param_data->param_size = size - APM_MODULE_PARAM_DATA_SIZE;



	p = p + APM_MODULE_PARAM_DATA_SIZE;

	cfg = p;
@@ -1093,11 +1031,7 @@ static int audioreach_logging_set_media_format(struct q6apm_graph *graph, 
	cfg->log_tap_point_id = module->log_tap_point_id;

	cfg->mode = module->log_mode;



	rc = q6apm_send_cmd_sync(graph->apm, pkt, 0);



	kfree(pkt);



	return rc;

	return q6apm_send_cmd_sync(graph->apm, pkt, 0);

}



static int audioreach_pcm_set_media_format(struct q6apm_graph *graph,
@@ -1108,8 +1042,8 @@ static int audioreach_pcm_set_media_format(struct q6apm_graph *graph, 
	uint32_t num_channels = mcfg->num_channels;

	struct apm_pcm_module_media_fmt_cmd *cfg;

	struct apm_module_param_data *param_data;

	int rc, payload_size;

	struct gpr_pkt *pkt;

	int payload_size;

	struct gpr_pkt *pkt __free(kfree) = NULL;



	if (num_channels > 4) {

		dev_err(graph->dev, "Error: Invalid channels (%d)!\n", num_channels);
@@ -1144,11 +1078,7 @@ static int audioreach_pcm_set_media_format(struct q6apm_graph *graph, 
	media_cfg->bits_per_sample = mcfg->bit_width;

	memcpy(media_cfg->channel_mapping, mcfg->channel_map, mcfg->num_channels);



	rc = q6apm_send_cmd_sync(graph->apm, pkt, 0);



	kfree(pkt);



	return rc;

	return q6apm_send_cmd_sync(graph->apm, pkt, 0);

}



static int audioreach_shmem_set_media_format(struct q6apm_graph *graph,
@@ -1160,7 +1090,7 @@ static int audioreach_shmem_set_media_format(struct q6apm_graph *graph, 
	struct payload_media_fmt_pcm *cfg;

	struct media_format *header;

	int rc, payload_size;

	struct gpr_pkt *pkt;

	struct gpr_pkt *pkt __free(kfree) = NULL;

	void *p;



	if (num_channels > 4) {
@@ -1202,29 +1132,20 @@ static int audioreach_shmem_set_media_format(struct q6apm_graph *graph, 
		memcpy(cfg->channel_mapping, mcfg->channel_map, mcfg->num_channels);

	} else {

		rc = audioreach_set_compr_media_format(header, p, mcfg);

		if (rc) {

			kfree(pkt);

		if (rc)

			return rc;

	}

	}



	rc = audioreach_graph_send_cmd_sync(graph, pkt, 0);



	kfree(pkt);



	return rc;

	return audioreach_graph_send_cmd_sync(graph, pkt, 0);

}



int audioreach_gain_set_vol_ctrl(struct q6apm *apm, struct audioreach_module *module, int vol)

{

	struct param_id_vol_ctrl_master_gain *cfg;

	struct apm_module_param_data *param_data;

	int rc, payload_size;

	struct gpr_pkt *pkt;

	int size = sizeof(*cfg) + APM_MODULE_PARAM_DATA_SIZE;

	void *p;



	payload_size = sizeof(*cfg) + APM_MODULE_PARAM_DATA_SIZE;

	pkt = audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0);

	struct gpr_pkt *pkt __free(kfree) = audioreach_alloc_apm_cmd_pkt(size, APM_CMD_SET_CFG, 0);

	if (IS_ERR(pkt))

		return PTR_ERR(pkt);
@@ -1234,16 +1155,12 @@ int audioreach_gain_set_vol_ctrl(struct q6apm *apm, struct audioreach_module *mo 
	param_data->module_instance_id = module->instance_id;

	param_data->error_code = 0;

	param_data->param_id = PARAM_ID_VOL_CTRL_MASTER_GAIN;

	param_data->param_size = payload_size - APM_MODULE_PARAM_DATA_SIZE;

	param_data->param_size = size - APM_MODULE_PARAM_DATA_SIZE;



	p = p + APM_MODULE_PARAM_DATA_SIZE;

	cfg = p;

	cfg->master_gain =  vol;

	rc = q6apm_send_cmd_sync(apm, pkt, 0);



	kfree(pkt);



	return rc;

	return q6apm_send_cmd_sync(apm, pkt, 0);

}

EXPORT_SYMBOL_GPL(audioreach_gain_set_vol_ctrl);
@@ -1251,11 +1168,8 @@ static int audioreach_gain_set(struct q6apm_graph *graph, struct audioreach_modu 
{

	struct apm_module_param_data *param_data;

	struct apm_gain_module_cfg *cfg;

	int rc, payload_size;

	struct gpr_pkt *pkt;



	payload_size = APM_GAIN_CFG_PSIZE;

	pkt = audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0);

	int size = APM_GAIN_CFG_PSIZE;

	struct gpr_pkt *pkt __free(kfree) = audioreach_alloc_apm_cmd_pkt(size, APM_CMD_SET_CFG, 0);

	if (IS_ERR(pkt))

		return PTR_ERR(pkt);
@@ -1265,15 +1179,11 @@ static int audioreach_gain_set(struct q6apm_graph *graph, struct audioreach_modu 
	param_data->module_instance_id = module->instance_id;

	param_data->error_code = 0;

	param_data->param_id = APM_PARAM_ID_GAIN;

	param_data->param_size = payload_size - APM_MODULE_PARAM_DATA_SIZE;

	param_data->param_size = size - APM_MODULE_PARAM_DATA_SIZE;



	cfg->gain_cfg.gain = module->gain;



	rc = q6apm_send_cmd_sync(graph->apm, pkt, 0);



	kfree(pkt);



	return rc;

	return q6apm_send_cmd_sync(graph->apm, pkt, 0);

}



int audioreach_set_media_format(struct q6apm_graph *graph, struct audioreach_module *module,
@@ -1358,9 +1268,9 @@ int audioreach_map_memory_regions(struct q6apm_graph *graph, unsigned int dir, s 
	struct apm_cmd_shared_mem_map_regions *cmd;

	uint32_t num_regions, buf_sz, payload_size;

	struct audioreach_graph_data *data;

	struct gpr_pkt *pkt;

	struct gpr_pkt *pkt __free(kfree) = NULL;

	void *p;

	int rc, i;

	int i;



	if (dir == SNDRV_PCM_STREAM_PLAYBACK)

		data = &graph->rx_data;
@@ -1407,23 +1317,16 @@ int audioreach_map_memory_regions(struct q6apm_graph *graph, unsigned int dir, s 
	}

	mutex_unlock(&graph->lock);



	rc = audioreach_graph_send_cmd_sync(graph, pkt, APM_CMD_RSP_SHARED_MEM_MAP_REGIONS);



	kfree(pkt);



	return rc;

	return audioreach_graph_send_cmd_sync(graph, pkt, APM_CMD_RSP_SHARED_MEM_MAP_REGIONS);

}

EXPORT_SYMBOL_GPL(audioreach_map_memory_regions);



int audioreach_shared_memory_send_eos(struct q6apm_graph *graph)

{

	struct data_cmd_wr_sh_mem_ep_eos *eos;

	struct gpr_pkt *pkt;

	int rc = 0, iid;



	iid = q6apm_graph_get_rx_shmem_module_iid(graph);

	pkt = audioreach_alloc_cmd_pkt(sizeof(*eos), DATA_CMD_WR_SH_MEM_EP_EOS, 0,

				       graph->port->id, iid);

	int iid = q6apm_graph_get_rx_shmem_module_iid(graph);

	struct gpr_pkt *pkt __free(kfree) = audioreach_alloc_cmd_pkt(sizeof(*eos),

					DATA_CMD_WR_SH_MEM_EP_EOS, 0, graph->port->id, iid);

	if (IS_ERR(pkt))

		return PTR_ERR(pkt);
@@ -1431,9 +1334,6 @@ int audioreach_shared_memory_send_eos(struct q6apm_graph *graph) 


	eos->policy = WR_SH_MEM_EP_EOS_POLICY_LAST;



	rc = gpr_send_port_pkt(graph->port, pkt);

	kfree(pkt);



	return rc;

	return gpr_send_port_pkt(graph->port, pkt);

}

EXPORT_SYMBOL_GPL(audioreach_shared_memory_send_eos);