From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 79DC24E2378 for ; Thu, 3 Sep 2026 15:40:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788450002; cv=none; b=r7mV6PQg2yp6UDXw3/OZTqlG9Zt8O3FIB/B51GDglwLkuEdJN7YY3MW0HfOyhQGNc1Ag+er0YccCFGk8bsjnH1LYE8DTR9amOEYxFaWjUuspxw7FCHHCiGmrvU6n+//rxl1bflw3t9o6qlKmFKkEnaPhzUjIO+iGfxmS/+Zztpo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788450002; c=relaxed/simple; bh=/mpsyiSxSHQ2bIC8gLb3AT1wiupBYvN7AY3MqZ0gaiw=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=L0kcV95N1zye2RZoiv6FECAzkZyfep2VjIUhqdBwpOtD/5R5Z0OthzB6WpcdJs8BqKsbOJ08Ira0OTFH0hRVAf+m57PSXCrz/fE+Clu8w5zlclAquwtYcqEX+JSeBgfPtSLiqwHM6FeOjv5bNfJKq9JvGWlROufeX4KAYFnPMyA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PZrHQofQ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PZrHQofQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D23001F000E9; Thu, 3 Sep 2026 15:40:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788450001; bh=LfVjYUBnVR1wOaDn0e98B8gH3E9BVL4IJra85ret9SE=; h=Subject:To:Cc:From:Date; b=PZrHQofQc9kR/IY71zHMrSD9hUB+vtTpTuwweJWIbknKga/+rw6xVDDZRXWkfQ994 V1Wimfcvzbtx5e+MpR/GshXpecunVNA3CjoyS0ceJB4j0Bh7OJYeM7yImvcNJ2whRY 9YJyD03ozNE5/512iftvB/yzmUMBgI5ULZNONBj0= Subject: FAILED: patch "[PATCH] ALSA: hda/ext: preserve PPLCCTL bits when clearing reset" failed to apply to 6.12-stable tree To: raoxu@uniontech.com,tiwai@suse.de Cc: From: Date: Thu, 03 Sep 2026 17:13:43 +0200 Message-ID: <2026090343-sincere-deputy-aa5c@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.12-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y git checkout FETCH_HEAD git cherry-pick -x 36aa66de481d29edd63cbad9b5c4dc18c340fdf6 # git commit -s git send-email --to '' --in-reply-to '2026090343-sincere-deputy-aa5c@gregkh' --subject-prefix 'PATCH 6.12.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 36aa66de481d29edd63cbad9b5c4dc18c340fdf6 Mon Sep 17 00:00:00 2001 From: Xu Rao Date: Thu, 13 Aug 2026 14:55:24 +0800 Subject: [PATCH] ALSA: hda/ext: preserve PPLCCTL bits when clearing reset snd_hdac_ext_stream_reset() polls PPLCCTL for STRST by masking the register value with AZX_PPLCCTL_STRST: val = readl(...) & AZX_PPLCCTL_STRST; The same masked value is then used when clearing STRST. Since val contains no bits other than STRST, clearing STRST from it always produces zero. The subsequent writel() therefore writes zero to the entire PPLCCTL register instead of clearing only the reset bit. PPLCCTL contains other stream control fields, including the stream tag in AZX_PPLCCTL_STRM_MASK. Those fields must not be modified as a side effect of clearing stream reset. Use snd_hdac_updatel() to clear STRST, matching the existing set-reset path and preserving all unrelated PPLCCTL bits. Fixes: df203a4e46f4 ("ALSA: hdac_ext: add extended stream capabilities") Cc: stable@vger.kernel.org Signed-off-by: Xu Rao Link: https://patch.msgid.link/43BB7930B0F07C09+20260813065524.1955696-1-raoxu@uniontech.com Signed-off-by: Takashi Iwai diff --git a/sound/hda/core/ext/stream.c b/sound/hda/core/ext/stream.c index 4c7506d49f55..517bd151fcc3 100644 --- a/sound/hda/core/ext/stream.c +++ b/sound/hda/core/ext/stream.c @@ -210,8 +210,8 @@ void snd_hdac_ext_stream_reset(struct hdac_ext_stream *hext_stream) break; udelay(3); } while (--timeout); - val &= ~AZX_PPLCCTL_STRST; - writel(val, hext_stream->pplc_addr + AZX_REG_PPLCCTL); + snd_hdac_updatel(hext_stream->pplc_addr, AZX_REG_PPLCCTL, + AZX_PPLCCTL_STRST, 0); udelay(3); timeout = 50;