[PATCH v3] ASoC: qcom: audioreach: support multichannel PCM formats
From: Zhangfei Gao
Date: Tue Oct 27 2026 - 22:48:16 EST
AudioReach currently rejects PCM streams with more than four channels in
the PCM and shared-memory media format paths.
This prevents TDM links that expose more channels, such as the 6-channel
playback path used on SA8797P Ride, from being configured.
Reuse q6dsp_map_channels() to support multichannel PCM formats and use
the common PCM channel limit definition.
Signed-off-by: Zhangfei Gao <zhangfei.gao@xxxxxxxxxxxxxxxx>
Reviewed-by: Prasad Kumpatla <prasad.kumpatla@xxxxxxxxxxxxxxxx>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxxxxxxxx>
---
v3: reuse PCM_MAX_NUM_CHANNEL to replace AR_PCM_MAX_NUM_CHANNEL (Srinivas)
v2: reuse q6dsp_map_channels
sound/soc/qcom/qdsp6/audioreach.c | 36 ++++---------------------
sound/soc/qcom/qdsp6/audioreach.h | 5 ++--
sound/soc/qcom/qdsp6/q6apm-dai.c | 12 ++++++---
sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 11 +++++---
4 files changed, 24 insertions(+), 40 deletions(-)
diff --git a/sound/soc/qcom/qdsp6/audioreach.c b/sound/soc/qcom/qdsp6/audioreach.c
index d2dc5d37bccf..e6f077a5b750 100644
--- a/sound/soc/qcom/qdsp6/audioreach.c
+++ b/sound/soc/qcom/qdsp6/audioreach.c
@@ -306,22 +306,6 @@ void *audioreach_alloc_apm_cmd_pkt(int pkt_size, uint32_t opcode, uint32_t token
}
EXPORT_SYMBOL_GPL(audioreach_alloc_apm_cmd_pkt);
-void audioreach_set_default_channel_mapping(u8 *ch_map, int num_channels)
-{
- if (num_channels == 1) {
- ch_map[0] = PCM_CHANNEL_FL;
- } else if (num_channels == 2) {
- ch_map[0] = PCM_CHANNEL_FL;
- ch_map[1] = PCM_CHANNEL_FR;
- } else if (num_channels == 4) {
- ch_map[0] = PCM_CHANNEL_FL;
- ch_map[1] = PCM_CHANNEL_FR;
- ch_map[2] = PCM_CHANNEL_LS;
- ch_map[3] = PCM_CHANNEL_RS;
- }
-}
-EXPORT_SYMBOL_GPL(audioreach_set_default_channel_mapping);
-
static void apm_populate_container_config(struct apm_container_obj *cfg,
const struct audioreach_container *cont)
{
@@ -760,7 +744,7 @@ static int audioreach_codec_dma_set_media_format(struct q6apm_graph *graph,
intf_cfg->cfg.intf_index = module->hw_interface_idx;
intf_cfg->cfg.active_channels_mask = 0;
/* Convert the physical channel mapping into a bit field */
- for (i = 0; i < AR_PCM_MAX_NUM_CHANNEL; i++)
+ for (i = 0; i < PCM_MAX_NUM_CHANNEL; i++)
if (cfg->channel_map[i])
intf_cfg->cfg.active_channels_mask |= BIT(i);
@@ -883,7 +867,7 @@ static int audioreach_mfc_set_media_format(struct q6apm_graph *graph,
media_format->bit_width = cfg->bit_width;
media_format->num_channels = cfg->num_channels;
/* Convert the physical mapping to a logical mapping of the channels */
- for (i = 0, j = 0; i < AR_PCM_MAX_NUM_CHANNEL && j < cfg->num_channels; i++) {
+ for (i = 0, j = 0; i < PCM_MAX_NUM_CHANNEL && j < cfg->num_channels; i++) {
if (!cfg->channel_map[i])
continue;
media_format->channel_mapping[j++] = cfg->channel_map[i];
@@ -1185,11 +1169,6 @@ static int audioreach_pcm_set_media_format(struct q6apm_graph *graph,
int payload_size;
int i, j;
- if (num_channels > 4) {
- dev_err(graph->dev, "Error: Invalid channels (%d)!\n", num_channels);
- return -EINVAL;
- }
-
payload_size = APM_PCM_MODULE_FMT_CMD_PSIZE(num_channels);
struct gpr_pkt *pkt __free(kfree) =
@@ -1218,7 +1197,7 @@ static int audioreach_pcm_set_media_format(struct q6apm_graph *graph,
media_cfg->q_factor = mcfg->bit_width - 1;
media_cfg->bits_per_sample = mcfg->bit_width;
/* Convert the physical mapping to a logical mapping of the channels */
- for (i = 0, j = 0; i < AR_PCM_MAX_NUM_CHANNEL && j < mcfg->num_channels; i++) {
+ for (i = 0, j = 0; i < PCM_MAX_NUM_CHANNEL && j < mcfg->num_channels; i++) {
if (!mcfg->channel_map[i])
continue;
media_cfg->channel_mapping[j++] = mcfg->channel_map[i];
@@ -1275,11 +1254,6 @@ static int audioreach_shmem_set_media_format(struct q6apm_graph *graph,
int i, j;
void *p;
- if (num_channels > 4) {
- dev_err(graph->dev, "Error: Invalid channels (%d)!\n", num_channels);
- return -EINVAL;
- }
-
payload_size = APM_SHMEM_FMT_CFG_PSIZE(num_channels) + APM_MODULE_PARAM_DATA_SIZE;
struct gpr_pkt *pkt __free(kfree) =
@@ -1313,7 +1287,7 @@ static int audioreach_shmem_set_media_format(struct q6apm_graph *graph,
cfg->endianness = PCM_LITTLE_ENDIAN;
cfg->num_channels = mcfg->num_channels;
/* Convert the physical mapping to a logical mapping of the channels */
- for (i = 0, j = 0; i < AR_PCM_MAX_NUM_CHANNEL && j < cfg->num_channels; i++) {
+ for (i = 0, j = 0; i < PCM_MAX_NUM_CHANNEL && j < cfg->num_channels; i++) {
if (!mcfg->channel_map[i])
continue;
cfg->channel_mapping[j++] = mcfg->channel_map[i];
@@ -1436,7 +1410,7 @@ static int audioreach_speaker_protection_vi(struct q6apm_graph *graph,
cm_cfg->cfg.num_channels = num_channels * 2;
/* Convert the physical mapping to a logical mapping of the channels */
- for (i = 0, j = 0; i < AR_PCM_MAX_NUM_CHANNEL && j < num_channels; i++) {
+ for (i = 0, j = 0; i < PCM_MAX_NUM_CHANNEL && j < num_channels; i++) {
if (!mcfg->channel_map[i])
continue;
/*
diff --git a/sound/soc/qcom/qdsp6/audioreach.h b/sound/soc/qcom/qdsp6/audioreach.h
index 587f14ce71d2..9f4166ebdc10 100644
--- a/sound/soc/qcom/qdsp6/audioreach.h
+++ b/sound/soc/qcom/qdsp6/audioreach.h
@@ -6,6 +6,7 @@
#include <linux/soc/qcom/apr.h>
#include <uapi/sound/snd_ar_tokens.h>
#include <sound/soc.h>
+#include "q6dsp-common.h"
struct q6apm;
struct q6apm_graph;
@@ -805,7 +806,6 @@ struct param_id_hw_ep_power_mode_cfg {
#define PARAM_ID_HW_EP_DMA_DATA_ALIGN 0x08001233
#define AR_HW_EP_DMA_DATA_ALIGN_MSB 0
#define AR_HW_EP_DMA_DATA_ALIGN_LSB 1
-#define AR_PCM_MAX_NUM_CHANNEL 8
struct param_id_hw_ep_dma_data_align {
uint32_t dma_data_align;
@@ -998,7 +998,7 @@ struct audioreach_module_config {
u16 nslots_per_frame;
u16 slot_width;
struct snd_codec codec;
- u8 channel_map[AR_PCM_MAX_NUM_CHANNEL];
+ u8 channel_map[PCM_MAX_NUM_CHANNEL];
};
/* Packet Allocation routines */
@@ -1009,7 +1009,6 @@ static inline u16 audioreach_gpr_dest_domain(gpr_device_t *gdev)
void *audioreach_alloc_apm_cmd_pkt(int pkt_size, uint32_t opcode,
uint32_t token);
-void audioreach_set_default_channel_mapping(u8 *ch_map, int num_channels);
void *audioreach_alloc_cmd_pkt(int payload_size, uint32_t opcode,
uint32_t token, uint32_t src_port,
uint32_t dest_port);
diff --git a/sound/soc/qcom/qdsp6/q6apm-dai.c b/sound/soc/qcom/qdsp6/q6apm-dai.c
index 58beaf906b9f..83594b693569 100644
--- a/sound/soc/qcom/qdsp6/q6apm-dai.c
+++ b/sound/soc/qcom/qdsp6/q6apm-dai.c
@@ -21,6 +21,7 @@
#include <asm/div64.h>
#include <asm/dma.h>
#include "q6apm.h"
+#include "q6dsp-common.h"
#define DRV_NAME "q6apm-dai"
#define POS_BUFFER_BYTES 4096
@@ -344,7 +345,10 @@ static int q6apm_dai_prepare(struct snd_soc_component *component,
cfg.num_channels = runtime->channels;
cfg.bit_width = prtd->bits_per_sample;
cfg.fmt = SND_AUDIOCODEC_PCM;
- audioreach_set_default_channel_mapping(cfg.channel_map, runtime->channels);
+ ret = q6dsp_map_channels(cfg.channel_map, runtime->channels);
+ if (ret)
+ return ret;
+
if (prtd->state) {
/* clear the previous setup if any */
q6apm_graph_stop(prtd->graph);
@@ -1007,8 +1011,10 @@ static int q6apm_dai_compr_set_params(struct snd_soc_component *component,
cfg.num_channels = 2;
cfg.bit_width = prtd->bits_per_sample;
cfg.fmt = codec->id;
- audioreach_set_default_channel_mapping(cfg.channel_map,
- cfg.num_channels);
+ ret = q6dsp_map_channels(cfg.channel_map, cfg.num_channels);
+ if (ret)
+ return ret;
+
memcpy(&cfg.codec, codec, sizeof(*codec));
ret = q6apm_graph_media_format_shmem(prtd->graph, &cfg);
diff --git a/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c b/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c
index 83f2711bceea..9a3994a4f475 100644
--- a/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c
+++ b/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c
@@ -94,7 +94,7 @@ static int q6dma_set_channel_map(struct snd_soc_dai *dai,
return -EINVAL;
}
- if (tx_num > AR_PCM_MAX_NUM_CHANNEL) {
+ if (tx_num > PCM_MAX_NUM_CHANNEL) {
dev_err(dai->dev, "invalid tx num %d\n",
tx_num);
return -EINVAL;
@@ -147,7 +147,9 @@ static int q6hdmi_hw_params(struct snd_pcm_substream *substream,
cfg->bit_width = params_width(params);
cfg->sample_rate = params_rate(params);
cfg->num_channels = channels;
- audioreach_set_default_channel_mapping(cfg->channel_map, channels);
+ ret = q6dsp_map_channels(cfg->channel_map, channels);
+ if (ret)
+ return ret;
switch (dai->id) {
case DISPLAY_PORT_RX_0:
@@ -173,11 +175,14 @@ static int q6dma_hw_params(struct snd_pcm_substream *substream,
struct q6apm_lpass_dai_data *dai_data = dev_get_drvdata(dai->dev);
struct audioreach_module_config *cfg = &dai_data->module_config[dai->id];
int channels = hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_CHANNELS)->max;
+ int ret;
cfg->bit_width = params_width(params);
cfg->sample_rate = params_rate(params);
cfg->num_channels = channels;
- audioreach_set_default_channel_mapping(cfg->channel_map, channels);
+ ret = q6dsp_map_channels(cfg->channel_map, channels);
+ if (ret)
+ return ret;
return 0;
}
--
2.43.0