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=1795030875; b=m2KDCV8vDZxHjmrg93Qg6nd3OQK6B74aY6Xv+UetRjphoIteekznZsij79bWWbWIx8NK 0C4JcvugKU4qYGyNAbt2zxToeISS+Obkar9xK016CAGHtz1L5yoLbXwhQsxysX4f5Ijlp 0JBHZ+tmIG9mNcY7BEFY16lhpeGR/tNaAc43wHdgvrlPS48mLcR5a5GbIiME3pilrpIkf oBT0BjMlm/kknK+nQy4NzMbW2nJfImzNcqmOQ+qcRmjG26W4YPNkS5TJwGDXYSUoqt+WW c0e/EQrP6orWGvhoSsoktyiHSG7B/2gb985p6SD1WCiO6tW4jgQh71QOgxRK+WWKrbA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795030875; 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=prW+admWPp7KKFjRssh8DgAHYAnBrD5tbk1pX+4Ydpo=; b=VGex1eC8zaCtojb6vjVABATG2Cdv9tXp4EyvOP0a3VlT9PlPLAz4hasG3Oqh3BT90uOp wggiF9BP8mbyjs4NTSQr2ATv92MogkBoxMCliwfIM8JyOj8Btuwoxz0LpTtFo/d3jvt54 VWDRTSsLdvfnHqakVRPO4VLRDooAV7T47+LTm5IVcDvObMYUX7JpXMhbhpDRIkhi0kIhp sLDfaLyvDoNGn07LPA5eIg1lHFAIw6RTXAUtfSUoq2/HbjKgSPQKrVMajoXOR+E/IJja9 FhSXPaHlIozIebhphaAqGVDvOpdCxrW4VbqR7G3u1ynIZ5343yWRY0lRmXK3i0uExbw== 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=FbJceGBA; 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 7FD45606D356; Wed, 18 Nov 2026 19:41:15 +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=FbJceGBA Received: by smtp.kernel.org (Postfix) with ESMTPSA id CDEF71F000C4; Wed, 18 Nov 2026 19:41:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795030875; bh=prW+admWPp7KKFjRssh8DgAHYAnBrD5tbk1pX+4Ydpo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FbJceGBAyGLdlmn9anLwAkQrQ8d9vC9MOUhmb3/bHyr6TNIyV2tz2+YDNOCrc5okv rD3M/iwdiJlkDa3xEVJV4/x3iR3sYIJNLamImiXRcCr2TY/y+5ob5LZz2bakX1Rlij SH0IXp4kLQOjwncENRCTNhPjugTh53hd6kxr5jfY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Marek Szyprowski , Bartosz Golaszewski , Mukesh Ojha , Bjorn Andersson , Sasha Levin Subject: [PATCH 6.12 0859/1756] firmware: qcom: tzmem: Use DO_ONCE_SLEEPABLE() in qcom_tzmem_enable() Date: Wed, 18 Nov 2026 15:49:46 +0100 Message-ID: <20261118150043.558124806@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@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 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mukesh Ojha [ Upstream commit 60d4a6edea9ec617725db6dd1e66d96a13bc8d0a ] qcom_tzmem_enable() is called from qcom_scm_probe() in a sleepable process context. The helper it wraps, qcom_tzmem_init(), calls qcom_scm_shm_bridge_enable() -> qcom_scm_call(), which invokes might_sleep() and later acquires the qcom_scm_lock mutex via __scm_smc_do(). DO_ONCE() takes the once_lock spinlock with IRQs disabled, so invoking qcom_tzmem_init() from inside DO_ONCE() runs a sleepable call chain in atomic context. CONFIG_DEBUG_ATOMIC_SLEEP=y catches this on boot: BUG: sleeping function called from invalid context at drivers/firmware/qcom/qcom_scm.c:334 in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 49, name: kworker/u16:2 ... __might_resched+0x148/0x24c __might_sleep+0x48/0x7c qcom_scm_call+0x30/0xc0 __qcom_scm_is_call_available+0x98/0x100 qcom_scm_shm_bridge_enable+0x60/0xbc qcom_tzmem_enable+0xf8/0x118 qcom_scm_probe+0x2d0/0x680 [ BUG: Invalid wait context ] ... kworker/u16:2/49 is trying to lock: ffffa83e8a485e38 (qcom_scm_lock){....}-{4:4}, at: __scm_smc_do+0x70/0x488 Switch to DO_ONCE_SLEEPABLE(), which guards the one-shot init with a mutex-style path (__do_once_sleepable_start/done) that is safe to hold across sleeping callees. All callers of qcom_tzmem_enable() are in process context (driver probe), so this is safe. Fixes: 9941fe8a04f3 ("firmware: qcom: scm: Fix tzmem state on probe retry") Reported-by: Marek Szyprowski Closes: https://lore.kernel.org/lkml/5ea74dd3-7471-4c7c-9242-c2005312b1ab@samsung.com/ Reviewed-by: Bartosz Golaszewski Signed-off-by: Mukesh Ojha Link: https://patch.msgid.link/20260921195636.1925869-1-mukesh.ojha@oss.qualcomm.com Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/firmware/qcom/qcom_tzmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/qcom/qcom_tzmem.c b/drivers/firmware/qcom/qcom_tzmem.c index 91f1efd83d712..6f4ea4ce8d95d 100644 --- a/drivers/firmware/qcom/qcom_tzmem.c +++ b/drivers/firmware/qcom/qcom_tzmem.c @@ -476,7 +476,7 @@ int qcom_tzmem_enable(struct device *dev) static int result; qcom_tzmem_dev = dev; - DO_ONCE(qcom_tzmem_do_init, &result); + DO_ONCE_SLEEPABLE(qcom_tzmem_do_init, &result); return result; } EXPORT_SYMBOL_GPL(qcom_tzmem_enable); -- 2.53.0