From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794064905; b=pHvrAGYP0SaRFWx+zs0U8kvbEyn+wMI6uCR7ch+E3DEJV0mw9Gw9ejs2uY+qZrzn+mWF 88eryGvPbWW1A+a8DpXSBsR6Bwj2kqorPmiv4OUxaL6aZMupBvl/+RE+3pydPrp3ONzAy 4u1S/SuLvsiAlwkKdZmbclZZXBk5ZWoW5xTUfbxr/l148T7iAdDoFsDY8w3ilYcAZ1ZKO IdCDR3kWTM3CM3Ju3tDzy7SBJ2Ux05ONndZOWbEG6/vPQhzc9UPt80TJaVEWq1pQ8zrmM AeSq6nyXAbvcpdzs20560XkfYyry60r0jF2gc2EQkhubGNEqCXIAZE9+0PxtcxhepzQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794064905; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=TYhlFokkr3dsVtQlAy/fK5EMGSXIRgNP1eHLHc/+PNA=; b=AGtaP6j+Kttb85wfmm0kBfFsCOUi1RIzWfGLcqYVHUbaq+fdy8SRdssFKllEOdHLDZpK jITAEpiWNaQnuOBJwlA4jPM2X+qFyEZQI3i9JxRRdKC3qpGAGjUkL9v6MtinoYXYIsN5j S0uRydkobUiKU1O/pM0c8yZB1A6WVv+nZtBa65IIGNMAiHzONPeNIasRVaXNVc5cMunk7 xTO5PsngumTqy9BHFwKIYKJU0MVQKl0+3pcZNOFaA/VHUpxsj2puYsaaC6iC8DVQS11Rn 2EaT+Mrbt2dW3a7xl0glzadytLQkfe47y9YKFueLdJNWrYOd5VPJ+8tnV2m1Xi/TJkg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Zw3LqpL9; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2BB42606A9CA; Sat, 7 Nov 2026 15:21:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Zw3LqpL9 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C76D1F0089F; Sat, 7 Nov 2026 15:21:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794064904; bh=TYhlFokkr3dsVtQlAy/fK5EMGSXIRgNP1eHLHc/+PNA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Zw3LqpL9KuJqbj1hTqN9BU8G7JDVn5UGEhFKLhlS8LyjF9a8bZj1scM1t/iYKEfhZ 41xSxE1Pgn3UNCjS5raw64drQzb5zGPo4k6/89NB5upRCcwGzu0/NMBw0fx8SFMxfZ oETEGsczngtRtcCHcvyl0mnUjlHZju5zkLNr5ups= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vladyslav Tymoshchuk , Srinivas Kandagatla , Mark Brown , Sasha Levin Subject: [PATCH 7.3 0808/1257] ASoC: qcom: q6apm-dai: wrap the position of a full ring to 0 Date: Sat, 7 Nov 2026 08:51:44 -0500 Message-ID: <20261107135001.656878512@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134939.434104957@linuxfoundation.org> References: <20261107134939.434104957@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vladyslav Tymoshchuk [ Upstream commit 0ea3e0b196f9dcc17b40ac881a6efef06459975b ] q6apm_dai_pointer() turns the number of period buffers the DSP has returned in the current lap, 1..periods, into a position and reports one frame less than that. Commit a93dad6f4e6a ("ASoC: q6apm-dai: make use of q6apm_get_hw_pointer") added the "- 1" so that the end of the ring is not reported as a position equal to the buffer size. One frame short has a cost once the application stops feeding the stream. The DSP returns the last queued buffer and the position stops at appl_ptr - 1, so avail stays at buffer_size - 1, below the default stop_threshold. The DSP sends nothing more as its queue is empty, so no period interrupt comes either: ALSA never detects the underrun and the stream stays RUNNING. A poll-driven application that missed its last wakeup waits forever, and drain only ends on its timeout, with -EIO. On capture, the last frame of each period is held back until the next one. Before that commit the position wrapped to 0 at the end of the ring. Do that again. A full lap is the start of the ring, and snd_pcm_update_hw_ptr0() accounts for the wrap: the position cannot move by more than one lap between two updates, as each returned buffer calls snd_pcm_period_elapsed() and the DSP holds at most periods buffers. Seen on a OnePlus Pad 3 (SM8750) with PipeWire in interrupt-driven scheduling: after a stall the PCM sat at hw_ptr 78239, appl_ptr 78240 (avail 3839 of 3840) for two hours. Fixes: a93dad6f4e6a ("ASoC: q6apm-dai: make use of q6apm_get_hw_pointer") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Vladyslav Tymoshchuk Reviewed-by: Srinivas Kandagatla Tested-by: Srinivas Kandagatla Link: https://patch.msgid.link/20261014162703.10172-2-tvlad744@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/qcom/qdsp6/q6apm-dai.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sound/soc/qcom/qdsp6/q6apm-dai.c b/sound/soc/qcom/qdsp6/q6apm-dai.c index 033197bdd8705..cac59c1015862 100644 --- a/sound/soc/qcom/qdsp6/q6apm-dai.c +++ b/sound/soc/qcom/qdsp6/q6apm-dai.c @@ -498,11 +498,15 @@ static snd_pcm_uframes_t q6apm_dai_pointer(struct snd_soc_component *component, ptr = bytes_to_frames(runtime, index); return ptr; } - ptr = q6apm_get_hw_pointer(prtd->graph, substream->stream) * runtime->period_size; - if (ptr) - return ptr - 1; + /* + * The hw pointer counts the period buffers the DSP has returned in + * this lap, 1..periods. A full lap is the start of the ring again: + * report 0 rather than one frame less, so that the position of a + * drained buffer reaches appl_ptr and ALSA sees the underrun. + */ + ptr = q6apm_get_hw_pointer(prtd->graph, substream->stream) % runtime->periods; - return 0; + return ptr * runtime->period_size; } static int q6apm_dai_hw_params(struct snd_soc_component *component, -- 2.53.0