From: "Amadeusz Sławiński" <amadeuszx.slawinski@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, pierre-louis.bossart@linux.intel.com
Subject: Re: [PATCH v8 14/22] ASoC: qdsp6: audioreach: add basic pkt alloc support
Date: Tue, 28 Sep 2021 10:00:46 +0200 [thread overview]
Message-ID: <d1f69cbc-37f6-dc47-258c-f53450dd558c@linux.intel.com> (raw)
In-Reply-To: <20210927135559.738-15-srinivas.kandagatla@linaro.org>
On 9/27/2021 3:55 PM, Srinivas Kandagatla wrote:
> Add basic helper functions for AudioReach.
>
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> ---
> sound/soc/qcom/qdsp6/audioreach.c | 265 ++++++++++++
> sound/soc/qcom/qdsp6/audioreach.h | 668 ++++++++++++++++++++++++++++++
> 2 files changed, 933 insertions(+)
> create mode 100644 sound/soc/qcom/qdsp6/audioreach.c
> create mode 100644 sound/soc/qcom/qdsp6/audioreach.h
>
> diff --git a/sound/soc/qcom/qdsp6/audioreach.c b/sound/soc/qcom/qdsp6/audioreach.c
> new file mode 100644
> index 000000000000..34ec4c0d0175
> --- /dev/null
> +++ b/sound/soc/qcom/qdsp6/audioreach.c
> @@ -0,0 +1,265 @@
> +// SPDX-License-Identifier: GPL-2.0
> +// Copyright (c) 2020, Linaro Limited
> +
> +#include <linux/kernel.h>
> +#include <linux/slab.h>
> +#include <linux/soc/qcom/apr.h>
> +#include <dt-bindings/soc/qcom,gpr.h>
> +#include "audioreach.h"
> +
> +/* SubGraph Config */
> +struct apm_sub_graph_data {
> + struct apm_sub_graph_cfg sub_graph_cfg;
> + struct apm_prop_data perf_data;
> + struct apm_sg_prop_id_perf_mode perf;
> + struct apm_prop_data dir_data;
> + struct apm_sg_prop_id_direction dir;
> + struct apm_prop_data sid_data;
> + struct apm_sg_prop_id_scenario_id sid;
> +
> +} __packed;
> +
> +#define APM_SUB_GRAPH_CFG_NPROP 3
> +
> +struct apm_sub_graph_params {
> + struct apm_module_param_data param_data;
> + uint32_t num_sub_graphs;
> + struct apm_sub_graph_data sg_cfg[];
> +} __packed;
> +
> +#define APM_SUB_GRAPH_PSIZE(n) ALIGN(sizeof(struct apm_sub_graph_params) + \
> + n * sizeof(struct apm_sub_graph_data), 8)
This looks, like you could use struct_size helper, something like:
#define APM_SUB_GRAPH_PSIZE(n) ALIGN(struct_size(apm_sub_graph_params,
apm_sub_graph_data, n), 8)
> +/* container config */
> +struct apm_container_obj {
> + struct apm_container_cfg container_cfg;
> + /* Capability ID list */
> + struct apm_prop_data cap_data;
> + uint32_t num_capability_id;
> + uint32_t capability_id;
> +
> + /* Container graph Position */
> + struct apm_prop_data pos_data;
> + struct apm_cont_prop_id_graph_pos pos;
> +
> + /* Container Stack size */
> + struct apm_prop_data stack_data;
> + struct apm_cont_prop_id_stack_size stack;
> +
> + /* Container proc domain id */
> + struct apm_prop_data domain_data;
> + struct apm_cont_prop_id_domain domain;
> +} __packed;
> +
> +struct apm_container_params {
> + struct apm_module_param_data param_data;
> + uint32_t num_containers;
> + struct apm_container_obj cont_obj[];
> +} __packed;
> +
> +#define APM_CONTAINER_PSIZE(n) ALIGN(sizeof(struct apm_container_params) + \
> + n * sizeof(struct apm_container_obj), 8)
> +
Same here, use struct_size, and same applies for other defines in this
file, I won't add comment to all of them ;)
> +/* Module List config */
> +struct apm_mod_list_obj {
> + /* Modules list cfg */
> + uint32_t sub_graph_id;
> + uint32_t container_id;
> + uint32_t num_modules;
> + struct apm_module_obj mod_cfg[];
> +} __packed;
> +
> +struct apm_module_list_params {
> + struct apm_module_param_data param_data;
> + uint32_t num_modules_list;
> + /* Module list config array */
> + struct apm_mod_list_obj mod_list_obj[];
> +} __packed;
> +
(...)
> diff --git a/sound/soc/qcom/qdsp6/audioreach.h b/sound/soc/qcom/qdsp6/audioreach.h
> new file mode 100644
> index 000000000000..556443155416
> --- /dev/null
> +++ b/sound/soc/qcom/qdsp6/audioreach.h
> @@ -0,0 +1,668 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +
> +#ifndef __AUDIOREACH_H__
> +#define __AUDIOREACH_H__
> +#include <linux/types.h>
> +#include <linux/soc/qcom/apr.h>
> +#include <sound/soc.h>
> +
> +/* Module IDs */
> +#define MODULE_ID_WR_SHARED_MEM_EP 0x07001000
> +#define MODULE_ID_RD_SHARED_MEM_EP 0x07001001
> +#define MODULE_ID_GAIN 0x07001002
> +#define MODULE_ID_PCM_CNV 0x07001003
> +#define MODULE_ID_PCM_ENC 0x07001004
> +#define MODULE_ID_PCM_DEC 0x07001005
> +#define MODULE_ID_CODEC_DMA_SINK 0x07001023
> +#define MODULE_ID_CODEC_DMA_SOURCE 0x07001024
> +#define MODULE_ID_I2S_SINK 0x0700100A
> +#define MODULE_ID_I2S_SOURCE 0x0700100b
Small 'b' in hex value, use 'B' for consistency
> +#define MODULE_ID_DATA_LOGGING 0x0700101A
> +
> +#define APM_CMD_GET_SPF_STATE 0x01001021
> +#define APM_CMD_RSP_GET_SPF_STATE 0x02001007
> +
> +#define APM_MODULE_INSTANCE_ID 0x00000001
> +#define PRM_MODULE_INSTANCE_ID 0x00000002
> +#define AMDB_MODULE_INSTANCE_ID 0x00000003
> +#define VCPM_MODULE_INSTANCE_ID 0x00000004
> +#define AR_MODULE_INSTANCE_ID_START 0x00006000
> +#define AR_MODULE_INSTANCE_ID_END 0x00007000
> +#define AR_MODULE_DYNAMIC_INSTANCE_ID_START 0x00007000
> +#define AR_MODULE_DYNAMIC_INSTANCE_ID_END 0x00008000
> +#define AR_CONT_INSTANCE_ID_START 0x00005000
> +#define AR_CONT_INSTANCE_ID_END 0x00006000
> +#define AR_SG_INSTANCE_ID_START 0x00004000
> +
> +#define APM_CMD_GRAPH_OPEN 0x01001000
> +#define APM_CMD_GRAPH_PREPARE 0x01001001
> +#define APM_CMD_GRAPH_START 0x01001002
> +#define APM_CMD_GRAPH_STOP 0x01001003
> +#define APM_CMD_GRAPH_CLOSE 0x01001004
> +#define APM_CMD_GRAPH_FLUSH 0x01001005
> +#define APM_CMD_SET_CFG 0x01001006
> +#define APM_CMD_GET_CFG 0x01001007
> +#define APM_CMD_SHARED_MEM_MAP_REGIONS 0x0100100c
Small 'c' here, use 'C'
> +#define APM_CMD_SHARED_MEM_UNMAP_REGIONS 0x0100100d
and 'D' insted of 'd' here.
> +#define APM_CMD_RSP_SHARED_MEM_MAP_REGIONS 0x02001001
> +#define APM_CMD_RSP_GET_CFG 0x02001000
> +#define APM_CMD_CLOSE_ALL 0x01001013
> +#define APM_CMD_REGISTER_SHARED_CFG 0x0100100A
> +
> +#define APM_MEMORY_MAP_SHMEM8_4K_POOL 3
> +
> +struct apm_cmd_shared_mem_map_regions {
> + uint16_t mem_pool_id;
> + uint16_t num_regions;
> + uint32_t property_flag;
> +} __packed;
> +
> +struct apm_shared_map_region_payload {
> + uint32_t shm_addr_lsw;
> + uint32_t shm_addr_msw;
> + uint32_t mem_size_bytes;
> +} __packed;
> +
> +struct apm_cmd_shared_mem_unmap_regions {
> + uint32_t mem_map_handle;
> +} __packed;
> +
> +struct apm_cmd_rsp_shared_mem_map_regions {
> + uint32_t mem_map_handle;
> +} __packed;
> +
(...)
> +#define DATA_CMD_RD_SH_MEM_EP_DATA_BUFFER 0x04001003
> +
> +struct data_cmd_rd_sh_mem_ep_data_buffer {
> + uint32_t buf_addr_lsw;
> + uint32_t buf_addr_msw;
> + uint32_t mem_map_handle;
> + uint32_t buf_size;
> +};
> +
> +#define DATA_CMD_RSP_RD_SH_MEM_EP_DATA_BUFFER 0x05001002
> +
> +struct data_cmd_rsp_rd_sh_mem_ep_data_buffer_done {
> + uint32_t status;
> + uint32_t buf_addr_lsw;
> + uint32_t buf_addr_msw;
> + uint32_t mem_map_handle;
> + uint32_t data_size;
> + uint32_t offset;
> + uint32_t timestamp_lsw;
> + uint32_t timestamp_msw;
> + uint32_t flags;
> + uint32_t num_frames;
> +};
Rest of structs is marked with __packed and it seems like it describes
communication protocol, so it seems like you missed it here.
> +
> +#define DATA_CMD_RD_SH_MEM_EP_DATA_BUFFER_V2 0x0400100B
> +
> +struct data_cmd_rd_sh_mem_ep_data_buffer_v2 {
> + uint32_t buf_addr_lsw;
> + uint32_t buf_addr_msw;
> + uint32_t mem_map_handle;
> + uint32_t buf_size;
> + uint32_t md_buf_addr_lsw;
> + uint32_t md_buf_addr_msw;
> + uint32_t md_mem_map_handle;
> + uint32_t md_buf_size;
> +};
Same comment as above.
> +
> +#define DATA_CMD_RSP_RD_SH_MEM_EP_DATA_BUFFER_V2 0x05001005
> +
> +struct data_cmd_rsp_rd_sh_mem_ep_data_buffer_done_v2 {
> + uint32_t status;
> + uint32_t buf_addr_lsw;
> + uint32_t buf_addr_msw;
> + uint32_t mem_map_handle;
> + uint32_t data_size;
> + uint32_t offset;
> + uint32_t timestamp_lsw;
> + uint32_t timestamp_msw;
> + uint32_t flags;
> + uint32_t num_frames;
> + uint32_t md_status;
> + uint32_t md_buf_addr_lsw;
> + uint32_t md_buf_addr_msw;
> + uint32_t md_mem_map_handle;
> + uint32_t md_size;
> +} __packed;
> +
> +#define PARAM_ID_RD_SH_MEM_CFG 0x08001007
> +
> +struct param_id_rd_sh_mem_cfg {
> + uint32_t num_frames_per_buffer;
> + uint32_t metadata_control_flags;
> +
> +} __packed;
> +
(...)
next prev parent reply other threads:[~2021-09-28 8:02 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-27 13:55 [PATCH v8 00/22] ASoC: qcom: Add AudioReach support Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 01/22] soc: dt-bindings: qcom: apr: convert to yaml Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 02/22] soc: dt-bindings: qcom: apr: deprecate qcom,apr-domain property Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 03/22] soc: qcom: apr: make code more reuseable Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 04/22] soc: dt-bindings: qcom: add gpr bindings Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 05/22] soc: qcom: apr: Add GPR support Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 06/22] ASoC: dt-bindings: move LPASS dai related bindings out of q6afe Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 07/22] ASoC: dt-bindings: move LPASS clocks " Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 08/22] ASoC: dt-bindings: rename q6afe.h to q6dsp-lpass-ports.h Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 09/22] ASoC: qdsp6: q6afe-dai: move lpass audio ports to common file Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 10/22] ASoC: qdsp6: q6afe-clocks: move audio-clocks " Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 11/22] ASoC: dt-bindings: q6dsp: add q6apm-lpass-dai compatible Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 12/22] ASoC: dt-bindings: lpass-clocks: add q6prm clocks compatible Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 13/22] ASoC: dt-bindings: add q6apm digital audio stream bindings Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 14/22] ASoC: qdsp6: audioreach: add basic pkt alloc support Srinivas Kandagatla
2021-09-27 16:08 ` Pierre-Louis Bossart
2021-09-28 10:10 ` Srinivas Kandagatla
2021-09-28 8:00 ` Amadeusz Sławiński [this message]
2021-09-28 9:31 ` Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 15/22] ASoC: qdsp6: audioreach: add q6apm support Srinivas Kandagatla
2021-09-28 8:23 ` Amadeusz Sławiński
2021-09-28 9:31 ` Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 16/22] ASoC: qdsp6: audioreach: add module configuration command helpers Srinivas Kandagatla
2021-09-27 16:16 ` Pierre-Louis Bossart
2021-09-28 10:21 ` Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 17/22] ASoC: qdsp6: audioreach: add Kconfig and Makefile Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 18/22] ASoC: qdsp6: audioreach: add topology support Srinivas Kandagatla
2021-09-27 16:21 ` Pierre-Louis Bossart
2021-09-28 9:34 ` Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 19/22] ASoC: qdsp6: audioreach: add q6apm-dai support Srinivas Kandagatla
2021-09-27 16:25 ` Pierre-Louis Bossart
2021-09-28 9:33 ` Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 20/22] ASoC: qdsp6: audioreach: add q6apm lpass dai support Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 21/22] ASoC: qdsp6: audioreach: add q6prm support Srinivas Kandagatla
2021-09-27 13:55 ` [PATCH v8 22/22] ASoC: qdsp6: audioreach: add support for q6prm-clocks Srinivas Kandagatla
2021-09-27 16:32 ` [PATCH v8 00/22] ASoC: qcom: Add AudioReach support Pierre-Louis Bossart
2021-09-28 3:19 ` Bjorn Andersson
2021-09-28 3:20 ` (subset) " Bjorn Andersson
2021-09-28 8:47 ` 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=d1f69cbc-37f6-dc47-258c-f53450dd558c@linux.intel.com \
--to=amadeuszx.slawinski@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=pierre-louis.bossart@linux.intel.com \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).