From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 080D631D750; Fri, 9 Jan 2026 12:24:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767961498; cv=none; b=bRfyX9BJmTLyyWBsKE93kKu1zCrE8EsxZ5esDBGYCzvwJveHePxn9haW7G8iPeuAEvSaS9SD84yCv04heFNxG3nkaQiZjuJXUR0enU5q5KG8rHD3+O3SLSn4ib7sCQEqTn2RgsRwd1AfJ9KllJ45phduObud206SEo9f3UyBN+g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767961498; c=relaxed/simple; bh=B3itSASgs8ECCl+6BX+iZs4mpQrJD1dxA2fkrQjGWVs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Pl7ijb0wqQKknoZp4g7gqmW05ZyCadoHt42UzDAYuz5NtRrRxCqRjMnxyMZ1OrytFTqr+Ru2L5ogYVe63J4dlWtNXTrzqaEH7xFClZS+YpTjkDtP5UiCloPPGLuMlcAc+LSRAJnHli3IcGynDIVnXLdowoFNr1aZmVJl0/jMxNA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Y4Q2W7ZJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Y4Q2W7ZJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 871DFC4CEF1; Fri, 9 Jan 2026 12:24:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1767961497; bh=B3itSASgs8ECCl+6BX+iZs4mpQrJD1dxA2fkrQjGWVs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y4Q2W7ZJp3IksCq4y5ItMKzUBRBQ2HMWltbQcPpwTKQ+qmpYb+23e2REkm9gFEsbB U+m/1XToVNHEWn16iGpFtwjKQ9OBRuHrmlddkmv9B1FwyJ7+49M1ADosIb63/aRKOt Qmms4sScje/OEFXOhUU6XY1HLegPIptDyDowQ8sw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Prasad Sodagudi , Praveen Talari , Bjorn Andersson , Linus Walleij , Sasha Levin Subject: [PATCH 6.1 028/634] pinctrl: qcom: msm: Fix deadlock in pinmux configuration Date: Fri, 9 Jan 2026 12:35:06 +0100 Message-ID: <20260109112118.506544754@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260109112117.407257400@linuxfoundation.org> References: <20260109112117.407257400@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Praveen Talari [ Upstream commit 1c2e70397b4125022dba80f6111271a37fb36bae ] Replace disable_irq() with disable_irq_nosync() in msm_pinmux_set_mux() to prevent deadlock when wakeup IRQ is triggered on the same GPIO being reconfigured. The issue occurs when a wakeup IRQ is triggered on a GPIO and the IRQ handler attempts to reconfigure the same GPIO's pinmux. In this scenario, msm_pinmux_set_mux() calls disable_irq() which waits for the currently running IRQ handler to complete, creating a circular dependency that results in deadlock. Using disable_irq_nosync() avoids waiting for the IRQ handler to complete, preventing the deadlock condition while still properly disabling the interrupt during pinmux reconfiguration. Suggested-by: Prasad Sodagudi Signed-off-by: Praveen Talari Reviewed-by: Bjorn Andersson Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index 34fc47c5c65aa..4f92078dc689d 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c @@ -214,7 +214,7 @@ static int msm_pinmux_set_mux(struct pinctrl_dev *pctldev, */ if (d && i != gpio_func && !test_and_set_bit(d->hwirq, pctrl->disabled_for_mux)) - disable_irq(irq); + disable_irq_nosync(irq); raw_spin_lock_irqsave(&pctrl->lock, flags); -- 2.51.0