| From 81c4acf3225d94bec0027427d99a5ca5908cdf8d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 30 Sep 2021 21:12:42 +0200 |
| Subject: hwrng: mtk - Force runtime pm ops for sleep ops |
| |
| From: Markus Schneider-Pargmann <msp@baylibre.com> |
| |
| [ Upstream commit b6f5f0c8f72d348b2d07b20d7b680ef13a7ffe98 ] |
| |
| Currently mtk_rng_runtime_suspend/resume is called for both runtime pm |
| and system sleep operations. |
| |
| This is wrong as these should only be runtime ops as the name already |
| suggests. Currently freezing the system will lead to a call to |
| mtk_rng_runtime_suspend even if the device currently isn't active. This |
| leads to a clock warning because it is disabled/unprepared although it |
| isn't enabled/prepared currently. |
| |
| This patch fixes this by only setting the runtime pm ops and forces to |
| call the runtime pm ops from the system sleep ops as well if active but |
| not otherwise. |
| |
| Fixes: 81d2b34508c6 ("hwrng: mtk - add runtime PM support") |
| Signed-off-by: Markus Schneider-Pargmann <msp@baylibre.com> |
| Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/char/hw_random/mtk-rng.c | 9 +++++++-- |
| 1 file changed, 7 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/char/hw_random/mtk-rng.c b/drivers/char/hw_random/mtk-rng.c |
| index e649be5a5f132..6670516fa194d 100644 |
| --- a/drivers/char/hw_random/mtk-rng.c |
| +++ b/drivers/char/hw_random/mtk-rng.c |
| @@ -173,8 +173,13 @@ static int mtk_rng_runtime_resume(struct device *dev) |
| return mtk_rng_init(&priv->rng); |
| } |
| |
| -static UNIVERSAL_DEV_PM_OPS(mtk_rng_pm_ops, mtk_rng_runtime_suspend, |
| - mtk_rng_runtime_resume, NULL); |
| +static const struct dev_pm_ops mtk_rng_pm_ops = { |
| + SET_RUNTIME_PM_OPS(mtk_rng_runtime_suspend, |
| + mtk_rng_runtime_resume, NULL) |
| + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, |
| + pm_runtime_force_resume) |
| +}; |
| + |
| #define MTK_RNG_PM_OPS (&mtk_rng_pm_ops) |
| #else /* CONFIG_PM */ |
| #define MTK_RNG_PM_OPS NULL |
| -- |
| 2.33.0 |
| |