Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c51ac7fd authored by Markus Schneider-Pargmann's avatar Markus Schneider-Pargmann Committed by Greg Kroah-Hartman
Browse files

hwrng: mtk - Force runtime pm ops for sleep ops 



[ 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: 81d2b345 ("hwrng: mtk - add runtime PM support")
Signed-off-by: default avatarMarkus Schneider-Pargmann <msp@baylibre.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 52d2cdab

drivers/char/hw_random/mtk-rng.c

+7 −2
Original line number Diff line number Diff line
@@ -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