Skip to contentSkip to conversation

spi: meson-spifc: use devm_pm_runtime_set_active_enabled

PATCH In review Felix Gu 3 participants 3 messages Aug 1 – Aug 11

Subsystems (2)
lore
Share & tools
lore

Felix Gu

author
#0 lore raw

PATCH v2 1/1 spi: meson-spifc: use devm_pm_runtime_set_active_enabled

Use devm_pm_runtime_set_active_enabled to replace pm_runtime_set_active() + pm_runtime_enable() and drop the out_pm error label.

---
Changes in v2:
- Fix Mark's comment.
- Link to v1: https://patch.msgid.link/[email protected]

To: Mark Brown <[email protected]>
To: Neil Armstrong <[email protected]>
To: Kevin Hilman <[email protected]>
To: Jerome Brunet <[email protected]>
To: Martin Blumenstingl <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]

---
 drivers/spi/spi-meson-spifc.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)
drivers/spi/spi-meson-spifc.c +5 -11
index e36aa94bbdae..82c1c3c0c84b 100644
@@ -325,26 +325,20 @@ static int meson_spifc_probe(struct platform_device *pdev)
 
 	meson_spifc_hw_init(spifc);
 
-	pm_runtime_set_active(spifc->dev);
-	pm_runtime_enable(spifc->dev);
+	ret =  devm_pm_runtime_set_active_enabled(spifc->dev);
+	if (ret)
+		return dev_err_probe(spifc->dev, ret, "failed to set runtime PM\n");
 
 	ret = devm_spi_register_controller(spifc->dev, host);
-	if (ret) {
-		dev_err(spifc->dev, "failed to register spi host\n");
-		goto out_pm;
-	}
+	if (ret)
+		return dev_err_probe(spifc->dev, ret, "failed to register spi host\n");
 
 	return 0;
-out_pm:
-	pm_runtime_disable(spifc->dev);
-
-	return ret;
 }
 
 static void meson_spifc_remove(struct platform_device *pdev)
 {
 	pm_runtime_get_sync(&pdev->dev);
-	pm_runtime_disable(&pdev->dev);
 	pm_runtime_put_noidle(&pdev->dev);
 }
 

---
base-commit: 3fe08b9796f36ef437ab9328e7dd1e5ff2d66603
change-id: 20260722-spifc-336fbde9511b

Best regards,

Signature · 1 line
Felix Gu <[email protected]>
#1 lore raw
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [High] Removing `pm_runtime_disable()` from `meson_spifc_remove()` introduces a race condition during…

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] Removing pm_runtime_disable() from meson_spifc_remove() introduces a race condition during device removal that can cause a clock usage underflow. --

--- Patch [1]: [PATCH v2] spi: meson-spifc: use devm_pm_runtime_set_active_enabled --- commit b45e95aa00b1b02a9f6c29275b73bb003b297870
Author: Felix Gu <[email protected]>

spi: meson-spifc: use devm_pm_runtime_set_active_enabled

This commit converts the driver to use devm_pm_runtime_set_active_enabled(), dropping explicit pm_runtime_enable and pm_runtime_disable calls along with their associated error paths.

Quoted 11 lines
drivers/spi/spi-meson-spifc.c +1 -2
index e36aa94bbdae3..82c1c3c0c84b5 100644
@@ -325,26 +325,20 @@ static int meson_spifc_probe(struct platform_device *pdev)
 
 	meson_spifc_hw_init(spifc);
 
-	pm_runtime_set_active(spifc->dev);
-	pm_runtime_enable(spifc->dev);
+	ret =  devm_pm_runtime_set_active_enabled(spifc->dev);

[ ... ]

drivers/spi/spi-meson-spifc.c static int meson_spifc_probe(struct platform_device *pdev) · line 342

Quoted 5 lines

static void meson_spifc_remove(struct platform_device *pdev) {

drivers/spi/spi-meson-spifc.c +0 -1
 	pm_runtime_get_sync(&pdev->dev);
-	pm_runtime_disable(&pdev->dev);
 	pm_runtime_put_noidle(&pdev->dev);

[Severity: High]
Does removing pm_runtime_disable() here create a race condition that can lead to a clock usage underflow?

When pm_runtime_put_noidle() drops the usage count to 0, PM runtime remains enabled until the devres teardown phase.

Next, devres teardown runs devm_spi_unregister_controller(), which unregisters child SPI devices.

If a child device (like an SPI flash) performs a final transfer during its own removal, the SPI core will temporarily wake this parent controller and then call pm_runtime_put_autosuspend() when the transfer completes.

Because the base usage count is now 0, this queues an asynchronous suspend. When meson_spifc_runtime_suspend() runs, it calls clk_disable_unprepare(), dropping the clock count to 0.

Later in the devres teardown sequence, the cleanup for devm_clk_get_enabled() executes and unconditionally calls clk_disable_unprepare() again, causing the clock count to underflow.

Quoted 2 lines

}

Signature · 6 lines
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1

_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
maintainer
#2 lore raw
In reply to Felix Gu
Quoted 1 line · Felix Gu

spi: meson-spifc: use devm_pm_runtime_set_active_enabled

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-7.3

Thanks!

[1/1] spi: meson-spifc: use devm_pm_runtime_set_active_enabled

      https://git.kernel.org/broonie/spi/c/c10b7f5e0cb1

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark