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 1524A31B82B for ; Fri, 8 May 2026 17:01:57 +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=1778259718; cv=none; b=fgBn5flfU8aJclTolt6UE9J12US/GH/VBP2vNoFM5whXMhguPXgLOXYVajOeWcxXAwyppWhQu2T8bAbhAOZQHR/E8MDpYVqpjm3qPKA79er/ikW58Syq1+F7lPAQCw6ZURWcsy1aszaFBiaelB+DSDXm+h1YjxCAd+5IAoG1Fig= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778259718; c=relaxed/simple; bh=4RWwMgUznrL3G8yZyc15jqagw63taAvJ+UwZUbJ3HZ4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KcH06MuYtQ4hwh3axZB96lDBQ/jMcju7wCm5hSAr5iPRKIlQdoeMmhKUT6/LBQrCAQJqdy6vRCbPPgalkd9xsMqqvl1Uf/fnGdNqsI1OQClcXLqcoD3jRinNMrx0LiAKiaTnr3cKAB5zcgK6buvv39fbB7lypiINh3uyB+8w7qY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=d0Q+ARH/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="d0Q+ARH/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3DADCC2BCB0; Fri, 8 May 2026 17:01:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778259717; bh=4RWwMgUznrL3G8yZyc15jqagw63taAvJ+UwZUbJ3HZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d0Q+ARH/IX+5eaaDBK+MyyiQKQ4RY7BR8X98+E11PfsQX+at/RGPj2AgACnrnrD+7 nkqTlZ9dLSwWgbKoF81j0K9aDKeiamcHsIvtT+0CKFQvZhcTXSeIO91iK94Gf/h6LY BTDEPXpCFo9xFHMkHMZjespB5KmxDudOrUG18JvLlAgPHkE5xa7i4V879GK6PIjUJF 0We44X0HyCznMMwiXpt9j87wR7zsGb8PEYvh1ApIR71ZIRHaBbRsVHeKOGx5VhfhgK jmOY3UV5T+l5tYjngbGlU4E65G9F1G/75MK0f9ZJroaNi5k/mzT+iBam4GzDKYXubz K6sdQR3egveHA== From: Sasha Levin To: stable@vger.kernel.org Cc: "Viorel Suman (OSS)" , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Sasha Levin Subject: [PATCH 5.15.y] pwm: imx-tpm: Count the number of enabled channels in probe Date: Fri, 8 May 2026 13:01:55 -0400 Message-ID: <20260508170155.1731439-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026050333-employed-opponent-f918@gregkh> References: <2026050333-employed-opponent-f918@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=UTF-8 Content-Transfer-Encoding: 8bit From: "Viorel Suman (OSS)" [ 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. Signed-off-by: Viorel Suman (OSS) Fixes: 738a1cfec2ed ("pwm: Add i.MX TPM PWM driver support") Link: https://patch.msgid.link/20260311123309.348904-1-viorel.suman@oss.nxp.com Cc: stable@vger.kernel.org Signed-off-by: Uwe Kleine-König [ substituted `base` with `tpm->base` and `npwm` with `tpm->chip.npwm` to match the older non-devm probe layout ] Signed-off-by: Sasha Levin --- drivers/pwm/pwm-imx-tpm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/pwm/pwm-imx-tpm.c b/drivers/pwm/pwm-imx-tpm.c index 327db8ffe70c5..50b6f6663523e 100644 --- a/drivers/pwm/pwm-imx-tpm.c +++ b/drivers/pwm/pwm-imx-tpm.c @@ -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); -- 2.53.0