Skip to content

Commit a28217b

Browse files
Srinivas-Kandagatlagregkh
authored andcommitted
ASoC: q6apm-dai: make use of q6apm_get_hw_pointer
commit a93dad6 upstream. With the existing code, the buffer position is only reset in pointer callback, which leaves the possiblity of it going over the size of buffer size and reporting incorrect position to userspace. Without this patch, its possible to see errors like: snd-x1e80100 sound: invalid position: pcmC0D0p:0, pos = 12288, buffer size = 12288, period size = 1536 snd-x1e80100 sound: invalid position: pcmC0D0p:0, pos = 12288, buffer size = 12288, period size = 1536 Fixes: 9b4fe0f ("ASoC: qdsp6: audioreach: add q6apm-dai support") Cc: stable@vger.kernel.org Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Tested-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Tested-by: Johan Hovold <johan+linaro@kernel.org> Link: https://patch.msgid.link/20250314174800.10142-4-srinivas.kandagatla@linaro.org Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent f5891f2 commit a28217b

File tree

1 file changed

+4
-19
lines changed

1 file changed

+4
-19
lines changed

sound/soc/qcom/qdsp6/q6apm-dai.c

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ struct q6apm_dai_rtd {
6464
phys_addr_t phys;
6565
unsigned int pcm_size;
6666
unsigned int pcm_count;
67-
unsigned int pos; /* Buffer position */
6867
unsigned int periods;
6968
unsigned int bytes_sent;
7069
unsigned int bytes_received;
@@ -124,23 +123,16 @@ static void event_handler(uint32_t opcode, uint32_t token, void *payload, void *
124123
{
125124
struct q6apm_dai_rtd *prtd = priv;
126125
struct snd_pcm_substream *substream = prtd->substream;
127-
unsigned long flags;
128126

129127
switch (opcode) {
130128
case APM_CLIENT_EVENT_CMD_EOS_DONE:
131129
prtd->state = Q6APM_STREAM_STOPPED;
132130
break;
133131
case APM_CLIENT_EVENT_DATA_WRITE_DONE:
134-
spin_lock_irqsave(&prtd->lock, flags);
135-
prtd->pos += prtd->pcm_count;
136-
spin_unlock_irqrestore(&prtd->lock, flags);
137132
snd_pcm_period_elapsed(substream);
138133

139134
break;
140135
case APM_CLIENT_EVENT_DATA_READ_DONE:
141-
spin_lock_irqsave(&prtd->lock, flags);
142-
prtd->pos += prtd->pcm_count;
143-
spin_unlock_irqrestore(&prtd->lock, flags);
144136
snd_pcm_period_elapsed(substream);
145137
if (prtd->state == Q6APM_STREAM_RUNNING)
146138
q6apm_read(prtd->graph);
@@ -247,7 +239,6 @@ static int q6apm_dai_prepare(struct snd_soc_component *component,
247239
}
248240

249241
prtd->pcm_count = snd_pcm_lib_period_bytes(substream);
250-
prtd->pos = 0;
251242
/* rate and channels are sent to audio driver */
252243
ret = q6apm_graph_media_format_shmem(prtd->graph, &cfg);
253244
if (ret < 0) {
@@ -445,16 +436,12 @@ static snd_pcm_uframes_t q6apm_dai_pointer(struct snd_soc_component *component,
445436
struct snd_pcm_runtime *runtime = substream->runtime;
446437
struct q6apm_dai_rtd *prtd = runtime->private_data;
447438
snd_pcm_uframes_t ptr;
448-
unsigned long flags;
449439

450-
spin_lock_irqsave(&prtd->lock, flags);
451-
if (prtd->pos == prtd->pcm_size)
452-
prtd->pos = 0;
453-
454-
ptr = bytes_to_frames(runtime, prtd->pos);
455-
spin_unlock_irqrestore(&prtd->lock, flags);
440+
ptr = q6apm_get_hw_pointer(prtd->graph, substream->stream) * runtime->period_size;
441+
if (ptr)
442+
return ptr - 1;
456443

457-
return ptr;
444+
return 0;
458445
}
459446

460447
static int q6apm_dai_hw_params(struct snd_soc_component *component,
@@ -669,8 +656,6 @@ static int q6apm_dai_compr_set_params(struct snd_soc_component *component,
669656
prtd->pcm_size = runtime->fragments * runtime->fragment_size;
670657
prtd->bits_per_sample = 16;
671658

672-
prtd->pos = 0;
673-
674659
if (prtd->next_track != true) {
675660
memcpy(&prtd->codec, codec, sizeof(*codec));
676661

0 commit comments

Comments
 (0)