[SRU][N][PATCH v2 5/6] UBUNTU: SAUCE: Revert "Coresight: Set correct cs_mode for TPDM to fix disable issue"

Noah Wager noah.wager at canonical.com
Wed Feb 25 16:54:01 UTC 2026


BugLink: https://bugs.launchpad.net/bugs/2142337

This reverts commit f30974e15e66ee2934d15d6470cd2d786398f356.

This commit depends on upstream commit:
d724f65218b9 ("coresight: Add helper for atomically taking the device")
which is not ported to this kernel. This breaks coresight builds, so
revert the change.

This revert is acceptable because the generic kernel has not
demonstrated any need for this disable fix.

Signed-off-by: Noah Wager <noah.wager at canonical.com>
---
 drivers/hwtracing/coresight/coresight-tpdm.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-tpdm.c b/drivers/hwtracing/coresight/coresight-tpdm.c
index 7c31c2dbfa46..97654aa4b772 100644
--- a/drivers/hwtracing/coresight/coresight-tpdm.c
+++ b/drivers/hwtracing/coresight/coresight-tpdm.c
@@ -296,11 +296,6 @@ static int tpdm_enable(struct coresight_device *csdev, struct perf_event *event,
 		return -EBUSY;
 	}
 
-	if (!coresight_take_mode(csdev, mode)) {
-		spin_unlock(&drvdata->spinlock);
-		return -EBUSY;
-	}
-
 	__tpdm_enable(drvdata);
 	drvdata->enable = true;
 	spin_unlock(&drvdata->spinlock);
@@ -342,7 +337,6 @@ static void tpdm_disable(struct coresight_device *csdev,
 	}
 
 	__tpdm_disable(drvdata);
-	coresight_set_mode(csdev, CS_MODE_DISABLED);
 	drvdata->enable = false;
 	spin_unlock(&drvdata->spinlock);
 
-- 
2.43.0




More information about the kernel-team mailing list