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=1794049602; b=X0wcyjDMykAe4MWfZGUSv21mEb8cmOkAvj5kr4WMxCz09zcRo2W3j10SAmOg/iIjouOp bpp3uGObtaH5+0+eGitnLzChb9HRRgd2kUePRAbWPt1NQIDOVjZp386xFpkoRBG8m0Am1 BOTcrrmDvHOtBGuq61GlTOFbanR9axoOP3FFdtA42N60XgnX9FdZcAX64bhjWTKmccF2O JE42XjHSOA3lbmeaeHKk1fqNBEgtKSvxZRMsm1o78JhkHKL0qBJQ0hgK+5ZAxV1zwtfAU JuNdOmP/1k2IdqOxkMyvY3q32sK+KyozzzpszGufl6WXwuUZYATU5zRiE1IofC9Cl7Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794049602; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=fqXvMluEApdI/w5nQvRqCc86FDydEfAS8wnB6o02ePw=; b=ZcdfAB1pQQH7YCRA+oWD++bcTEfPuSadcGQzycmM6EIrcb6EvhtOue5m+FjTHYOc7m5t 7A7Fe7bUaoGSejR7UHTg9yeAkwoVfEkht+2j/v9SwAW4ZNF+uz0uPbBaEDk7pcKNH1GSG RwpJ9ZMZ8AHEnHKakJ5XSxthFWH/Yvatr/71WAR/RCshasTJ2f/qAXVjXN5x9zYIvP00G e5nDwUEfLK8mI/9OBn31AuuSqs0JQwXp565hE8Ne7rvWPIx3E9Uk7PiUwL5zhUyVID8LB REUDUzEmLmvHKvcbRgCOxMF6nTtTbBu8T5Co44f8aGoEBA3GvIbYw1y/xzDy6Y3zFhQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=T6vpa6Ew; 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 1A6FD606A32E for ; Sat, 7 Nov 2026 11:06:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=T6vpa6Ew Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C3DE1F008A1; Sat, 7 Nov 2026 11:06:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794049602; bh=fqXvMluEApdI/w5nQvRqCc86FDydEfAS8wnB6o02ePw=; h=From:To:Cc:Subject:Date; b=T6vpa6Ewa2UGrcw4+SfZt8PgJQ2KSj2XttGcLyhUkGwR3lpam8aVXM0bg/RwUHE8p D2aLFwhTmun/qE3Yptw5vVKb57rh7of3szLmycqALgJFSwDJ1pCGCOgjks6vh81Fec 8WbwN1nFoxbwYApNEgkf6UzZyK29hGXQ4rjJuv3tdeZDbX99GDsp3MIx5zxY+nyPSY AEuuYBpRAJpjSYVlQ0K3ynlJv6GerzlkVolxynprJ2r9PBWWa4TLEHQda4JCblyC2Z 5vFOV8YttA23hclrwUcvHeuo7opirPuliTLexX0aTqdCIJzAOczxIL+mI3cgCGocJn jJssXiYpK5P2Q== From: Sasha Levin To: lgs201920130244@gmail.com, tglx@kernel.org, frank.li@nxp.com, radu@rendec.net Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] irqchip/imx-intmux: Fix runtime PM teardown on remove" failed to apply to 5.15-stable tree Date: Sat, 7 Nov 2026 06:06:40 -0500 Message-ID: <20261107060640-failed-5.15-b167c1a30e9e@kernel.org> X-Mailer: git-send-email 2.53.0 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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.15-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-5.15.y git checkout FETCH_HEAD git cherry-pick -x b167c1a30e9e020e4c5e102c7a555943742c024b # git commit -s git send-email --to '' --in-reply-to '20261107060640-failed-5.15-b167c1a30e9e@kernel.org' --subject-prefix 'PATCH 5.15.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From b167c1a30e9e020e4c5e102c7a555943742c024b Mon Sep 17 00:00:00 2001 From: Guangshuo Li Date: Mon, 14 Sep 2026 21:42:11 +0800 Subject: [PATCH] irqchip/imx-intmux: Fix runtime PM teardown on remove imx_intmux_probe() enables the IPG clock and then drops its runtime PM reference with pm_runtime_put(). With CONFIG_PM enabled, the runtime suspend callback disables the IPG clock. With CONFIG_PM disabled, the clock remains enabled after probe. imx_intmux_remove() accesses the CHANIER registers without first making sure that the device is runtime active. The device may therefore be runtime suspended with the IPG clock disabled when these registers are accessed. In addition, the remove path only calls pm_runtime_disable() and does not balance the clock enable when CONFIG_PM is disabled. Resume the device and acquire a runtime PM reference before accessing the registers. If resume fails, skip the register accesses but still tear down the chained handlers and IRQ domains. Disable runtime PM afterwards, drop the acquired reference without triggering another runtime suspend, and explicitly disable the IPG clock. This keeps the clock enabled while the hardware registers are accessed and balances the clk_prepare_enable() performed during probe for both CONFIG_PM configurations. This issue was found by manual code inspection. Fixes: bb403111e017 ("irqchip/imx-intmux: Implement intmux runtime power management") Signed-off-by: Guangshuo Li Signed-off-by: Thomas Gleixner Reviewed-by: Frank Li Reviewed-by: Radu Rendec Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20260914134211.1734163-1-lgs201920130244@gmail.com --- drivers/irqchip/irq-imx-intmux.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-imx-intmux.c b/drivers/irqchip/irq-imx-intmux.c index 47c2681d138a0..de2a8f98f6255 100644 --- a/drivers/irqchip/irq-imx-intmux.c +++ b/drivers/irqchip/irq-imx-intmux.c @@ -288,12 +288,16 @@ static int imx_intmux_probe(struct platform_device *pdev) static void imx_intmux_remove(struct platform_device *pdev) { struct intmux_data *data = platform_get_drvdata(pdev); - int i; + int i, ret; + + ret = pm_runtime_resume_and_get(&pdev->dev); + if (ret < 0) + dev_warn(&pdev->dev, "failed to resume device: %d\n", ret); for (i = 0; i < data->channum; i++) { /* disable all interrupt sources of this channel */ - writel_relaxed(0, data->regs + CHANIER(i)); - + if (ret >= 0) + writel_relaxed(0, data->regs + CHANIER(i)); irq_set_chained_handler_and_data(data->irqchip_data[i].irq, NULL, NULL); @@ -301,6 +305,11 @@ static void imx_intmux_remove(struct platform_device *pdev) } pm_runtime_disable(&pdev->dev); + if (ret >= 0) { + pm_runtime_put_noidle(&pdev->dev); + clk_disable_unprepare(data->ipg_clk); + pm_runtime_set_suspended(&pdev->dev); + } } #ifdef CONFIG_PM -- 2.53.0