[PATCH v2] coresight: handle runtime PM resume failures

From: Yuanfang Zhang

Date: Mon Nov 16 2026 - 03:39:36 EST


When a CoreSight component's parent power domain, such as a CPU cluster
genpd, fails to power on, runtime resume returns a negative error. Several
call sites ignored that error and continued to access registers on an
unpowered device, risking an external abort.

Replace the remaining pm_runtime_get_sync() calls with
pm_runtime_resume_and_get(), which restores the runtime PM usage count
when resume fails. Abort before accessing hardware and propagate the
error to the caller.

In coresight_get_ref(), unwind the module and device references. In
debug_enable_func(), roll back the CPUs that resumed successfully before
the failure. Finally, release the mode acquired by stm_enable() if its
runtime resume fails.

Signed-off-by: Yuanfang Zhang <yuanfang.zhang@xxxxxxxxxxxxxxxx>
Reviewed-by: Ulf Hansson <ulfh@xxxxxxxxxx>
Reviewed-by: Leo Yan <leo.yan@xxxxxxx>
---
This patch converts the remaining CoreSight pm_runtime_get_sync() users
to pm_runtime_resume_and_get(), propagates resume failures before
hardware access, and completes the related module, device, CPU and mode
unwind paths.
---
Changes in v2:
- Rebase onto coresight/next and adapt ETM3x to etm_readl_cslocked().
- Add Reviewed-by tags from Leo Yan and Ulf Hansson.
- Link to v1: https://lore.kernel.org/r/20260911-b4-coresight-runtime-pm-failures-v1-1-acdf49756e11@xxxxxxxxxxxxxxxx
---
drivers/hwtracing/coresight/coresight-core.c | 13 ++++++++++---
drivers/hwtracing/coresight/coresight-cpu-debug.c | 10 +++++-----
drivers/hwtracing/coresight/coresight-cti-sysfs.c | 10 ++++++++--
drivers/hwtracing/coresight/coresight-etm3x-sysfs.c | 5 ++---
drivers/hwtracing/coresight/coresight-etm4x-sysfs.c | 5 ++++-
drivers/hwtracing/coresight/coresight-funnel.c | 5 ++++-
drivers/hwtracing/coresight/coresight-stm.c | 7 ++++++-
drivers/hwtracing/coresight/coresight-sysfs.c | 11 +++++++++--
8 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c
index bcfeb1c97127ece0960241fe56a3e599a9329cc9..fc06756f2783fb0b499f4d9ad0c635725ed20f4d 100644
--- a/drivers/hwtracing/coresight/coresight-core.c
+++ b/drivers/hwtracing/coresight/coresight-core.c
@@ -822,14 +822,16 @@ struct coresight_device *coresight_get_sink_by_id(u32 id)
*
* @csdev: The coresight device to get a reference on.
*
- * Return true in successful case and power up the device.
- * Return false when failed to get reference of module.
+ * Return true on success and power up the device.
+ * Return false if a reference cannot be obtained or the device cannot be
+ * powered up.
*/
static bool coresight_get_ref(struct coresight_device *csdev)
{
struct device *dev = &csdev->dev;
struct device *parent = csdev->dev.parent;
struct device_driver *drv;
+ int ret;

/* Make sure csdev can't go away */
get_device(dev);
@@ -843,9 +845,14 @@ static bool coresight_get_ref(struct coresight_device *csdev)
goto err_module;

/* Make sure the device is powered on */
- pm_runtime_get_sync(parent);
+ ret = pm_runtime_resume_and_get(parent);
+ if (ret < 0)
+ goto err_pm;
+
return true;

+err_pm:
+ module_put(drv->owner);
err_module:
put_device(parent);
put_device(dev);
diff --git a/drivers/hwtracing/coresight/coresight-cpu-debug.c b/drivers/hwtracing/coresight/coresight-cpu-debug.c
index 87b39874461e205e1dbb9d5f15e019888ff51d28..edccbd2fa5e2c65f44d627b25bebff7bc0cc316a 100644
--- a/drivers/hwtracing/coresight/coresight-cpu-debug.c
+++ b/drivers/hwtracing/coresight/coresight-cpu-debug.c
@@ -429,19 +429,19 @@ static int debug_enable_func(void)
if (!drvdata)
continue;

- ret = pm_runtime_get_sync(drvdata->dev);
+ ret = pm_runtime_resume_and_get(drvdata->dev);
if (ret < 0)
goto err;
- else
- cpumask_set_cpu(cpu, &mask);
+
+ cpumask_set_cpu(cpu, &mask);
}

return 0;

err:
/*
- * If pm_runtime_get_sync() has failed, need rollback on
- * all the other CPUs that have been enabled before that.
+ * If runtime resume has failed, roll back all the other CPUs
+ * that have been enabled before that.
*/
for_each_cpu(cpu, &mask) {
drvdata = per_cpu(debug_drvdata, cpu);
diff --git a/drivers/hwtracing/coresight/coresight-cti-sysfs.c b/drivers/hwtracing/coresight/coresight-cti-sysfs.c
index 2ed5d8eb1ddab907bff92057c54b7e90f6192a64..75018fe6527cdc019738eb7f66201597b972558b 100644
--- a/drivers/hwtracing/coresight/coresight-cti-sysfs.c
+++ b/drivers/hwtracing/coresight/coresight-cti-sysfs.c
@@ -167,8 +167,11 @@ static ssize_t coresight_cti_reg_show(struct device *dev,
struct cti_drvdata *drvdata = dev_get_drvdata(dev->parent);
struct cs_off_attribute *cti_attr = container_of(attr, struct cs_off_attribute, attr);
u32 val = 0;
+ int ret;

- pm_runtime_get_sync(dev->parent);
+ ret = pm_runtime_resume_and_get(dev->parent);
+ if (ret < 0)
+ return ret;

scoped_guard(raw_spinlock_irqsave, &drvdata->spinlock)
val = cti_read_single_reg(drvdata, cti_attr->off);
@@ -185,11 +188,14 @@ static __maybe_unused ssize_t coresight_cti_reg_store(struct device *dev,
struct cti_drvdata *drvdata = dev_get_drvdata(dev->parent);
struct cs_off_attribute *cti_attr = container_of(attr, struct cs_off_attribute, attr);
unsigned long val = 0;
+ int ret;

if (kstrtoul(buf, 0, &val))
return -EINVAL;

- pm_runtime_get_sync(dev->parent);
+ ret = pm_runtime_resume_and_get(dev->parent);
+ if (ret < 0)
+ return ret;

scoped_guard(raw_spinlock_irqsave, &drvdata->spinlock)
cti_write_single_reg(drvdata, cti_attr->off, val);
diff --git a/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c
index 08c10fd146d5fc2bd0cfac829fc50109dd4a3e29..52118d6a2037a09af41641967d4014fcccab5b05 100644
--- a/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c
+++ b/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c
@@ -32,9 +32,9 @@ static int etm_readl_cslocked(struct etm_drvdata *drvdata, u32 off,
int ret;
struct etm_readl_cslocked_arg arg;

- ret = pm_runtime_get_sync(drvdata->csdev->dev.parent);
+ ret = pm_runtime_resume_and_get(drvdata->csdev->dev.parent);
if (ret < 0)
- goto out;
+ return ret;

arg.drvdata = drvdata;
arg.off = off;
@@ -43,7 +43,6 @@ static int etm_readl_cslocked(struct etm_drvdata *drvdata, u32 off,
ret = smp_call_function_single(drvdata->cpu,
etm_readl_cslocked_smp_call,
(void *)&arg, 1);
-out:
pm_runtime_put(drvdata->csdev->dev.parent);
return ret;
}
diff --git a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
index db9e603f97ba82cd608d3d61881fe8153db020ff..f29e753245d3d0d367499b4a38ccf2f3bb3d66b0 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
@@ -2498,10 +2498,13 @@ static ssize_t coresight_etm4x_reg_show(struct device *dev,
{
u32 val, offset;
struct etmv4_drvdata *drvdata = dev_get_drvdata(dev->parent);
+ int ret;

offset = coresight_etm4x_attr_to_offset(d_attr);

- pm_runtime_get_sync(dev->parent);
+ ret = pm_runtime_resume_and_get(dev->parent);
+ if (ret < 0)
+ return ret;
val = etmv4_cross_read(drvdata, offset);
pm_runtime_put_sync(dev->parent);

diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c
index c981215ad64970245e44bf0f34e40fa6c6bcec9a..220c69cb4ee3e08cea32b17f85853fbe210ad670 100644
--- a/drivers/hwtracing/coresight/coresight-funnel.c
+++ b/drivers/hwtracing/coresight/coresight-funnel.c
@@ -192,9 +192,12 @@ static ssize_t funnel_ctrl_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
u32 val;
+ int ret;
struct funnel_drvdata *drvdata = dev_get_drvdata(dev->parent);

- pm_runtime_get_sync(dev->parent);
+ ret = pm_runtime_resume_and_get(dev->parent);
+ if (ret < 0)
+ return ret;

val = get_funnel_ctrl_hw(drvdata);

diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c
index a75b1c56a86710ebe5ad85758f85007d4c158d2e..b358b5576d975f5d440d80c28a401d10aad00b50 100644
--- a/drivers/hwtracing/coresight/coresight-stm.c
+++ b/drivers/hwtracing/coresight/coresight-stm.c
@@ -196,6 +196,7 @@ static int stm_enable(struct coresight_device *csdev, struct perf_event *event,
__maybe_unused struct coresight_path *path)
{
struct stm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
+ int ret;

if (mode != CS_MODE_SYSFS)
return -EINVAL;
@@ -205,7 +206,11 @@ static int stm_enable(struct coresight_device *csdev, struct perf_event *event,
return -EBUSY;
}

- pm_runtime_get_sync(csdev->dev.parent);
+ ret = pm_runtime_resume_and_get(csdev->dev.parent);
+ if (ret < 0) {
+ coresight_set_mode(csdev, CS_MODE_DISABLED);
+ return ret;
+ }

spin_lock(&drvdata->spinlock);
stm_enable_hw(drvdata);
diff --git a/drivers/hwtracing/coresight/coresight-sysfs.c b/drivers/hwtracing/coresight/coresight-sysfs.c
index 5dd4e9b0426e4eb260655fc67d079dfb99949812..5edef1f395b9835a44b6c3cbb5b31eac62dabfd9 100644
--- a/drivers/hwtracing/coresight/coresight-sysfs.c
+++ b/drivers/hwtracing/coresight/coresight-sysfs.c
@@ -17,8 +17,12 @@ ssize_t coresight_simple_show_pair(struct device *_dev,
struct coresight_device *csdev = container_of(_dev, struct coresight_device, dev);
struct cs_pair_attribute *cs_attr = container_of(attr, struct cs_pair_attribute, attr);
u64 val;
+ int ret;
+
+ ret = pm_runtime_resume_and_get(_dev->parent);
+ if (ret < 0)
+ return ret;

- pm_runtime_get_sync(_dev->parent);
val = csdev_access_relaxed_read_pair(&csdev->access, cs_attr->lo_off, cs_attr->hi_off);
pm_runtime_put_sync(_dev->parent);
return sysfs_emit(buf, "0x%llx\n", val);
@@ -31,8 +35,11 @@ ssize_t coresight_simple_show32(struct device *_dev,
struct coresight_device *csdev = container_of(_dev, struct coresight_device, dev);
struct cs_off_attribute *cs_attr = container_of(attr, struct cs_off_attribute, attr);
u64 val;
+ int ret;

- pm_runtime_get_sync(_dev->parent);
+ ret = pm_runtime_resume_and_get(_dev->parent);
+ if (ret < 0)
+ return ret;
val = csdev_access_relaxed_read32(&csdev->access, cs_attr->off);
pm_runtime_put_sync(_dev->parent);
return sysfs_emit(buf, "0x%llx\n", val);

---
base-commit: 1352ce9c99bdb9fb2905f59db5b74830ff2ce556
change-id: 20260911-b4-coresight-runtime-pm-failures-70f250927aeb

Best regards,
--
Yuanfang Zhang <yuanfang@xxxxxxxxxxxxxxxx>