lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 160/563] crypto: stm32 - Revert broken pm_runtime_resume_and_get changes
    Date
    From: Herbert Xu <herbert@gondor.apana.org.au>

    [ Upstream commit 3d6b661330a7954d8136df98160d525eb04dcd6a ]

    We should not call pm_runtime_resume_and_get where the reference
    count is expected to be incremented unconditionally. This patch
    reverts these calls to the original unconditional get_sync call.

    Reported-by: Heiner Kallweit <hkallweit1@gmail.com>
    Fixes: 747bf30fd944 ("crypto: stm32/cryp - Fix PM reference leak...")
    Fixes: 1cb3ad701970 ("crypto: stm32/hash - Fix PM reference leak...")
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/crypto/stm32/stm32-cryp.c | 3 ++-
    drivers/crypto/stm32/stm32-hash.c | 6 +++---
    2 files changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/crypto/stm32/stm32-cryp.c b/drivers/crypto/stm32/stm32-cryp.c
    index cd57c5bae3ce9..81eb136b6c11d 100644
    --- a/drivers/crypto/stm32/stm32-cryp.c
    +++ b/drivers/crypto/stm32/stm32-cryp.c
    @@ -529,7 +529,8 @@ static int stm32_cryp_hw_init(struct stm32_cryp *cryp)
    {
    int ret;
    u32 cfg, hw_mode;
    - pm_runtime_resume_and_get(cryp->dev);
    +
    + pm_runtime_get_sync(cryp->dev);

    /* Disable interrupt */
    stm32_cryp_write(cryp, CRYP_IMSCR, 0);
    diff --git a/drivers/crypto/stm32/stm32-hash.c b/drivers/crypto/stm32/stm32-hash.c
    index ff5362da118d8..16bb52836b28d 100644
    --- a/drivers/crypto/stm32/stm32-hash.c
    +++ b/drivers/crypto/stm32/stm32-hash.c
    @@ -812,7 +812,7 @@ static void stm32_hash_finish_req(struct ahash_request *req, int err)
    static int stm32_hash_hw_init(struct stm32_hash_dev *hdev,
    struct stm32_hash_request_ctx *rctx)
    {
    - pm_runtime_resume_and_get(hdev->dev);
    + pm_runtime_get_sync(hdev->dev);

    if (!(HASH_FLAGS_INIT & hdev->flags)) {
    stm32_hash_write(hdev, HASH_CR, HASH_CR_INIT);
    @@ -961,7 +961,7 @@ static int stm32_hash_export(struct ahash_request *req, void *out)
    u32 *preg;
    unsigned int i;

    - pm_runtime_resume_and_get(hdev->dev);
    + pm_runtime_get_sync(hdev->dev);

    while ((stm32_hash_read(hdev, HASH_SR) & HASH_SR_BUSY))
    cpu_relax();
    @@ -999,7 +999,7 @@ static int stm32_hash_import(struct ahash_request *req, const void *in)

    preg = rctx->hw_context;

    - pm_runtime_resume_and_get(hdev->dev);
    + pm_runtime_get_sync(hdev->dev);

    stm32_hash_write(hdev, HASH_IMR, *preg++);
    stm32_hash_write(hdev, HASH_STR, *preg++);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 04:10    [W:4.116 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site