Skip to content

Commit 100f84b

Browse files
toromanoSTMherbertx
authored andcommitted
crypto: stm32/crc32 - don't sleep in runtime pm
Ensure stm32_crc_update() and stm32_crc_init() can be called in atomic context and can't sleep. Add pm_runtime_irq_safe() to make pm_runtime_get_sync() atomic. Change runtime pm to call clk_enable()/clk_disable() and change system pm to unprepare/prepare the clock and force runtime pm suspend/resume. Signed-off-by: Nicolas Toromanoff <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
1 parent 10b89c4 commit 100f84b

File tree

1 file changed

+36
-9
lines changed

1 file changed

+36
-9
lines changed

drivers/crypto/stm32/stm32-crc32.c

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ static int stm32_crc_probe(struct platform_device *pdev)
297297

298298
pm_runtime_get_noresume(dev);
299299
pm_runtime_set_active(dev);
300+
pm_runtime_irq_safe(dev);
300301
pm_runtime_enable(dev);
301302

302303
platform_set_drvdata(pdev, crc);
@@ -350,34 +351,60 @@ static int stm32_crc_remove(struct platform_device *pdev)
350351
return 0;
351352
}
352353

353-
#ifdef CONFIG_PM
354-
static int stm32_crc_runtime_suspend(struct device *dev)
354+
static int __maybe_unused stm32_crc_suspend(struct device *dev)
355355
{
356356
struct stm32_crc *crc = dev_get_drvdata(dev);
357+
int ret;
357358

358-
clk_disable_unprepare(crc->clk);
359+
ret = pm_runtime_force_suspend(dev);
360+
if (ret)
361+
return ret;
362+
363+
clk_unprepare(crc->clk);
359364

360365
return 0;
361366
}
362367

363-
static int stm32_crc_runtime_resume(struct device *dev)
368+
static int __maybe_unused stm32_crc_resume(struct device *dev)
364369
{
365370
struct stm32_crc *crc = dev_get_drvdata(dev);
366371
int ret;
367372

368-
ret = clk_prepare_enable(crc->clk);
373+
ret = clk_prepare(crc->clk);
369374
if (ret) {
370-
dev_err(crc->dev, "Failed to prepare_enable clock\n");
375+
dev_err(crc->dev, "Failed to prepare clock\n");
376+
return ret;
377+
}
378+
379+
return pm_runtime_force_resume(dev);
380+
}
381+
382+
static int __maybe_unused stm32_crc_runtime_suspend(struct device *dev)
383+
{
384+
struct stm32_crc *crc = dev_get_drvdata(dev);
385+
386+
clk_disable(crc->clk);
387+
388+
return 0;
389+
}
390+
391+
static int __maybe_unused stm32_crc_runtime_resume(struct device *dev)
392+
{
393+
struct stm32_crc *crc = dev_get_drvdata(dev);
394+
int ret;
395+
396+
ret = clk_enable(crc->clk);
397+
if (ret) {
398+
dev_err(crc->dev, "Failed to enable clock\n");
371399
return ret;
372400
}
373401

374402
return 0;
375403
}
376-
#endif
377404

378405
static const struct dev_pm_ops stm32_crc_pm_ops = {
379-
SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
380-
pm_runtime_force_resume)
406+
SET_SYSTEM_SLEEP_PM_OPS(stm32_crc_suspend,
407+
stm32_crc_resume)
381408
SET_RUNTIME_PM_OPS(stm32_crc_runtime_suspend,
382409
stm32_crc_runtime_resume, NULL)
383410
};

0 commit comments

Comments
 (0)