From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> To: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>, bjorn.andersson@linaro.org, broonie@kernel.org, robh@kernel.org Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, bgoswami@codeaurora.org, lgirdwood@gmail.com, tiwai@suse.de, plai@codeaurora.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 07/16] ASoC: qcom: audioreach: add module configuration command helpers Date: Wed, 14 Jul 2021 11:48:19 -0500 [thread overview] Message-ID: <d3e9bf09-cc72-c527-89b2-5f23a15163e4@linux.intel.com> (raw) In-Reply-To: <20210714153039.28373-8-srinivas.kandagatla@linaro.org> > +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);
WARNING: multiple messages have this Message-ID (diff)
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> To: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>, bjorn.andersson@linaro.org, broonie@kernel.org, robh@kernel.org Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, bgoswami@codeaurora.org, tiwai@suse.de, plai@codeaurora.org, lgirdwood@gmail.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 07/16] ASoC: qcom: audioreach: add module configuration command helpers Date: Wed, 14 Jul 2021 11:48:19 -0500 [thread overview] Message-ID: <d3e9bf09-cc72-c527-89b2-5f23a15163e4@linux.intel.com> (raw) In-Reply-To: <20210714153039.28373-8-srinivas.kandagatla@linaro.org> > +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);
next prev parent reply other threads:[~2021-07-14 17:14 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-14 15:30 [PATCH v2 00/16] ASoC: qcom: Add AudioReach support Srinivas Kandagatla 2021-07-14 15:30 ` Srinivas Kandagatla 2021-07-14 15:30 ` [PATCH v2 01/16] soc: dt-bindings: qcom: add gpr bindings Srinivas Kandagatla 2021-07-14 15:30 ` Srinivas Kandagatla 2021-07-14 16:05 ` Pierre-Louis Bossart 2021-07-14 16:05 ` Pierre-Louis Bossart 2021-07-14 15:30 ` [PATCH v2 02/16] soc: qcom: apr: make code more reuseable Srinivas Kandagatla 2021-07-14 15:30 ` Srinivas Kandagatla 2021-07-14 20:36 ` kernel test robot 2021-07-14 20:36 ` kernel test robot 2021-07-14 20:36 ` kernel test robot 2021-07-14 15:30 ` [PATCH v2 03/16] soc: qcom: apr: Add GPR support Srinivas Kandagatla 2021-07-14 15:30 ` Srinivas Kandagatla 2021-07-14 16:20 ` Pierre-Louis Bossart 2021-07-14 16:20 ` Pierre-Louis Bossart 2021-07-15 10:31 ` Srinivas Kandagatla 2021-07-15 10:31 ` Srinivas Kandagatla 2021-07-14 15:30 ` [PATCH v2 04/16] ASoC: qcom: dt-bindings: add bindings Audio Processing manager Srinivas Kandagatla 2021-07-14 15:30 ` Srinivas Kandagatla 2021-07-28 17:36 ` Rob Herring 2021-07-28 17:36 ` Rob Herring 2021-07-29 9:18 ` Srinivas Kandagatla 2021-07-29 9:18 ` Srinivas Kandagatla 2021-07-29 11:13 ` Mark Brown 2021-07-29 11:13 ` Mark Brown 2021-07-30 11:06 ` Srinivas Kandagatla 2021-07-30 11:06 ` Srinivas Kandagatla 2021-07-14 15:30 ` [PATCH v2 05/16] ASoC: qcom: audioreach: add basic pkt alloc support Srinivas Kandagatla 2021-07-14 15:30 ` Srinivas Kandagatla 2021-07-14 16:30 ` Pierre-Louis Bossart 2021-07-14 16:30 ` Pierre-Louis Bossart 2021-07-15 10:31 ` Srinivas Kandagatla 2021-07-15 10:31 ` Srinivas Kandagatla 2021-07-14 15:30 ` [PATCH v2 06/16] ASoC: qcom: audioreach: add q6apm support Srinivas Kandagatla 2021-07-14 15:30 ` Srinivas Kandagatla 2021-07-14 16:40 ` Pierre-Louis Bossart 2021-07-14 16:40 ` Pierre-Louis Bossart 2021-07-15 10:31 ` Srinivas Kandagatla 2021-07-15 10:31 ` Srinivas Kandagatla 2021-07-14 15:30 ` [PATCH v2 07/16] ASoC: qcom: audioreach: add module configuration command helpers Srinivas Kandagatla 2021-07-14 15:30 ` Srinivas Kandagatla 2021-07-14 16:48 ` Pierre-Louis Bossart [this message] 2021-07-14 16:48 ` Pierre-Louis Bossart 2021-07-15 10:32 ` Srinivas Kandagatla 2021-07-15 10:32 ` Srinivas Kandagatla 2021-07-14 15:30 ` [PATCH v2 08/16] ASoC: qcom: audioreach: add topology support Srinivas Kandagatla 2021-07-14 15:30 ` Srinivas Kandagatla 2021-07-14 15:30 ` [PATCH v2 09/16] ASoC: qcom: audioreach: add q6apm-dai support Srinivas Kandagatla 2021-07-14 15:30 ` Srinivas Kandagatla 2021-07-14 16:59 ` Pierre-Louis Bossart 2021-07-14 16:59 ` Pierre-Louis Bossart 2021-07-15 10:32 ` Srinivas Kandagatla 2021-07-15 10:32 ` Srinivas Kandagatla 2021-07-14 15:30 ` [PATCH v2 10/16] ASoC: qcom: audioreach: add bedai support Srinivas Kandagatla 2021-07-14 15:30 ` Srinivas Kandagatla 2021-07-14 17:03 ` Pierre-Louis Bossart 2021-07-14 17:03 ` Pierre-Louis Bossart 2021-07-15 10:32 ` Srinivas Kandagatla 2021-07-15 10:32 ` Srinivas Kandagatla 2021-07-14 15:30 ` [PATCH v2 11/16] ASoC: qcom: dt-bindings: add bindings for Proxy Resource Manager Srinivas Kandagatla 2021-07-14 15:30 ` Srinivas Kandagatla 2021-07-14 15:30 ` [PATCH v2 12/16] ASoC: qcom: audioreach: add q6prm support Srinivas Kandagatla 2021-07-14 15:30 ` Srinivas Kandagatla 2021-07-14 17:09 ` Pierre-Louis Bossart 2021-07-14 17:09 ` Pierre-Louis Bossart 2021-07-15 10:32 ` Srinivas Kandagatla 2021-07-15 10:32 ` Srinivas Kandagatla 2021-07-15 7:40 ` kernel test robot 2021-07-15 7:40 ` kernel test robot 2021-07-15 7:40 ` kernel test robot 2021-07-14 15:30 ` [PATCH v2 13/16] ASoC: qcom: dt-bindings: add audioreach soundcard compatibles Srinivas Kandagatla 2021-07-14 15:30 ` Srinivas Kandagatla 2021-07-14 15:30 ` [PATCH v2 14/16] ASoC: qcom: audioreach: add volume ctrl module support Srinivas Kandagatla 2021-07-14 15:30 ` Srinivas Kandagatla 2021-07-14 15:30 ` [PATCH v2 15/16] ASoC: qcom: audioreach: topology add dapm pga support Srinivas Kandagatla 2021-07-14 15:30 ` Srinivas Kandagatla 2021-07-14 15:30 ` [PATCH v2 16/16] ASoC: qcom: sm8250: Add audioreach support Srinivas Kandagatla 2021-07-14 15:30 ` Srinivas Kandagatla 2021-07-14 17:12 ` Pierre-Louis Bossart 2021-07-14 17:12 ` Pierre-Louis Bossart 2021-07-15 10:32 ` Srinivas Kandagatla 2021-07-15 10:32 ` Srinivas Kandagatla
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=d3e9bf09-cc72-c527-89b2-5f23a15163e4@linux.intel.com \ --to=pierre-louis.bossart@linux.intel.com \ --cc=alsa-devel@alsa-project.org \ --cc=bgoswami@codeaurora.org \ --cc=bjorn.andersson@linaro.org \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=plai@codeaurora.org \ --cc=robh@kernel.org \ --cc=srinivas.kandagatla@linaro.org \ --cc=tiwai@suse.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.