Unverified Commit 2bae7bed authored by Biju Das's avatar Biju Das Committed by Mark Brown
Browse files

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: 4f8cd05a ("ASoC: sh: rz-ssi: Add full duplex support")
Reviewed-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Link: https://patch.msgid.link/20251114073709.4376-3-biju.das.jz@bp.renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 52a52501

sound/soc/renesas/rz-ssi.c

+4 −9
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/module.h>

#include <linux/pm_runtime.h>

#include <linux/reset.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>



/* REGISTER OFFSET */
@@ -87,7 +88,6 @@ struct rz_ssi_stream { 
	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 period_counter;	/* for keeping track of periods transferred */

	int sample_width;

	int buffer_pos;		/* current frame position in the buffer */

	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,

			       struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;



	rz_ssi_set_substream(strm, substream);

	strm->sample_width = samples_to_bytes(runtime, 1);

	strm->dma_buffer_pos = 0;

	strm->completed_dma_buf_pos = 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 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,

					SNDRV_PCM_HW_PARAM_SAMPLE_BITS)->min;

	unsigned int sample_width = params_width(params);

	unsigned int channels = params_channels(params);

	unsigned int rate = params_rate(params);

	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) ||

	    rz_ssi_is_stream_running(&ssi->capture)) {

		if (rz_ssi_is_valid_hw_params(ssi, rate, channels,

					      strm->sample_width, sample_bits))

		if (rz_ssi_is_valid_hw_params(ssi, rate, channels, sample_width, sample_bits))

			return 0;



		dev_err(ssi->dev, "Full duplex needs same HW params\n");

		return -EINVAL;

	}



	rz_ssi_cache_hw_params(ssi, rate, channels, strm->sample_width,

			       sample_bits);

	rz_ssi_cache_hw_params(ssi, rate, channels, sample_width, sample_bits);



	ret = rz_ssi_swreset(ssi);

	if (ret)