superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: renesas: rz-ssi: Fix rz_ssi_priv::hw_params_cache::sample_width 

The strm->sample_width is not filled during rz_ssi_dai_hw_params(). This
wrong value is used for caching sample_width in struct hw_params_cache.
Fix this issue by replacing 'strm->sample_width'->'params_width(params)'
in rz_ssi_dai_hw_params(). After this drop the variable sample_width
from struct rz_ssi_stream as it is unused.

Cc: stable@kernel.org
Fixes: 4f8cd05a43 ("ASoC: sh: rz-ssi: Add full duplex support")
Reviewed-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://patch.msgid.link/20251114073709.4376-3-biju.das.jz@bp.renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
pull/1354/merge
Biju Das 2025-11-14 07:37:06 +00:00 committed by Mark Brown
parent 52a525011c
commit 2bae7beda1
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/soc/renesas/rz-ssi.c
View File

@ -13,6 +13,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/reset.h> #include <linux/reset.h>
#include <sound/pcm_params.h>
#include <sound/soc.h> #include <sound/soc.h>
/* REGISTER OFFSET */ /* REGISTER OFFSET */
@ -87,7 +88,6 @@ struct rz_ssi_stream {
int dma_buffer_pos; /* The address for the next DMA descriptor */ int dma_buffer_pos; /* The address for the next DMA descriptor */
int completed_dma_buf_pos; /* The address of the last completed DMA descriptor. */ int completed_dma_buf_pos; /* The address of the last completed DMA descriptor. */
int period_counter; /* for keeping track of periods transferred */ int period_counter; /* for keeping track of periods transferred */
int sample_width;
int buffer_pos; /* current frame position in the buffer */ int buffer_pos; /* current frame position in the buffer */
int running; /* 0=stopped, 1=running */ int running; /* 0=stopped, 1=running */
@ -217,10 +217,7 @@ static inline bool rz_ssi_is_stream_running(struct rz_ssi_stream *strm)
static void rz_ssi_stream_init(struct rz_ssi_stream *strm, static void rz_ssi_stream_init(struct rz_ssi_stream *strm,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
struct snd_pcm_runtime *runtime = substream->runtime;
rz_ssi_set_substream(strm, substream); rz_ssi_set_substream(strm, substream);
strm->sample_width = samples_to_bytes(runtime, 1);
strm->dma_buffer_pos = 0; strm->dma_buffer_pos = 0;
strm->completed_dma_buf_pos = 0; strm->completed_dma_buf_pos = 0;
strm->period_counter = 0; strm->period_counter = 0;
@ -978,9 +975,9 @@ static int rz_ssi_dai_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct rz_ssi_priv *ssi = snd_soc_dai_get_drvdata(dai); struct rz_ssi_priv *ssi = snd_soc_dai_get_drvdata(dai);
struct rz_ssi_stream *strm = rz_ssi_stream_get(ssi, substream);
unsigned int sample_bits = hw_param_interval(params, unsigned int sample_bits = hw_param_interval(params,
SNDRV_PCM_HW_PARAM_SAMPLE_BITS)->min; SNDRV_PCM_HW_PARAM_SAMPLE_BITS)->min;
unsigned int sample_width = params_width(params);
unsigned int channels = params_channels(params); unsigned int channels = params_channels(params);
unsigned int rate = params_rate(params); unsigned int rate = params_rate(params);
int ret; int ret;
@ -999,16 +996,14 @@ static int rz_ssi_dai_hw_params(struct snd_pcm_substream *substream,
if (rz_ssi_is_stream_running(&ssi->playback) || if (rz_ssi_is_stream_running(&ssi->playback) ||
rz_ssi_is_stream_running(&ssi->capture)) { rz_ssi_is_stream_running(&ssi->capture)) {
if (rz_ssi_is_valid_hw_params(ssi, rate, channels, if (rz_ssi_is_valid_hw_params(ssi, rate, channels, sample_width, sample_bits))
strm->sample_width, sample_bits))
return 0; return 0;
dev_err(ssi->dev, "Full duplex needs same HW params\n"); dev_err(ssi->dev, "Full duplex needs same HW params\n");
return -EINVAL; return -EINVAL;
} }
rz_ssi_cache_hw_params(ssi, rate, channels, strm->sample_width, rz_ssi_cache_hw_params(ssi, rate, channels, sample_width, sample_bits);
sample_bits);
ret = rz_ssi_swreset(ssi); ret = rz_ssi_swreset(ssi);
if (ret) if (ret)