[PATCH v7 16/22] ASoC: qdsp6: audioreach: add module configuration command helpers

[Srinivas Kandagatla]

On 21/09/2021 18:09, Pierre-Louis Bossart wrote:
> 
>> +static int audioreach_i2s_set_media_format(struct q6apm_graph *graph,
>> +					   struct audioreach_module *module,
>> +					   struct audioreach_module_config *cfg)
>> +{
>> +	struct apm_module_frame_size_factor_cfg *fs_cfg;
>> +	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;
>> +	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);
>> +	if (IS_ERR(pkt))
>> +		return -ENOMEM;
>> +
>> +	p = (void *)pkt + GPR_HDR_SIZE + APM_CMD_HDR_SIZE;
>> +	intf_cfg = p;
>> +
>> +	param_data = &intf_cfg->param_data;
>> +	param_data->module_instance_id = module->instance_id;
>> +	param_data->error_code = 0;
>> +	param_data->param_id = PARAM_ID_I2S_INTF_CFG;
>> +	param_data->param_size = ic_sz - APM_MODULE_PARAM_DATA_SIZE;
>> +
>> +	intf_cfg->cfg.intf_idx = module->hw_interface_idx;
>> +	intf_cfg->cfg.sd_line_idx = module->sd_line_idx;
>> +
>> +	switch (cfg->fmt & SND_SOC_DAIFMT_MASTER_MASK) {
> SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK
> 
Its now fixed in next version.

>> +	case SND_SOC_DAIFMT_CBC_CFC:
>> +		intf_cfg->cfg.ws_src = CONFIG_I2S_WS_SRC_INTERNAL;
>> +		break;
>> +	case SND_SOC_DAIFMT_CBP_CFP:
>> +		/* CPU is slave */
>> +		intf_cfg->cfg.ws_src = CONFIG_I2S_WS_SRC_EXTERNAL;
>> +		break;
>> +	default:
>> +		break;
>> +	}
>> +
>> +	p += ic_sz;
>> +	hw_cfg = p;
>> +	param_data = &hw_cfg->param_data;
>> +	param_data->module_instance_id = module->instance_id;
>> +	param_data->error_code = 0;
>> +	param_data->param_id = PARAM_ID_HW_EP_MF_CFG;
>> +	param_data->param_size = ep_sz - APM_MODULE_PARAM_DATA_SIZE;
>> +
>> +	hw_cfg->mf.sample_rate = cfg->sample_rate;
>> +	hw_cfg->mf.bit_width = cfg->bit_width;
>> +	hw_cfg->mf.num_channels = cfg->num_channels;
>> +	hw_cfg->mf.data_format = module->data_format;
>> +
>> +	p += ep_sz;
>> +	fs_cfg = p;
>> +	param_data = &fs_cfg->param_data;
>> +	param_data->module_instance_id = module->instance_id;
>> +	param_data->error_code = 0;
>> +	param_data->param_id = PARAM_ID_HW_EP_FRAME_SIZE_FACTOR;
>> +	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);
>> + error and
>> +	kfree(pkt);
>> +
>> +	return rc;
>> +}
>> +int audioreach_map_memory_regions(struct q6apm_graph *graph, unsigned int dir, size_t period_sz,
>> +				  unsigned int periods, bool is_contiguous)
>> +{
>> +	struct apm_shared_map_region_payload *mregions;
>> +	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;
>> +	void *p;
>> +	int rc, i;
>> +
>> +	if (dir == SNDRV_PCM_STREAM_PLAYBACK)
>> +		data = &graph->rx_data;
>> +	else
>> +		data = &graph->tx_data;
>> +
>> +	if (is_contiguous) {
>> +		num_regions = 1;
>> +		buf_sz = period_sz * periods;
>> +	} else {
>> +		buf_sz = period_sz;
>> +		num_regions = periods;
>> +	}
>> +
>> +	/* DSP expects size should be aligned to 4K */
>> +	buf_sz = ALIGN(buf_sz, 4096);
>> +
>> +	payload_size = sizeof(*cmd) + (sizeof(*mregions) * num_regions);
>> +
>> +	pkt = audioreach_alloc_apm_pkt(payload_size, APM_CMD_SHARED_MEM_MAP_REGIONS, dir,
>> +				     graph->port->id);
>> +	if (IS_ERR(pkt))
>> +		return -ENOMEM;
> return PTR_ERR(pkt) ?
> 

Removed such instances across all the files.

--srini
> 
>> +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);
>> +	if (IS_ERR(pkt))
>> +		return -ENOMEM;
> return PTR_ERR(pkt) ?
>