lkml.org 
[lkml]   [2021]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 142/323] hwrng: mtk - Force runtime pm ops for sleep ops
    Date
    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 7f99cd52b40ef..8dc256c761137 100644
    --- a/drivers/char/hw_random/mtk-rng.c
    +++ b/drivers/char/hw_random/mtk-rng.c
    @@ -182,8 +182,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


    \
     
     \ /
      Last update: 2021-11-24 14:10    [W:4.047 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site