ASoC: Intel: Atom: read timestamp moved to period_elapsed
Subsystems (3)
PATCH 1/1 ASoC: Intel: Atom: read timestamp moved to period_elapsed
sst_platform_pcm_pointer is called from both snd_pcm_period_elapsed and from snd_pcm_ioctl. Calling read timestamp results in recalculating pcm_delay and buffer_ptr (sst_calc_tstamp) which consumes buffers in a faster rate than intended.
In a tested BSW system with chtrt5650, for a rate of 48000, the measured rate was sometimes 10 times more than that.
After moving the timestamp read to period elapsed, buffer consumption is as expected.
--- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 23 +++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-)
sound/soc/intel/atom/sst-mfld-platform-pcm.c +15 -8
@@ -265,16 +265,28 @@ static void sst_period_elapsed(void *arg) {struct snd_pcm_substream *substream = arg;struct sst_runtime_stream *stream; -int status; +struct snd_soc_pcm_runtime *rtd; +int status, ret_val;if (!substream || !substream->runtime)return ; stream = substream->runtime->private_data;if (!stream)return ; + + rtd = substream->private_data; +if (!rtd) +return ; + status =sst_get_stream_status (stream);if (status !=SST_PLATFORM_RUNNING )return ; + + ret_val = stream->ops->stream_read_tstamp (sst->dev, &stream->stream_info); +if (ret_val) { +dev_err (rtd->dev,"stream_read_tstamp err code = %d\n" , ret_val); +return ; + }snd_pcm_period_elapsed (substream); }
@@ -658,20 +670,15 @@ static snd_pcm_uframes_t sst_platform_pcm_pointer (struct snd_pcm_substream *substream) { struct sst_runtime_stream *stream; -int ret_val, status; +int status;struct pcm_stream_info *str_info; -struct snd_soc_pcm_runtime *rtd = substream->private_data; stream = substream->runtime->private_data; status =sst_get_stream_status (stream);if (status ==SST_PLATFORM_INIT )return 0 ; + str_info = &stream->stream_info; - ret_val = stream->ops->stream_read_tstamp (sst->dev, str_info); -if (ret_val) { -dev_err (rtd->dev,"sst: error code = %d\n" , ret_val); -return ret_val; - } substream->runtime->delay = str_info->pcm_delay;return str_info->buffer_ptr; }
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
Quoted 10 lines · Alex Levin
sst_platform_pcm_pointeris called from bothsnd_pcm_period_elapsedand fromsnd_pcm_ioctl. Calling read timestamp results in recalculatingpcm_delayandbuffer_ptr(sst_calc_tstamp) which consumes buffers in a faster rate than intended.
In a tested BSW system with chtrt5650, for a rate of 48000, the measured rate was sometimes 10 times more than that.
After moving the timestamp read to period elapsed, buffer consumption is as expected.From code prospective it looks good. You may take mine
Though I'm not an expert in the area, Pierre and / or Liam should give their blessing.
Quoted 66 lines
Signed-off-by Alex Levin <[email protected]>--- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 23 +++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-)sound/soc/intel/atom/sst-mfld-platform-pcm.c +15
-8@@ -265,16 +265,28 @@ static void sst_period_elapsed(void *arg) {struct snd_pcm_substream *substream = arg;struct sst_runtime_stream *stream; -int status; +struct snd_soc_pcm_runtime *rtd; +int status, ret_val;if (!substream || !substream->runtime)return ; stream = substream->runtime->private_data;if (!stream)return ; + + rtd = substream->private_data; +if (!rtd) +return ; + status =sst_get_stream_status (stream);if (status !=SST_PLATFORM_RUNNING )return ; + + ret_val = stream->ops->stream_read_tstamp (sst->dev, &stream->stream_info); +if (ret_val) { +dev_err (rtd->dev,"stream_read_tstamp err code = %d\n" , ret_val); +return ; + }snd_pcm_period_elapsed (substream); }@@ -658,20 +670,15 @@ static snd_pcm_uframes_t sst_platform_pcm_pointer (struct snd_pcm_substream *substream) { struct sst_runtime_stream *stream; -int ret_val, status; +int status;struct pcm_stream_info *str_info; -struct snd_soc_pcm_runtime *rtd = substream->private_data; stream = substream->runtime->private_data; status =sst_get_stream_status (stream);if (status ==SST_PLATFORM_INIT )return 0 ; + str_info = &stream->stream_info; - ret_val = stream->ops->stream_read_tstamp (sst->dev, str_info); -if (ret_val) { -dev_err (rtd->dev,"sst: error code = %d\n" , ret_val); -return ret_val; - } substream->runtime->delay = str_info->pcm_delay;return str_info->buffer_ptr; }Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
Signature · 2 lines
With Best Regards, Andy Shevchenko
Curtis Malainey
Reviewed-byQuoted 11 lines · Andy Shevchenko
Quoted 8 lines · Alex Levin
sst_platform_pcm_pointeris called from bothsnd_pcm_period_elapsedand fromsnd_pcm_ioctl. Calling read timestamp results in recalculatingpcm_delayandbuffer_ptr(sst_calc_tstamp) which consumes buffers in a faster rate than intended.
In a tested BSW system with chtrt5650, for a rate of 48000, the measured rate was sometimes 10 times more than that.
After moving the timestamp read to period elapsed, buffer consumption is as expected.
Quoted 6 lines
From code prospective it looks good. You may take mine
Reviewed-by Andy Shevchenko <[email protected]>Though I'm not an expert in the area, Pierre and / or Liam should give their blessing.
Agreed, Liam or Pierre should also give their ok since this is one of the closed source firmware drivers.
Quoted 72 lines
Quoted 64 lines
Signed-off-by Alex Levin <[email protected]>--- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 23 +++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-)sound/soc/intel/atom/sst-mfld-platform-pcm.c +15
-9@@ -265,16 +265,28 @@ static void sst_period_elapsed(void *arg) {struct snd_pcm_substream *substream = arg;struct sst_runtime_stream *stream; -int status; +struct snd_soc_pcm_runtime *rtd; +int status, ret_val;if (!substream || !substream->runtime)return ; stream = substream->runtime->private_data;if (!stream)return ; + + rtd = substream->private_data; +if (!rtd) +return ; + status =sst_get_stream_status (stream);if (status !=SST_PLATFORM_RUNNING )return ; + + ret_val = stream->ops->stream_read_tstamp (sst->dev, &stream->stream_info); +if (ret_val) { +dev_err (rtd->dev,"stream_read_tstamp err code = %d\n" , ret_val); +return ; + }snd_pcm_period_elapsed (substream); }@@ -658,20 +670,15 @@ static snd_pcm_uframes_t sst_platform_pcm_pointer (struct snd_pcm_substream *substream) { struct sst_runtime_stream *stream; -int ret_val, status; +int status;struct pcm_stream_info *str_info; -struct snd_soc_pcm_runtime *rtd = substream->private_data; stream = substream->runtime->private_data; status =sst_get_stream_status (stream);if (status ==SST_PLATFORM_INIT )return 0 ; + str_info = &stream->stream_info; - ret_val = stream->ops->stream_read_tstamp (sst->dev, str_info); -if (ret_val) { -dev_err (rtd->dev,"sst: error code = %d\n" , ret_val); -return ret_val; - } substream->runtime->delay = str_info->pcm_delay;return str_info->buffer_ptr; } --Quoted 2 lines
2.22.0.410.gd8fdbe21b5-goog
--
With Best Regards,
Andy Shevchenko
Quoted 16 lines · Curtis Malainey
Quoted 14 lines · Andy Shevchenko
Quoted 8 lines · Alex Levin
sst_platform_pcm_pointeris called from bothsnd_pcm_period_elapsedand fromsnd_pcm_ioctl. Calling read timestamp results in recalculatingpcm_delayandbuffer_ptr(sst_calc_tstamp) which consumes buffers in a faster rate than intended.
In a tested BSW system with chtrt5650, for a rate of 48000, the measured rate was sometimes 10 times more than that.
After moving the timestamp read to period elapsed, buffer consumption is as expected.From code prospective it looks good. You may take mine
Reviewed-by Andy Shevchenko <[email protected]>
Quoted 7 lines
Quoted 3 lines
Though I'm not an expert in the area, Pierre and / or Liam should give their blessing.
Agreed, Liam or Pierre should also give their ok since this is one of the closed source firmware drivers.
Reviewed-by Curtis Malainey <[email protected]>
Humm, this first review after my Summer break isn't straightforward.
By moving the timestamp update to the period elapsed event, don't you prevent the use of this driver in no-interrupt mode - which I understood as the baseline for Chrome?
And I also don't get how this timestamp might lead to 10x speed issues, this driver has been around for a number of years and that specific error was never seen. What is different in this platform and can this be seen e.g. on a Cyan device?
Quoted 77 lines
Quoted 62 lines
Quoted 62 lines
Signed-off-by Alex Levin <[email protected]>--- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 23 +++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-)sound/soc/intel/atom/sst-mfld-platform-pcm.c +15
-8@@ -265,16 +265,28 @@ static void sst_period_elapsed(void *arg) {struct snd_pcm_substream *substream = arg;struct sst_runtime_stream *stream; -int status; +struct snd_soc_pcm_runtime *rtd; +int status, ret_val;if (!substream || !substream->runtime)return ; stream = substream->runtime->private_data;if (!stream)return ; + + rtd = substream->private_data; +if (!rtd) +return ; + status =sst_get_stream_status (stream);if (status !=SST_PLATFORM_RUNNING )return ; + + ret_val = stream->ops->stream_read_tstamp (sst->dev, &stream->stream_info); +if (ret_val) { +dev_err (rtd->dev,"stream_read_tstamp err code = %d\n" , ret_val); +return ; + }snd_pcm_period_elapsed (substream); }@@ -658,20 +670,15 @@ static snd_pcm_uframes_t sst_platform_pcm_pointer (struct snd_pcm_substream *substream) { struct sst_runtime_stream *stream; -int ret_val, status; +int status;struct pcm_stream_info *str_info; -struct snd_soc_pcm_runtime *rtd = substream->private_data; stream = substream->runtime->private_data; status =sst_get_stream_status (stream);if (status ==SST_PLATFORM_INIT )return 0 ; + str_info = &stream->stream_info; - ret_val = stream->ops->stream_read_tstamp (sst->dev, str_info); -if (ret_val) { -dev_err (rtd->dev,"sst: error code = %d\n" , ret_val); -return ret_val; - } substream->runtime->delay = str_info->pcm_delay;return str_info->buffer_ptr;Quoted 10 lines
Quoted 4 lines
sound/soc/intel/atom/sst-mfld-platform-pcm.c +0
-1} --2.22.0.410.gd8fdbe21b5-goog
--
With Best Regards,
Andy Shevchenko_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel