From nobody Tue Feb 10 15:28:32 2026 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.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 B5C8827FD71 for ; Wed, 29 Oct 2025 14:11:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761747115; cv=none; b=ZuREBqx8W6cjW2a5PKkAWNSZJ93TQirxDeHXhRWlTWuJri62DtZ2thjdFa7ELi/Cxl+NxBG0BbRmAkosXlkQWCJU0Udu2TfHUxjwYMBQ0mmNnb9kFpSm1WATP/qItfWMs7kGkPlDIHiNq72eILj1RYTp5dHFP1l8NPmZAWEnTMY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761747115; c=relaxed/simple; bh=syzyZO/mJBKfFjprlnJbjqObQo3iQm+ErRfFxq3DXAg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=guPvz05M4n165YXl31B1871OpKs6Dadp8gpdsHjkGtVB4GvzSB1xCDAPeCHu1opwv9oMa+EXpFZf1aDEJpxVa0IhxjQBX/SB+OcNDkbSla/wiBi0QgUvibnzWySAGaZ5NFLWDriX1TIAX/T5AZkfkBhfw7OgB48Rrr5syNEmlv0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tuxon.dev; spf=pass smtp.mailfrom=tuxon.dev; dkim=pass (2048-bit key) header.d=tuxon.dev header.i=@tuxon.dev header.b=aLF0q0Oz; arc=none smtp.client-ip=209.85.221.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tuxon.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tuxon.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tuxon.dev header.i=@tuxon.dev header.b="aLF0q0Oz" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-42701b29a7eso601292f8f.0 for ; Wed, 29 Oct 2025 07:11:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1761747112; x=1762351912; 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=Mp6r0mmEiz+yEn07q0vDicoMrtrxWqGLSLuaBkcXGQs=; b=aLF0q0OzTId9NZLe36VsKpLHpZnT+JaFchqNfRd5UQeMwitv/AqoFAPIcCuYyEkplI eXyv/kAWNvzcjVD0JA/DVzbLAKp52WrUC/CmrXgPIMMPA2ElFZ0OvSKp3euqSOZy3kul xdHCGHtt+UyBxS/LJ82aWqmy0l0mE5B0/QTTeJxsD0cheCJV+3tuE3bd2/1r8qdzINk+ OCuQH6OqRrMY8NoJcvY9QwEyIdFRxTXqOsBLNLtHQZkoTFoVEWkhhxlfAiCGzuiIHJNx 2Pv5j6Gu3tpApdoWKor4/Fxd18DLWof6x5139r2gKQODR9ryHW/BnTGJALSSljyNneK+ pL8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761747112; x=1762351912; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Mp6r0mmEiz+yEn07q0vDicoMrtrxWqGLSLuaBkcXGQs=; b=vuAyM++R3Zx8KZMWbTyjN1ge7oc4rciRlH+nK3r7MJ3czzYenTb32PrOfhgg/SAiBy TnW/zETkchPCvIlm/Ti6aU+IxnbyPf2OUx7O3KdBA5z0eOF2zCvSU1jYWTUhb+smOHqb kXHC7Tqfw6zAANyEP9dCTmyuKZJ6TSSlS8oqLvClGrJxHhMcyBgb4EP+R+HQpxeUeye9 iM32oy/2klp3hhq0xhZ1cFfKiusXPLNkHmTVYfb3frGyIGwKz51Tpi/ebd/TARdGazsG pS8rL/68EXDckkGfkP7ds6qbFpkrdq2fychOWkCdGnwkoDwULsTGc6JfyyTumPbOZfb2 jo7Q== X-Forwarded-Encrypted: i=1; AJvYcCVgpBkRGyUYFokh9U9WydroM7tzN3z25SK38NbIJVpbbQ6/FGc1jLFXveafPJ9vmX7HCwWNLaUXJwlxlfM=@vger.kernel.org X-Gm-Message-State: AOJu0YzVIBJVzdH1eztwhYTxwOVPPkRZV6wrurWgh7LllK1f0Uly/CcE 0NNdlYmQllRL9tbZt0rRyANke8ryx6MbqM+lRRvmW0hfUoQKjoB15IVXcEqccMEiAGc= X-Gm-Gg: ASbGnctJE5QkNL7CysnibZKMtvfVPlhaK8p/iGxiPZOfKO9GW/UidLkrMGMCbKb+FjF xVGUyGLbXeaKT7+vtAO+c8y4PIGExXB0hD71IhF9MadDqEq5ZaEY90LH9w2BFISajVhrOCl65qE O/dfgp4R7hNob4ZBzdxgux2GLn/QYKPVMCDpzQPgeKvBjuR4Ssr8nDoZ7UAP34JsgOUUBWZLamg d/JKsBZ1ALr1jSuR5cf4vE8Pj6lmtcKGvn5TxPAz+2riS/ObeCp5FLUaFJFSsi7uUXkdMwDwCbs TN30/24pXXHAvs4iYuvU/wEND43SgrjClbSps3UvMLg+9vY8fcvvLnA97vK/4R2C4Mh2CzFbddS jU2YuGjprNPGK95dseeC1a1VMzkVw/3Z9VOd2YVHPlOL/RbU8gHAHfh5LMjKDpnqbVkCrdlVUxj 8zhiQ/Ql9x8s/kg1aCVe6FbbHyWDbVuDRxzT9qCWD2XKPC8NhP0D2s8yW5F9hS X-Google-Smtp-Source: AGHT+IF0Hr0vldeCHlMvpdjLo7kANvDVUkMSknePlPVoEwlL5eF+LbbvELXIRDurzNHdmZ/2Jwl5Lw== X-Received: by 2002:a05:6000:401e:b0:411:3c14:3ad9 with SMTP id ffacd0b85a97d-429aeb09960mr3002731f8f.21.1761747112092; Wed, 29 Oct 2025 07:11:52 -0700 (PDT) Received: from claudiu-TUXEDO-InfinityBook-Pro-AMD-Gen9.. ([2a02:2f04:6302:7900:aafe:5712:6974:4a42]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-429952db9c6sm27076286f8f.36.2025.10.29.07.11.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Oct 2025 07:11:51 -0700 (PDT) From: Claudiu X-Google-Original-From: Claudiu To: support.opensource@diasemi.com, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, biju.das.jz@bp.renesas.com, prabhakar.mahadev-lad.rj@bp.renesas.com Cc: claudiu.beznea@tuxon.dev, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Claudiu Beznea , stable@vger.kernel.org Subject: [PATCH 2/2] ASoC: renesas: rz-ssi: Use proper dma_buffer_pos after resume Date: Wed, 29 Oct 2025 16:11:34 +0200 Message-ID: <20251029141134.2556926-3-claudiu.beznea.uj@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251029141134.2556926-1-claudiu.beznea.uj@bp.renesas.com> References: <20251029141134.2556926-1-claudiu.beznea.uj@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: Claudiu Beznea When the driver supports DMA, it enqueues four DMA descriptors per substream before the substream is started. New descriptors are enqueued in the DMA completion callback, and each time a new descriptor is queued, the dma_buffer_pos is incremented. During suspend, the DMA transactions are terminated. There might be cases where the four extra enqueued DMA descriptors are not completed and are instead canceled on suspend. However, the cancel operation does not take into account that the dma_buffer_pos was already incremented. Previously, the suspend code reinitialized dma_buffer_pos to zero, but this is not always correct. To avoid losing any audio periods during suspend/resume and to prevent clip sound, save the completed DMA buffer position in the DMA callback and reinitialize dma_buffer_pos on resume. Cc: stable@vger.kernel.org Fixes: 1fc778f7c833a ("ASoC: renesas: rz-ssi: Add suspend to RAM support") Signed-off-by: Claudiu Beznea --- sound/soc/renesas/rz-ssi.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/sound/soc/renesas/rz-ssi.c b/sound/soc/renesas/rz-ssi.c index e00940814157..81b883e8ac92 100644 --- a/sound/soc/renesas/rz-ssi.c +++ b/sound/soc/renesas/rz-ssi.c @@ -85,6 +85,7 @@ struct rz_ssi_stream { struct snd_pcm_substream *substream; int fifo_sample_size; /* sample capacity of SSI FIFO */ 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 */ @@ -215,6 +216,7 @@ static void rz_ssi_stream_init(struct rz_ssi_stream *st= rm, 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; strm->buffer_pos =3D 0; =20 @@ -437,6 +439,10 @@ static void rz_ssi_pointer_update(struct rz_ssi_stream= *strm, int frames) snd_pcm_period_elapsed(strm->substream); strm->period_counter =3D current_period; } + + strm->completed_dma_buf_pos +=3D runtime->period_size; + if (strm->completed_dma_buf_pos >=3D runtime->buffer_size) + strm->completed_dma_buf_pos =3D 0; } =20 static int rz_ssi_pio_recv(struct rz_ssi_priv *ssi, struct rz_ssi_stream *= strm) @@ -778,10 +784,14 @@ static int rz_ssi_dma_request(struct rz_ssi_priv *ssi= , struct device *dev) return -ENODEV; } =20 -static int rz_ssi_trigger_resume(struct rz_ssi_priv *ssi) +static int rz_ssi_trigger_resume(struct rz_ssi_priv *ssi, struct rz_ssi_st= ream *strm) { + struct snd_pcm_substream *substream =3D strm->substream; + struct snd_pcm_runtime *runtime =3D substream->runtime; int ret; =20 + strm->dma_buffer_pos =3D strm->completed_dma_buf_pos + runtime->period_si= ze; + if (rz_ssi_is_stream_running(&ssi->playback) || rz_ssi_is_stream_running(&ssi->capture)) return 0; @@ -794,16 +804,6 @@ static int rz_ssi_trigger_resume(struct rz_ssi_priv *s= si) ssi->hw_params_cache.channels); } =20 -static void rz_ssi_streams_suspend(struct rz_ssi_priv *ssi) -{ - if (rz_ssi_is_stream_running(&ssi->playback) || - rz_ssi_is_stream_running(&ssi->capture)) - return; - - ssi->playback.dma_buffer_pos =3D 0; - ssi->capture.dma_buffer_pos =3D 0; -} - static int rz_ssi_dai_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { @@ -813,7 +813,7 @@ static int rz_ssi_dai_trigger(struct snd_pcm_substream = *substream, int cmd, =20 switch (cmd) { case SNDRV_PCM_TRIGGER_RESUME: - ret =3D rz_ssi_trigger_resume(ssi); + ret =3D rz_ssi_trigger_resume(ssi, strm); if (ret) return ret; =20 @@ -852,7 +852,6 @@ static int rz_ssi_dai_trigger(struct snd_pcm_substream = *substream, int cmd, =20 case SNDRV_PCM_TRIGGER_SUSPEND: rz_ssi_stop(ssi, strm); - rz_ssi_streams_suspend(ssi); break; =20 case SNDRV_PCM_TRIGGER_STOP: --=20 2.43.0