Skip to contentSkip to conversation

coresight: Check runtime PM resume result

PATCH In review Yuho Choi 2 participants 2 messages Aug 2 – Aug 3

Subsystems (2)
lore
Share & tools
lore

Yuho Choi

author
#0 lore raw

PATCH 1/1 coresight: Check runtime PM resume result

coresight_get_ref() ignores the return value of pm_runtime_get_sync() and reports success even when runtime resume fails. A path is then built and the CoreSight device may be accessed while it remains powered off.

Use pm_runtime_resume_and_get() so a failed resume is reported and its runtime PM usage reference is rolled back. Drop the module and device references acquired before the resume attempt when it fails.

Fixes 5da5325fa856 ("coresight: moving PM runtime operations to core framework")
---
 drivers/hwtracing/coresight/coresight-core.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/hwtracing/coresight/coresight-core.c +5 -1
index 6d65c43d574f..77d05b360484 100644
@@ -843,7 +843,11 @@ static bool coresight_get_ref(struct coresight_device *csdev)
 		goto err_module;
 
 	/* Make sure the device is powered on */
-	pm_runtime_get_sync(parent);
+	if (pm_runtime_resume_and_get(parent) < 0) {
+		module_put(drv->owner);
+		goto err_module;
+	}
+
 	return true;
 
 err_module:
Signature · 1 line
2.43.0
#1 lore raw
Quoted 11 lines · Yuho Choi

coresight_get_ref() ignores the return value of pm_runtime_get_sync() and reports success even when runtime resume fails. A path is then built and the CoreSight device may be accessed while it remains powered off.

Use pm_runtime_resume_and_get() so a failed resume is reported and its runtime PM usage reference is rolled back. Drop the module and device references acquired before the resume attempt when it fails.

Fixes 5da5325fa856 ("coresight: moving PM runtime operations to core framework")

---

Should 'Fixes:' be tagging the following commit - which had introduced coresight_get_ref() unconditionally calling pm_runtime_get_sync() ?

32b0707a4182 ("coresight: Add try_get_module() in coresight_grab_device()")

Quoted 20 lines
 drivers/hwtracing/coresight/coresight-core.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/hwtracing/coresight/coresight-core.c +5 -1
index 6d65c43d574f..77d05b360484 100644
@@ -843,7 +843,11 @@ static bool coresight_get_ref(struct coresight_device *csdev)
 		goto err_module;
 
 	/* Make sure the device is powered on */
-	pm_runtime_get_sync(parent);
+	if (pm_runtime_resume_and_get(parent) < 0) {
+		module_put(drv->owner);
+		goto err_module;
+	}
+
 	return true;
 
 err_module: