From nobody Tue Feb 10 04:02:49 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EAB1BEB64D9 for ; Mon, 19 Jun 2023 10:17:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229703AbjFSKRV (ORCPT ); Mon, 19 Jun 2023 06:17:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231384AbjFSKRF (ORCPT ); Mon, 19 Jun 2023 06:17:05 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 451E113D for ; Mon, 19 Jun 2023 03:17:03 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3110a5f2832so3191624f8f.1 for ; Mon, 19 Jun 2023 03:17:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687169821; x=1689761821; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iYs30udEL8nhpF3tCDr6b0n4CbAIdCAeMZJMw59Oucc=; b=s5rAk5fL+527HFVNAUOWsp4wnKx2MX4c5Ul3TFnLxc2r6hC5E7Suq4kRZ3BkXk7D7M 4YqEHVF7V3hIZEPybDue4dVIWh1Z/bPtVCMIwx0a01MUnhW4SBE3POPkfTrsJKxUN1K5 eQAewL53ELoqd/vJ5FbJz3KDRdEGCRc2hwxXHY+EnM4/8DMzWqUzV3yns/QAbb7w2vrH 8B+w9gImVo8ecwTqyxwuJ+7rMnQln+YBBlzz8ACN9hioq01NI0yGV8vK++nEu83mT2nv JXIHaLezqLjr5Vx7/DX6GwBit2pVg8XeM3DIxXWucZRJCpB7jYi2eue1QC30UJ6uQ5YG vZEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687169821; x=1689761821; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iYs30udEL8nhpF3tCDr6b0n4CbAIdCAeMZJMw59Oucc=; b=Lo+fdVY+fHxk7I2Zs5cF1hVVUE6kitGlpPS7jOvy89TfThjsFszbGzUj74QRcKkBBo VDVkBYfycLZvqz3zm1ZVQPPTVMkDebe9R1hwL2ocrGP8sOQCkdP0HXzZcVNoSaOJC7Ub RDjIcHf9UnCAcV13pAt+WmaO15ITL40DQnuP1c7uvxMPzILaI0SwvciAtVrBoBJde+hS eE4mQbNOkamdkPvoDGuGlXThMGU+K4eyQNVdpKK+43VIbIqJs/Tr98yQ1EIXHRV4XW9S 256wmDGgTnD2Sy0pOvehep/VMoqtvTuFlxN7YIMLmztR2wXHrhi2SH2q3a/hN7ps4j1T Q8Qg== X-Gm-Message-State: AC+VfDw2g6pxXjknnMCQMy66JXXiFWkPTZ8ipMWhCB1WP8IMMADNm4RM BfhGWf4IrpSZZ1OEpespisl9kw== X-Google-Smtp-Source: ACHHUZ5nlFKBSPgL2hxULeGcw8a0m8INaIQY81kSCHA7LcAiEOx0bFvbB+1yAnBnYTWsi0BaY1MqlA== X-Received: by 2002:adf:f1c5:0:b0:307:7959:6461 with SMTP id z5-20020adff1c5000000b0030779596461mr8136462wro.31.1687169821671; Mon, 19 Jun 2023 03:17:01 -0700 (PDT) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id c2-20020a5d5282000000b002fae7408544sm31146922wrv.108.2023.06.19.03.17.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 03:17:01 -0700 (PDT) From: Srinivas Kandagatla To: broonie@kernel.org Cc: perex@perex.cz, tiwai@suse.com, lgirdwood@gmail.com, ckeepax@opensource.cirrus.com, kuninori.morimoto.gx@renesas.com, linux-kernel@vger.kernel.org, pierre-louis.bossart@linux.intel.com, alsa-devel@alsa-project.org, Mohammad Rafi Shaik , Srinivas Kandagatla Subject: [PATCH v3 05/11] ASoC: q6dsp: audioreach: Add support to set compress format params Date: Mon, 19 Jun 2023 11:16:47 +0100 Message-Id: <20230619101653.9750-6-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20230619101653.9750-1-srinivas.kandagatla@linaro.org> References: <20230619101653.9750-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Mohammad Rafi Shaik Add function for setting compress params. Signed-off-by: Mohammad Rafi Shaik Co-developed-by: Srinivas Kandagatla Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/audioreach.c | 139 ++++++++++++++++++++++++++---- sound/soc/qcom/qdsp6/audioreach.h | 28 ++++++ sound/soc/qcom/qdsp6/q6apm-dai.c | 1 + 3 files changed, 149 insertions(+), 19 deletions(-) diff --git a/sound/soc/qcom/qdsp6/audioreach.c b/sound/soc/qcom/qdsp6/audio= reach.c index 34cbc4d05918..ba262408b27a 100644 --- a/sound/soc/qcom/qdsp6/audioreach.c +++ b/sound/soc/qcom/qdsp6/audioreach.c @@ -834,6 +834,99 @@ static int audioreach_mfc_set_media_format(struct q6ap= m_graph *graph, return rc; } =20 +static int audioreach_set_compr_media_format(struct media_format *media_fm= t_hdr, + void *p, struct audioreach_module_config *mcfg) +{ + struct payload_media_fmt_aac_t *aac_cfg; + struct payload_media_fmt_pcm *mp3_cfg; + struct payload_media_fmt_flac_t *flac_cfg; + + switch (mcfg->fmt) { + case SND_AUDIOCODEC_MP3: + media_fmt_hdr->data_format =3D DATA_FORMAT_RAW_COMPRESSED; + media_fmt_hdr->fmt_id =3D MEDIA_FMT_ID_MP3; + media_fmt_hdr->payload_size =3D 0; + p =3D p + sizeof(*media_fmt_hdr); + mp3_cfg =3D p; + mp3_cfg->sample_rate =3D mcfg->sample_rate; + mp3_cfg->bit_width =3D mcfg->bit_width; + mp3_cfg->alignment =3D PCM_LSB_ALIGNED; + mp3_cfg->bits_per_sample =3D mcfg->bit_width; + mp3_cfg->q_factor =3D mcfg->bit_width - 1; + mp3_cfg->endianness =3D PCM_LITTLE_ENDIAN; + mp3_cfg->num_channels =3D mcfg->num_channels; + + if (mcfg->num_channels =3D=3D 1) { + mp3_cfg->channel_mapping[0] =3D PCM_CHANNEL_L; + } else if (mcfg->num_channels =3D=3D 2) { + mp3_cfg->channel_mapping[0] =3D PCM_CHANNEL_L; + mp3_cfg->channel_mapping[1] =3D PCM_CHANNEL_R; + } + break; + case SND_AUDIOCODEC_AAC: + media_fmt_hdr->data_format =3D DATA_FORMAT_RAW_COMPRESSED; + media_fmt_hdr->fmt_id =3D MEDIA_FMT_ID_AAC; + media_fmt_hdr->payload_size =3D sizeof(struct payload_media_fmt_aac_t); + p =3D p + sizeof(*media_fmt_hdr); + aac_cfg =3D p; + aac_cfg->aac_fmt_flag =3D 0; + aac_cfg->audio_obj_type =3D 5; + aac_cfg->num_channels =3D mcfg->num_channels; + aac_cfg->total_size_of_PCE_bits =3D 0; + aac_cfg->sample_rate =3D mcfg->sample_rate; + break; + case SND_AUDIOCODEC_FLAC: + media_fmt_hdr->data_format =3D DATA_FORMAT_RAW_COMPRESSED; + media_fmt_hdr->fmt_id =3D MEDIA_FMT_ID_FLAC; + media_fmt_hdr->payload_size =3D sizeof(struct payload_media_fmt_flac_t); + p =3D p + sizeof(*media_fmt_hdr); + flac_cfg =3D p; + flac_cfg->sample_size =3D mcfg->codec.options.flac_d.sample_size; + flac_cfg->num_channels =3D mcfg->num_channels; + flac_cfg->min_blk_size =3D mcfg->codec.options.flac_d.min_blk_size; + flac_cfg->max_blk_size =3D mcfg->codec.options.flac_d.max_blk_size; + flac_cfg->sample_rate =3D mcfg->sample_rate; + flac_cfg->min_frame_size =3D mcfg->codec.options.flac_d.min_frame_size; + flac_cfg->max_frame_size =3D mcfg->codec.options.flac_d.max_frame_size; + break; + default: + return -EINVAL; + } + + return 0; +} + +int audioreach_compr_set_param(struct q6apm_graph *graph, struct audioreac= h_module_config *mcfg) +{ + struct media_format *header; + struct gpr_pkt *pkt; + int iid, payload_size, rc; + void *p; + + payload_size =3D sizeof(struct apm_sh_module_media_fmt_cmd); + + iid =3D q6apm_graph_get_rx_shmem_module_iid(graph); + pkt =3D audioreach_alloc_cmd_pkt(payload_size, DATA_CMD_WR_SH_MEM_EP_MEDI= A_FORMAT, + 0, graph->port->id, iid); + + if (IS_ERR(pkt)) + return -ENOMEM; + + p =3D (void *)pkt + GPR_HDR_SIZE; + header =3D p; + rc =3D audioreach_set_compr_media_format(header, p, mcfg); + if (rc) { + kfree(pkt); + return rc; + } + + rc =3D gpr_send_port_pkt(graph->port, pkt); + kfree(pkt); + + return rc; +} +EXPORT_SYMBOL_GPL(audioreach_compr_set_param); + static int audioreach_i2s_set_media_format(struct q6apm_graph *graph, struct audioreach_module *module, struct audioreach_module_config *cfg) @@ -1037,25 +1130,33 @@ static int audioreach_shmem_set_media_format(struct= q6apm_graph *graph, p =3D p + APM_MODULE_PARAM_DATA_SIZE; =20 header =3D p; - header->data_format =3D DATA_FORMAT_FIXED_POINT; - header->fmt_id =3D MEDIA_FMT_ID_PCM; - header->payload_size =3D payload_size - sizeof(*header); - - p =3D p + sizeof(*header); - cfg =3D p; - cfg->sample_rate =3D mcfg->sample_rate; - cfg->bit_width =3D mcfg->bit_width; - cfg->alignment =3D PCM_LSB_ALIGNED; - cfg->bits_per_sample =3D mcfg->bit_width; - cfg->q_factor =3D mcfg->bit_width - 1; - cfg->endianness =3D PCM_LITTLE_ENDIAN; - cfg->num_channels =3D mcfg->num_channels; - - if (mcfg->num_channels =3D=3D 1) { - cfg->channel_mapping[0] =3D PCM_CHANNEL_L; - } else if (num_channels =3D=3D 2) { - cfg->channel_mapping[0] =3D PCM_CHANNEL_L; - cfg->channel_mapping[1] =3D PCM_CHANNEL_R; + if (mcfg->fmt =3D=3D SND_AUDIOCODEC_PCM) { + header->data_format =3D DATA_FORMAT_FIXED_POINT; + header->fmt_id =3D MEDIA_FMT_ID_PCM; + header->payload_size =3D payload_size - sizeof(*header); + + p =3D p + sizeof(*header); + cfg =3D p; + cfg->sample_rate =3D mcfg->sample_rate; + cfg->bit_width =3D mcfg->bit_width; + cfg->alignment =3D PCM_LSB_ALIGNED; + cfg->bits_per_sample =3D mcfg->bit_width; + cfg->q_factor =3D mcfg->bit_width - 1; + cfg->endianness =3D PCM_LITTLE_ENDIAN; + cfg->num_channels =3D mcfg->num_channels; + + if (mcfg->num_channels =3D=3D 1) + cfg->channel_mapping[0] =3D PCM_CHANNEL_L; + else if (num_channels =3D=3D 2) { + cfg->channel_mapping[0] =3D PCM_CHANNEL_L; + cfg->channel_mapping[1] =3D PCM_CHANNEL_R; + } + } else { + rc =3D audioreach_set_compr_media_format(header, p, mcfg); + if (rc) { + kfree(pkt); + return rc; + } } =20 rc =3D audioreach_graph_send_cmd_sync(graph, pkt, 0); diff --git a/sound/soc/qcom/qdsp6/audioreach.h b/sound/soc/qcom/qdsp6/audio= reach.h index c4e03a49ac82..dc089879b501 100644 --- a/sound/soc/qcom/qdsp6/audioreach.h +++ b/sound/soc/qcom/qdsp6/audioreach.h @@ -148,12 +148,15 @@ struct param_id_enc_bitrate_param { } __packed; =20 #define DATA_FORMAT_FIXED_POINT 1 +#define DATA_FORMAT_GENERIC_COMPRESSED 5 +#define DATA_FORMAT_RAW_COMPRESSED 6 #define PCM_LSB_ALIGNED 1 #define PCM_MSB_ALIGNED 2 #define PCM_LITTLE_ENDIAN 1 #define PCM_BIT_ENDIAN 2 =20 #define MEDIA_FMT_ID_PCM 0x09001000 +#define MEDIA_FMT_ID_MP3 0x09001009 #define PCM_CHANNEL_L 1 #define PCM_CHANNEL_R 2 #define SAMPLE_RATE_48K 48000 @@ -231,6 +234,28 @@ struct apm_media_format { uint32_t payload_size; } __packed; =20 +#define MEDIA_FMT_ID_FLAC 0x09001004 + +struct payload_media_fmt_flac_t { + uint16_t num_channels; + uint16_t sample_size; + uint16_t min_blk_size; + uint16_t max_blk_size; + uint32_t sample_rate; + uint32_t min_frame_size; + uint32_t max_frame_size; +} __packed; + +#define MEDIA_FMT_ID_AAC 0x09001001 + +struct payload_media_fmt_aac_t { + uint16_t aac_fmt_flag; + uint16_t audio_obj_type; + uint16_t num_channels; + uint16_t total_size_of_PCE_bits; + uint32_t sample_rate; +} __packed; + #define DATA_CMD_WR_SH_MEM_EP_EOS 0x04001002 #define WR_SH_MEM_EP_EOS_POLICY_LAST 1 #define WR_SH_MEM_EP_EOS_POLICY_EACH 2 @@ -730,6 +755,7 @@ struct audioreach_module_config { u32 channel_allocation; u32 sd_line_mask; int fmt; + struct snd_codec codec; u8 channel_map[AR_PCM_MAX_NUM_CHANNEL]; }; =20 @@ -768,4 +794,6 @@ int audioreach_gain_set_vol_ctrl(struct q6apm *apm, struct audioreach_module *module, int vol); int audioreach_send_u32_param(struct q6apm_graph *graph, struct audioreach= _module *module, uint32_t param_id, uint32_t param_val); +int audioreach_compr_set_param(struct q6apm_graph *graph, struct audioreac= h_module_config *mcfg); + #endif /* __AUDIOREACH_H__ */ diff --git a/sound/soc/qcom/qdsp6/q6apm-dai.c b/sound/soc/qcom/qdsp6/q6apm-= dai.c index 7f02f5b2c33f..9fff41ee98eb 100644 --- a/sound/soc/qcom/qdsp6/q6apm-dai.c +++ b/sound/soc/qcom/qdsp6/q6apm-dai.c @@ -155,6 +155,7 @@ static int q6apm_dai_prepare(struct snd_soc_component *= component, cfg.sample_rate =3D runtime->rate; cfg.num_channels =3D runtime->channels; cfg.bit_width =3D prtd->bits_per_sample; + cfg.fmt =3D SND_AUDIOCODEC_PCM; =20 if (prtd->state) { /* clear the previous setup if any */ --=20 2.21.0