Skip to content

Commit 1c0220a

Browse files
committed
Merge tag 'coresight-next-v7.1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/coresight/linux into char-misc-next
Suzuki writes: coresight: Updates for Linux v7.1 CoreSight self hosted tracing subsystem updates for Linux v7.1, includes: - Fix unregistration related issues - Clean up CTI power management and sysfs code - Miscellaneous fixes - MAINTAINERS: Add Leo Yan as Reviewer - MAINTAINERS: Update Mike's email address Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> * tag 'coresight-next-v7.1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/coresight/linux: (25 commits) coresight: tpdm: fix invalid MMIO access issue coresight: tpdm: add traceid_show for checking traceid coresight: platform: check the availability of the endpoint before parse coresight: cti: fix the check condition in inout_sel_store MAINTAINERS: coresight: Add Leo Yan as Reviewer coresight: cti: Properly handle negative offsets in cti_reg32_{show|store}() coresight: cti: Remove hw_enabled flag coresight: cti: Remove hw_powered flag coresight: cti: Rename cti_active() to cti_is_active() coresight: cti: Remove CPU power management code coresight: cti: Access ASICCTL only when implemented coresight: cti: Fix register reads coresight: cti: Make spinlock usage consistent drivers/hwtracing/coresight: remove unneeded variable in tmc_crashdata_release() MAINTAINERS: Change e-mail address for reviewer coresight: ctcu: fix the spin_bug coresight: Unify bus unregistration via coresight_unregister() coresight: Do not mix success path with failure handling coresight: Move sink validation into etm_perf_add_symlink_sink() coresight: Refactor sysfs connection group cleanup ...
2 parents 0990a71 + 971f347 commit 1c0220a

25 files changed

Lines changed: 363 additions & 508 deletions

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,7 @@ Michel Lespinasse <michel@lespinasse.org> <walken@google.com>
576576
Michel Lespinasse <michel@lespinasse.org> <walken@zoy.org>
577577
Mickaël Salaün <mic@digikod.net> <mic@linux.microsoft.com>
578578
Miguel Ojeda <ojeda@kernel.org> <miguel.ojeda.sandonis@gmail.com>
579+
Mike Leach <mike.leach@arm.com> <mike.leach@linaro.org>
579580
Mike Rapoport <rppt@kernel.org> <mike@compulab.co.il>
580581
Mike Rapoport <rppt@kernel.org> <mike.rapoport@gmail.com>
581582
Mike Rapoport <rppt@kernel.org> <rppt@linux.ibm.com>

Documentation/ABI/testing/sysfs-bus-coresight-devices-tpdm

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,3 +278,13 @@ Date: Aug 2025
278278
KernelVersion 6.18
279279
Contact: Mao Jinlong <quic_jinlmao@quicinc.com>
280280
Description: (Read) Show hardware context information of device.
281+
282+
What: /sys/bus/coresight/devices/<tpdm-name>/traceid
283+
Date: March 2026
284+
KernelVersion: 7.1
285+
Contact: Jie Gan <jie.gan@oss.qualcomm.com>
286+
Description:
287+
(R) Show the trace ID that will appear in the trace stream
288+
coming from this TPDM. The trace ID is inherited from the
289+
connected TPDA device and is fixed for the lifetime of the
290+
device. Returns -EINVAL if the device has not been enabled yet.

MAINTAINERS

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2725,8 +2725,9 @@ N: digicolor
27252725

27262726
ARM/CORESIGHT FRAMEWORK AND DRIVERS
27272727
M: Suzuki K Poulose <suzuki.poulose@arm.com>
2728-
R: Mike Leach <mike.leach@linaro.org>
2728+
R: Mike Leach <mike.leach@arm.com>
27292729
R: James Clark <james.clark@linaro.org>
2730+
R: Leo Yan <leo.yan@arm.com>
27302731
L: coresight@lists.linaro.org (moderated for non-subscribers)
27312732
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
27322733
S: Maintained
@@ -20734,7 +20735,7 @@ PERFORMANCE EVENTS TOOLING ARM64
2073420735
R: John Garry <john.g.garry@oracle.com>
2073520736
R: Will Deacon <will@kernel.org>
2073620737
R: James Clark <james.clark@linaro.org>
20737-
R: Mike Leach <mike.leach@linaro.org>
20738+
R: Mike Leach <mike.leach@arm.com>
2073820739
R: Leo Yan <leo.yan@linux.dev>
2073920740
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
2074020741
S: Supported

drivers/hwtracing/coresight/coresight-catu.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
#define catu_dbg(x, ...) do {} while (0)
3131
#endif
3232

33-
DEFINE_CORESIGHT_DEVLIST(catu_devs, "catu");
34-
3533
struct catu_etr_buf {
3634
struct tmc_sg_table *catu_table;
3735
dma_addr_t sladdr;
@@ -530,7 +528,7 @@ static int __catu_probe(struct device *dev, struct resource *res)
530528
if (ret)
531529
return ret;
532530

533-
catu_desc.name = coresight_alloc_device_name(&catu_devs, dev);
531+
catu_desc.name = coresight_alloc_device_name("catu", dev);
534532
if (!catu_desc.name)
535533
return -ENOMEM;
536534

0 commit comments

Comments
 (0)