From nobody Tue Feb 10 06:27:15 2026 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4BA71330B12 for ; Thu, 13 Nov 2025 08:25:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763022359; cv=none; b=PEcqJ6qUm5uDqV/k4/OybptvHNccdOHNeDWo4c73x1zhsUCoYvTSGU4KF/8VXjs/oEuOYK3lb2Bqx9ji8y6zd5z8fEDSc9fcCUVQPLyv8i/9wSEvxyZ7XffUi7Xt0QSReOQoXdSo3M6IhYjVrfTLbFNiI9TY/UUBtwHdlFhFPos= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763022359; c=relaxed/simple; bh=Vvo09bFq8tEaP1B5nFoGfs/9TqliMjuKbCECXkO5VIQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M4zUBd5iAVxwzHtnRHEf0vBPZL9nsjTfkvtKL/7bBq68eHhqySH5qj8lwXL1dHKojPkw0vohLQgPBxKrYJHWepFocxVJZ3FblE6YFc7VIzZWm3y3nk+YN6g450OQryaLPyw2h52pJTGP8nm6i2Q2Az3xvIt9e+VPflsYrBljRds= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BeAeo5ll; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BeAeo5ll" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-47754e9cc7fso3038205e9.2 for ; Thu, 13 Nov 2025 00:25:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763022356; x=1763627156; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fEgvbUe/SG9kBJT2lT+vOW4S6Qvv1BIswGeH2rkA3IU=; b=BeAeo5llKhjTG1m+stMMWqFziKWB1dPYlN9uogyteIiKyz0F6ZROlZK7Dn0Bqyu/sn i+l+KYgeubt4SlBuZctHkaZW0cQX1Ex93vxd+3VabqWk7xNjZXx0gKCQk9twbsCBSt78 Qve66JfBwWFaU81a755i3YyUy1XFle1fUWra6BcHEhMr1r7NFNfnVXro8wcJGY7qEtif f7jWDaeGfw7rmxfgzwEbqQG+D15d9kfx8XgzSkkPPSTWSBcbgcPeGBulFlc2Qh++6pyg ukB3vds0G468Zng+n2069IOPJbhEeOo8LhZa+XG6rwrSjzglSY3lw/VWoQL1rM48oC+1 83ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763022356; x=1763627156; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fEgvbUe/SG9kBJT2lT+vOW4S6Qvv1BIswGeH2rkA3IU=; b=r9oVuA5q2Vvk2JJPZsK0tGBmszUiU/QkMzaO9SIGnCfd/TV/cWXTw125NkuO2VKAbn aVVeCfbPxZVZa6+gRMzuG4wZyarsu2P5yc8WsNj3ZIZ85wCERQ4YCX8qJIP4HG3o4Yq8 KgY/FTioHlYx5I4gPA+9IPuHn7OqE4JZG0oVDNEN4vpp+i8+GY4FdHFvwJAyHqnrahL2 BmN9e2/UiilCO+HkqaVUDU0YVU6nudlU0Ect+iOxq5uCjYZvPu8ALHl/0aW0NbI+ApML AEdmum8c47Z7UiBS4WUS2M+wN9evyTmEC1sFK4dzipkibJPmF154RsTWCpyZCfIOSFkv rpFA== X-Forwarded-Encrypted: i=1; AJvYcCUfql9oAn/jY6eBnSToNqk6tRi+cOhc+LYuDBDmVyxoZNURYL0VE2Jxnr5GSusxuQAiBQ+Zlr4g3l7Obok=@vger.kernel.org X-Gm-Message-State: AOJu0YwFaW+4sglEgVeEC+ntzPW/BXWeM+vbIOYKlgslZaS5uCDwVCAi pKEUN40X38K2nFsG+Tgsf5nuXVFOitEbvgKTRDXSOD0PqrOdzccu1cX/ X-Gm-Gg: ASbGncsrKKHgco6IycMoTWtEjE8Yy5sOQkF20yaZUxkwk1H2YfYgN4W8MQHWpyBY5Bv F4QEMTmLmDdc1TYBCdeJG+JouRejDK5JH+vbh7qQCzCryL/+UNMaFVaOgSgRi539ZMMkyORQMhD 9fvk6u6dVdZztuf6AfTBTbFyDftrkqMXOtQ/TlAx+zmSH7YUouHqXOSfyaL0ke6g76Ov8VzCi9p TwIWFagohBdDGeEWULIHTMcCC7idUhV02CpY11b8+SU5PUOORiDvq43y/64R4U0ABWNGKEqneCz 5oEgV8MfiXb2MeQqa8xOnR8BQsj07VzK4Lbh1JjkD/dyNnaAHYH8eRvhgRvdN1PoBh6EGaGYr5a gTfnplgwwtgARTzaeWEnuVO13O57WQlRA3V7Po6yayglJ3Zn9O740hdzsPcXwyuzUeqZDBCpQ0Q qpmaAAQEgQgzGQrBrcb92yaqd29ar2yCjDTwLBnkblJO+qfqvcShrBmgObGRjRs6mZolpSkLs= X-Google-Smtp-Source: AGHT+IEh987VFOInqDaiE4dQokzyddzRnJWtVtXv0/enIYKH97ZJzm5R8OJ0GWVJzZF60mkUQh0k8A== X-Received: by 2002:a05:600c:4fc9:b0:477:5b0a:e616 with SMTP id 5b1f17b1804b1-47787071649mr49869865e9.5.1763022355600; Thu, 13 Nov 2025 00:25:55 -0800 (PST) Received: from biju.lan (host86-162-200-138.range86-162.btcentralplus.com. [86.162.200.138]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4778bb34295sm15214435e9.2.2025.11.13.00.25.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Nov 2025 00:25:55 -0800 (PST) From: Biju X-Google-Original-From: Biju To: Biju Das , Lad Prabhakar , Kuninori Morimoto , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: linux-sound@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Biju Das , stable@kernel.org Subject: [PATCH v2 2/2] ASoC: renesas: rz-ssi: Fix rz_ssi_priv::hw_params_cache::sample_width Date: Thu, 13 Nov 2025 08:25:47 +0000 Message-ID: <20251113082551.99595-3-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113082551.99595-1-biju.das.jz@bp.renesas.com> References: <20251113082551.99595-1-biju.das.jz@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Biju Das 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: 4f8cd05a4305 ("ASoC: sh: rz-ssi: Add full duplex support") Reviewed-by: Kuninori Morimoto Signed-off-by: Biju Das --- v1->v2: * Collected Rb tag from Morimoto-san --- sound/soc/renesas/rz-ssi.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/sound/soc/renesas/rz-ssi.c b/sound/soc/renesas/rz-ssi.c index 86a6b4eff210..b5715e7318a4 100644 --- a/sound/soc/renesas/rz-ssi.c +++ b/sound/soc/renesas/rz-ssi.c @@ -13,6 +13,7 @@ #include #include #include +#include #include =20 /* 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 descr= iptor. */ int period_counter; /* for keeping track of periods transferred */ - int sample_width; int buffer_pos; /* current frame position in the buffer */ int running; /* 0=3Dstopped, 1=3Drunning */ =20 @@ -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 =3D substream->runtime; - rz_ssi_set_substream(strm, substream); - strm->sample_width =3D samples_to_bytes(runtime, 1); strm->dma_buffer_pos =3D 0; strm->completed_dma_buf_pos =3D 0; strm->period_counter =3D 0; @@ -980,9 +977,9 @@ static int rz_ssi_dai_hw_params(struct snd_pcm_substrea= m *substream, struct snd_soc_dai *dai) { struct rz_ssi_priv *ssi =3D snd_soc_dai_get_drvdata(dai); - struct rz_ssi_stream *strm =3D rz_ssi_stream_get(ssi, substream); unsigned int sample_bits =3D hw_param_interval(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS)->min; + unsigned int sample_width =3D params_width(params); unsigned int channels =3D params_channels(params); unsigned int rate =3D params_rate(params); int ret; @@ -1001,16 +998,14 @@ static int rz_ssi_dai_hw_params(struct snd_pcm_subst= ream *substream, =20 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; =20 dev_err(ssi->dev, "Full duplex needs same HW params\n"); return -EINVAL; } =20 - 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); =20 ret =3D rz_ssi_swreset(ssi); if (ret) --=20 2.43.0