Skip to contentSkip to conversation

media: renesas: rzv2h-ivc: manage runtime PM with devres

PATCH In review Myeonghun Pak 2 participants 2 messages Aug 4 – Aug 6

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 media: renesas: rzv2h-ivc: manage runtime PM with devres

Runtime PM is enabled before the IRQ is looked up. If that lookup fails, probe returns without disabling runtime PM. The subdevice initialization error path disables runtime PM but leaves autosuspend enabled, while the remove path does neither.

Use devm_pm_runtime_enable() so the driver core disables autosuspend and runtime PM on every failed probe and after remove. This also makes the manual subdevice error unwind unnecessary.

This issue was identified during our ongoing static-analysis research while reviewing kernel code.

Fixes f0b3984d821b ("media: platform: Add Renesas Input Video Control block driver")
---
 .../media/platform/renesas/rzv2h-ivc/rzv2h-ivc-dev.c  | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/media/platform/renesas/rzv2h-ivc/rzv2h-ivc-dev.c +4 -7
index 355842abb24b..48f9fd818bff 100644
@@ -202,7 +202,9 @@ static int rzv2h_ivc_probe(struct platform_device *pdev)
 
 	pm_runtime_set_autosuspend_delay(dev, 2000);
 	pm_runtime_use_autosuspend(dev);
-	pm_runtime_enable(dev);
+	ret = devm_pm_runtime_enable(dev);
+	if (ret)
+		return ret;
 
 	ivc->irqnum = platform_get_irq(pdev, 0);
 	if (ivc->irqnum < 0)
@@ -210,14 +212,9 @@ static int rzv2h_ivc_probe(struct platform_device *pdev)
 
 	ret = rzv2h_ivc_initialise_subdevice(ivc);
 	if (ret)
-		goto err_disable_pm_runtime;
+		return ret;
 
 	return 0;
-
-err_disable_pm_runtime:
-	pm_runtime_disable(dev);
-
-	return ret;
 }
 
 static void rzv2h_ivc_remove(struct platform_device *pdev)
Signature · 1 line
2.47.1
maintainer Reviewed-by on v1 1/1
#1 lore raw

Hello Myeonghun

Quoted 40 lines · Myeonghun Pak

Runtime PM is enabled before the IRQ is looked up. If that lookup fails, probe returns without disabling runtime PM. The subdevice initialization error path disables runtime PM but leaves autosuspend enabled, while the remove path does neither.

Use devm_pm_runtime_enable() so the driver core disables autosuspend and runtime PM on every failed probe and after remove. This also makes the manual subdevice error unwind unnecessary.

This issue was identified during our ongoing static-analysis research while reviewing kernel code.

Fixes f0b3984d821b ("media: platform: Add Renesas Input Video Control block driver")
---
 .../media/platform/renesas/rzv2h-ivc/rzv2h-ivc-dev.c  | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/media/platform/renesas/rzv2h-ivc/rzv2h-ivc-dev.c +4 -2
index 355842abb24b..48f9fd818bff 100644
@@ -202,7 +202,9 @@ static int rzv2h_ivc_probe(struct platform_device *pdev)
 
 	pm_runtime_set_autosuspend_delay(dev, 2000);
 	pm_runtime_use_autosuspend(dev);
-	pm_runtime_enable(dev);
+	ret = devm_pm_runtime_enable(dev);
+	if (ret)
+		return ret;
 
 	ivc->irqnum = platform_get_irq(pdev, 0);
 	if (ivc->irqnum < 0)
@@ -210,14 +212,9 @@ static int rzv2h_ivc_probe(struct platform_device *pdev)
 
 	ret = rzv2h_ivc_initialise_subdevice(ivc);
 	if (ret)
-		goto err_disable_pm_runtime;
+		return ret;

drivers/media/platform/renesas/rzv2h-ivc/rzv2h-ivc-dev.c static int rzv2h_ivc_probe(struct platform_device *pdev) · line 220

Quoted 10 lines
drivers/media/platform/renesas/rzv2h-ivc/rzv2h-ivc-dev.c +0 -5
 
 	return 0;
-
-err_disable_pm_runtime:
-	pm_runtime_disable(dev);
-
-	return ret;
 }
 
 static void rzv2h_ivc_remove(struct platform_device *pdev)

The deveres managed version of pm_runtime_enable() calls

	pm_runtime_dont_use_autosuspend(data);
	pm_runtime_disable(data);

So this version is already better than what we have here.

We don't seem to forcefully suspend the device at remove time. The device is only active during streaming and I don't think the driver can be removed (or unbind) while it's actively streaming ?

Quoted 3 lines

--
2.47.1