Re: [PATCH v2 07/16] ASoC: qcom: audioreach: add module configuration command helpers

+static int audioreach_shmem_set_media_format(struct q6apm_graph *graph,

• 		       struct audioreach_module *module,
  

• 		       int direction, uint32_t rate,
  

• 		       uint32_t num_channels,
  

• 		       u8 channel_map[PCM_MAX_NUM_CHANNEL],
  

• 		       uint16_t bits_per_sample)
  

+{

• struct apm_module_param_data *param_data;
• struct payload_media_fmt_pcm *cfg;
• struct media_format *header;
• int rc, payload_size;
• struct gpr_pkt *pkt;
• void *p;
• if (num_channels < 0 || num_channels > 2)

• dev_err(graph->dev, "Error: Invalid channels (%d)!\n", num_channels);
  

that doesn't sound good, you flag num_channels as an invalid value but still continue using it.

• payload_size = APM_SHMEM_FMT_CFG_PSIZE(num_channels) + APM_MODULE_PARAM_DATA_SIZE;
• p = audioreach_alloc_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0,

• 		     graph->port->id, module->instance_id);
  

• if (IS_ERR(p))

• return -ENOMEM;
  

• pkt = p;
• p = p + GPR_HDR_SIZE + APM_CMD_HDR_SIZE;
• param_data = p;
• param_data->module_instance_id = module->instance_id;
• param_data->error_code = 0;
• param_data->param_id = PARAM_ID_MEDIA_FORMAT;
• param_data->param_size = payload_size - APM_MODULE_PARAM_DATA_SIZE;
• p = p + APM_MODULE_PARAM_DATA_SIZE;
• header = p;
• header->data_format = DATA_FORMAT_FIXED_POINT;
• header->fmt_id = MEDIA_FMT_ID_PCM;
• header->payload_size = payload_size - sizeof(*header);
• p = p + sizeof(*header);
• cfg = p;
• cfg->sample_rate = rate;
• cfg->bit_width = bits_per_sample;
• cfg->alignment = PCM_LSB_ALIGNED;
• cfg->bits_per_sample = bits_per_sample;
• cfg->q_factor = bits_per_sample - 1;
• cfg->endianness = PCM_LITTLE_ENDIAN;
• cfg->num_channels = num_channels;
• if (num_channels == 1) {

• cfg->channel_mapping[0] =  PCM_CHANNEL_L;
  

• } else if (num_channels == 2) {

• cfg->channel_mapping[0] =  PCM_CHANNEL_L;
  

• cfg->channel_mapping[1] =  PCM_CHANNEL_R;
  

• } else {

• dev_err(graph->dev, "Error: Invalid channels (%d)!\n", num_channels);
  

already tested above.

• }
• rc = audioreach_graph_send_cmd_sync(graph, pkt, 0);
• kfree(pkt);
• return rc;

+}

+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;

useless init

• void *p;
• iid = q6apm_graph_get_rx_shmem_module_iid(graph);
• p = audioreach_alloc_cmd_pkt(sizeof(*eos),

• 		      DATA_CMD_WR_SH_MEM_EP_EOS,
  

• 		      0,
  

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

• if (IS_ERR(p))

• return -ENOMEM;
  

• pkt = p;
• eos = p + GPR_HDR_SIZE + APM_CMD_HDR_SIZE;
• eos->policy = WR_SH_MEM_EP_EOS_POLICY_LAST;
• rc = gpr_send_port_pkt(graph->port, pkt);
• kfree(pkt);
• return rc;

+}

+int q6apm_unmap_memory_regions(struct q6apm_graph *graph,

• 	       unsigned int dir)
  

+{

• struct audioreach_graph_data *data;
• struct apm_cmd_shared_mem_unmap_regions *cmd = NULL;

useless init

• struct gpr_pkt *pkt;
• void *p;
• int rc;
• if (dir == SNDRV_PCM_STREAM_PLAYBACK)

• data = &graph->rx_data;
  

• else

• data = &graph->tx_data;
  

• if (!data->mem_map_handle)

• return 0;
  

• p = audioreach_alloc_apm_pkt(sizeof(*cmd),

• 		      APM_CMD_SHARED_MEM_UNMAP_REGIONS, dir,
  

• 		      graph->port->id);
  

• if (IS_ERR(p))

• return -ENOMEM;
  

• pkt = p;
• cmd = p + GPR_HDR_SIZE;
• cmd->mem_map_handle = data->mem_map_handle;
• rc = audioreach_graph_send_cmd_sync(graph, pkt, APM_CMD_SHARED_MEM_UNMAP_REGIONS);
• kfree(pkt);
• audioreach_graph_free_buf(graph);
• return rc;

+} +EXPORT_SYMBOL_GPL(q6apm_unmap_memory_regions);