xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: stm32 - Revert broken pm_runtime_resume_and_get changes

Browse Source 
[ 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>
This commit is contained in:
Herbert Xu
2021-12-01 17:30:41 +11:00
committed by Greg Kroah-Hartman
parent 1f5b81874f
commit b35263f000
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/crypto/stm32/stm32-cryp.c
View File

@@ -529,7 +529,8 @@ static int stm32_cryp_hw_init(struct stm32_cryp *cryp)
{ {
int ret; int ret;
u32 cfg, hw_mode; u32 cfg, hw_mode;
pm_runtime_resume_and_get(cryp->dev);
pm_runtime_get_sync(cryp->dev);
/* Disable interrupt */ /* Disable interrupt */
stm32_cryp_write(cryp, CRYP_IMSCR, 0); stm32_cryp_write(cryp, CRYP_IMSCR, 0);

6
drivers/crypto/stm32/stm32-hash.c
View File

@@ -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, static int stm32_hash_hw_init(struct stm32_hash_dev *hdev,
struct stm32_hash_request_ctx *rctx) 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)) { if (!(HASH_FLAGS_INIT & hdev->flags)) {
stm32_hash_write(hdev, HASH_CR, HASH_CR_INIT); 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; u32 *preg;
unsigned int i; 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)) while ((stm32_hash_read(hdev, HASH_SR) & HASH_SR_BUSY))
cpu_relax(); cpu_relax();
@@ -999,7 +999,7 @@ static int stm32_hash_import(struct ahash_request *req, const void *in)
preg = rctx->hw_context; 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_IMR, *preg++);
stm32_hash_write(hdev, HASH_STR, *preg++); stm32_hash_write(hdev, HASH_STR, *preg++);