FAILED: patch "[PATCH] pwm: imx-tpm: Count the number of enabled channels in probe" failed to apply to 5.15-stable tree
Subsystems (3)
[email protected]
maintainerThe 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 <[email protected]>.
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 3962c24f2d14e8a7f8a23f56b7ce320523947342
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026050333-employed-opponent-f918@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 3962c24f2d14e8a7f8a23f56b7ce320523947342 Mon Sep 17 00:00:00 2001
From: "Viorel Suman (OSS)" <[email protected]>
Date: Wed, 11 Mar 2026 14:33:09 +0200
Subject: [PATCH] pwm: imx-tpm: Count the number of enabled channels in probe
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
On a soft reset TPM PWM IP may preserve its internal state from previous runtime, therefore on a subsequent OS boot and driver probe "enable_count" value and TPM PWM IP internal channels "enabled" states may get unaligned. In consequence on a suspend/resume cycle the call "if (--tpm->enable_count == 0)" may lead to "enable_count" overflow the system being blocked from entering suspend due to:
if (tpm->enable_count > 0)
return -EBUSY;
Fix the problem by counting the enabled channels in probe function.
drivers/pwm/pwm-imx-tpm.c +8 -1
@@ -352,7 +352,7 @@ static int pwm_imx_tpm_probe(struct platform_device *pdev)struct clk *clk;void __iomem *base;int ret; -unsigned int npwm; +unsigned int i, npwm;u32 val; base =devm_platform_ioremap_resource (pdev,0 );
@@ -382,6 +382,13 @@ static int pwm_imx_tpm_probe(struct platform_device *pdev)mutex_init (&tpm->lock); +/* count the enabled channels */ +for (i =0 ; i < npwm; ++i) { + val =readl (base +PWM_IMX_TPM_CnSC (i)); +if (FIELD_GET (PWM_IMX_TPM_CnSC_ELS, val)) + ++tpm->enable_count; + } + ret =devm_pwmchip_add (&pdev->dev, chip);if (ret)return dev_err_probe (&pdev->dev, ret,"failed to add PWM chip\n" );
Sasha Levin
maintainerPATCH 1/1 pwm: imx-tpm: Count the number of enabled channels in probe
From: "Viorel Suman (OSS)" <[email protected]>
[ Upstream commit 3962c24f2d14e8a7f8a23f56b7ce320523947342 ]
On a soft reset TPM PWM IP may preserve its internal state from previous runtime, therefore on a subsequent OS boot and driver probe "enable_count" value and TPM PWM IP internal channels "enabled" states may get unaligned. In consequence on a suspend/resume cycle the call "if (--tpm->enable_count == 0)" may lead to "enable_count" overflow the system being blocked from entering suspend due to:
if (tpm->enable_count > 0)
return -EBUSY;
Fix the problem by counting the enabled channels in probe function.
--- drivers/pwm/pwm-imx-tpm.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/pwm/pwm-imx-tpm.c +8 -0
@@ -348,6 +348,7 @@ static int pwm_imx_tpm_probe(struct platform_device *pdev) {struct imx_tpm_pwm_chip *tpm;int ret; +unsigned int i;u32 val; tpm =devm_kzalloc (&pdev->dev,sizeof (*tpm),GFP_KERNEL );
@@ -381,6 +382,13 @@ static int pwm_imx_tpm_probe(struct platform_device *pdev)mutex_init (&tpm->lock); +/* count the enabled channels */ +for (i =0 ; i < tpm->chip.npwm; ++i) { + val =readl (tpm->base +PWM_IMX_TPM_CnSC (i)); +if (FIELD_GET (PWM_IMX_TPM_CnSC_ELS, val)) + ++tpm->enable_count; + } + ret =pwmchip_add (&tpm->chip);if (ret) {dev_err (&pdev->dev,"failed to add PWM chip: %d\n" , ret);
Signature · 1 line
2.53.0