Skip to content

Commit 22a1f8a

Browse files
Marek Vasutgregkh
authored andcommitted
i2c: stm32f7: Do not prepare/unprepare clock during runtime suspend/resume
commit 048bbbd upstream. In case there is any sort of clock controller attached to this I2C bus controller, for example Versaclock or even an AIC32x4 I2C codec, then an I2C transfer triggered from the clock controller clk_ops .prepare callback may trigger a deadlock on drivers/clk/clk.c prepare_lock mutex. This is because the clock controller first grabs the prepare_lock mutex and then performs the prepare operation, including its I2C access. The I2C access resumes this I2C bus controller via .runtime_resume callback, which calls clk_prepare_enable(), which attempts to grab the prepare_lock mutex again and deadlocks. Since the clock are already prepared since probe() and unprepared in remove(), use simple clk_enable()/clk_disable() calls to enable and disable the clock on runtime suspend and resume, to avoid hitting the prepare_lock mutex. Acked-by: Alain Volmat <alain.volmat@foss.st.com> Signed-off-by: Marek Vasut <marex@denx.de> Fixes: 4e7bca6 ("i2c: i2c-stm32f7: add PM Runtime support") Cc: <stable@vger.kernel.org> # v5.0+ Signed-off-by: Andi Shyti <andi.shyti@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 8176d48 commit 22a1f8a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/i2c/busses/i2c-stm32f7.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2394,7 +2394,7 @@ static int __maybe_unused stm32f7_i2c_runtime_suspend(struct device *dev)
23942394
struct stm32f7_i2c_dev *i2c_dev = dev_get_drvdata(dev);
23952395

23962396
if (!stm32f7_i2c_is_slave_registered(i2c_dev))
2397-
clk_disable_unprepare(i2c_dev->clk);
2397+
clk_disable(i2c_dev->clk);
23982398

23992399
return 0;
24002400
}
@@ -2405,9 +2405,9 @@ static int __maybe_unused stm32f7_i2c_runtime_resume(struct device *dev)
24052405
int ret;
24062406

24072407
if (!stm32f7_i2c_is_slave_registered(i2c_dev)) {
2408-
ret = clk_prepare_enable(i2c_dev->clk);
2408+
ret = clk_enable(i2c_dev->clk);
24092409
if (ret) {
2410-
dev_err(dev, "failed to prepare_enable clock\n");
2410+
dev_err(dev, "failed to enable clock\n");
24112411
return ret;
24122412
}
24132413
}

0 commit comments

Comments
 (0)