CoreSight April 2024

coresight@lists.linaro.org

10 participants
21 discussions

Re: [PATCH] coresight: Remove duplicate linux/amba/bus.h header

by James Clark

On 24/04/2024 03:24, Jiapeng Chong wrote: > ./include/linux/coresight.h: linux/amba/bus.h is included more than once. > > Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> > Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=8869 > Signed-off-by: Jiapeng Chong <jiapeng.chong(a)linux.alibaba.com> > --- > include/linux/coresight.h | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/include/linux/coresight.h b/include/linux/coresight.h > index 653f1712eb77..f09ace92176e 100644 > --- a/include/linux/coresight.h > +++ b/include/linux/coresight.h > @@ -12,7 +12,6 @@ > #include <linux/io.h> > #include <linux/perf_event.h> > #include <linux/sched.h> > -#include <linux/amba/bus.h> > #include <linux/platform_device.h> > > /* Peripheral id registers (0xFD0-0xFEC) */ Reviewed-by: James Clark <james.clark(a)arm.com>

3 weeks, 6 days

Re: [PATCH] coresight: stm: Remove duplicate linux/acpi.h header

by James Clark

On 24/04/2024 03:36, Jiapeng Chong wrote: > ./drivers/hwtracing/coresight/coresight-stm.c: linux/acpi.h is included more than once. > > Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> > Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=8871 > Signed-off-by: Jiapeng Chong <jiapeng.chong(a)linux.alibaba.com> > --- > drivers/hwtracing/coresight/coresight-stm.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c > index cbf7f17556f8..9ca04fac53fa 100644 > --- a/drivers/hwtracing/coresight/coresight-stm.c > +++ b/drivers/hwtracing/coresight/coresight-stm.c > @@ -30,7 +30,6 @@ > #include <linux/pm_runtime.h> > #include <linux/stm.h> > #include <linux/platform_device.h> > -#include <linux/acpi.h> > > #include "coresight-priv.h" > #include "coresight-trace-id.h" Reviewed-by: James Clark <james.clark(a)arm.com>

3 weeks, 6 days

[PATCH v2 0/4] coresight: etm4x: Fix CPU idle PM support for ETE

by Suzuki K Poulose

Our CPUidle state save restore has some bugs which are triggered for an ETM with system instructions (e.g. ETE). This is a series of fixes to address them. Changes since v1: - Fix inverted check for drvdata->csdev for Patch 1 (Yabin) - Remove Data trace register access macro cases (Mike Leach) - Fix QFILT field definition (Yabin) - (New patch) Fix Resource pair register access, reported-by Yabin Suzuki K Poulose (4): coresight: etm4x: Do not hardcode IOMEM access for register restore coresight: etm4x: Do not save/restore Data trace control registers coresight: etm4x: Safe access for TRCQCLTR coresight: etm4x: Fix access to resource selector registers .../coresight/coresight-etm4x-core.c | 26 +++++++++------- drivers/hwtracing/coresight/coresight-etm4x.h | 31 ++----------------- 2 files changed, 17 insertions(+), 40 deletions(-) -- 2.34.1

4 weeks, 1 day

[PATCH V7 00/11] coresight: Move remaining AMBA ACPI devices into platform driver

by Anshuman Khandual

This moves remaining AMBA ACPI devices into respective platform drivers for enabling ACPI based power management support. This series applies on latest coresight next. This series has been built, and boot tested on a DT based (RB5) and ACPI supported coresight platform (N1SDP). https://git.gitlab.arm.com/linux-arm/linux-anshuman.git (amba_other_acpi_migration_v7) Cc: Lorenzo Pieralisi <lpieralisi(a)kernel.org> Cc: Sudeep Holla <sudeep.holla(a)arm.com> Cc: Suzuki K Poulose <suzuki.poulose(a)arm.com> Cc: Mike Leach <mike.leach(a)linaro.org> Cc: James Clark <james.clark(a)arm.com> Cc: Maxime Coquelin <mcoquelin.stm32(a)gmail.com> Cc: Alexandre Torgue <alexandre.torgue(a)foss.st.com> Cc: linux-acpi(a)vger.kernel.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-kernel(a)vger.kernel.org Cc: coresight(a)lists.linaro.org Cc: linux-stm32(a)st-md-mailman.stormreply.com Changes in V7: - Dropped reduntant 'drvdata' check in following functions replicator_platform_remove() funnel_platform_remove() tpiu_platform_remove() tmc_platform_remove() catu_platform_remove() catu_platform_probe() debug_platform_remove() debug_platform_probe() - Dropped struct resource check before devm_ioremap_resource() - Sorted the headers in alphabetic order Changes in V6: https://lore.kernel.org/all/20240312102318.2285165-1-anshuman.khandual@arm.… - Dropped Jame's RB tag from [PATCH 3/11] - Added clk_disable_unprepare() for pclk in replicator_probe() error path - Added clk_disable_unprepare() for pclk in funnel_probe() error path - Added clk_put() for pclk in catu_platform_probe() error path - Added clk_put() for pclk in debug_platform_probe() error path - Added WARN_ON(!drvdata) check in replicator_platform_remove() - Added WARN_ON(!drvdata) check in funnel_platform_remove() - Added WARN_ON(!drvdata) check in catu_platform_remove() - Added WARN_ON(!drvdata) check in tpiu_platform_remove() - Added WARN_ON(!drvdata) check in tmc_platform_remove() - Added WARN_ON(!drvdata) check in stm_platform_remove() - Added WARN_ON(!drvdata) check in debug_platform_remove() - Added additional elements for all acpi_device_id[] updates Changes in V5: https://lore.kernel.org/all/20240222082142.3663983-1-anshuman.khandual@arm.… - Used table->mask to filter out bits from pid in coresight_get_uci_data_from_amba() - Dropped custom masks such as STM_AMBA_MASK and TMC_AMBA_MASK - Modified tmc_etr_setup_caps() to accept struct csdev_access argument - Reverted back tmc_etr_setup_caps() call site position in tmc_probe() - Changed replicator and funnel devices to use the new helpers earlier in series - Updated the commit messages regarding xxx_probe() refactoring and renaming Changes in V4: https://lore.kernel.org/all/20240123054608.1790189-1-anshuman.khandual@arm.… - Fixed PM imbalance in etm4_probe() error path with pm_runtime_disable() - Restored back the pm_runtime_disable() on platform probe error paths in replicator, funnel, catu, tpiu, tmc and stm devices - Dropped dev_caps argument from __tmc_probe() - Changed xxxx_platform_remove() for platform_driver->remove_new() callback Changes in V3: https://lore.kernel.org/all/20231208053939.42901-1-anshuman.khandual@arm.co… - Split coresight_init_driver/remove_driver() helpers into a separate patch - Added 'drvdata->pclk' comments in replicator, funnel, tpiu, tmc, and stm devices - Updated funnel, and replicator drivers to use these new helpers - Check for drvdata instead of drvdata->pclk in suspend and resume paths in catu, tmc and debug devices - Added patch to extract device name from AMBA pid based table lookup for stm - Added patch to extract device properties from AMBA pid based table look for tmc - Dropped pm_runtime_put() from common __probe() functions - Handled pm_runtime_put() in AMBA driver in success path - Handled pm_runtime_put() in platform driver in both success and error paths Changes in V2: https://lore.kernel.org/all/20231201062053.1268492-1-anshuman.khandual@arm.… - Dropped redundant devm_ioremap_resource() hunk from tmc_platform_probe() - Defined coresight_[init|remove]_driver() for both AMBA/platform drivers - Changed catu, tmc, tpiu, stm and debug coresight drivers to use the new helpers avoiding build issues arising from module_amba_driver(), and module_platform_driver() being on the same file Changes in V1: https://lore.kernel.org/all/20231027072943.3418997-1-anshuman.khandual@arm.… - Replaced all IS_ERR() instances with IS_ERR_OR_NULL() as per Suzuki Changes in RFC: https://lore.kernel.org/all/20230921042040.1334641-1-anshuman.khandual@arm.… Anshuman Khandual (11): coresight: etm4x: Fix unbalanced pm_runtime_enable() coresight: stm: Extract device name from AMBA pid based table lookup coresight: tmc: Extract device properties from AMBA pid based table lookup coresight: Add helpers registering/removing both AMBA and platform drivers coresight: replicator: Move ACPI support from AMBA driver to platform driver coresight: funnel: Move ACPI support from AMBA driver to platform driver coresight: catu: Move ACPI support from AMBA driver to platform driver coresight: tpiu: Move ACPI support from AMBA driver to platform driver coresight: tmc: Move ACPI support from AMBA driver to platform driver coresight: stm: Move ACPI support from AMBA driver to platform driver coresight: debug: Move ACPI support from AMBA driver to platform driver drivers/acpi/arm64/amba.c | 8 - drivers/hwtracing/coresight/coresight-catu.c | 138 +++++++++++++--- drivers/hwtracing/coresight/coresight-catu.h | 1 + drivers/hwtracing/coresight/coresight-core.c | 29 ++++ .../hwtracing/coresight/coresight-cpu-debug.c | 138 ++++++++++++++-- .../coresight/coresight-etm4x-core.c | 3 + .../hwtracing/coresight/coresight-funnel.c | 87 +++++----- drivers/hwtracing/coresight/coresight-priv.h | 10 ++ .../coresight/coresight-replicator.c | 82 +++++----- drivers/hwtracing/coresight/coresight-stm.c | 116 +++++++++++-- .../hwtracing/coresight/coresight-tmc-core.c | 154 +++++++++++++++--- drivers/hwtracing/coresight/coresight-tmc.h | 2 + drivers/hwtracing/coresight/coresight-tpiu.c | 117 +++++++++++-- include/linux/coresight.h | 7 + 14 files changed, 726 insertions(+), 166 deletions(-) -- 2.25.1

4 weeks, 1 day

[PATCH 0/4] Add support for multi-port output on the funnel

by Tao Zhang

Funnel can support multi-port output in our hardware design. Since original funnels only support a single output connection, the code needs to be modified to support this new feature. The following is a typical topology diagram of multi-port output of the funnels. |---------| |---------| |---------| |---------| |---------| | TPDM0 | | TPDM1 | | TPDM2 | | TPDM3 | | TPDM4 | |---------| |---------| |---------| |---------| |---------| | | | | | | | | | | | | | | | |-----| |-----| |-----| |-----| | | | | | | | | | | | [0]| |[1] [0]| |[1] | \-------------/ \-------------/ \-------------/ \ FUNNEL0 / \ FUNNEL1 / \ FUNNEL2 / ----------- ----------- ----------- [0]| |[1] [0]| |[1] | | |---------- | | | | | | | | |-------| | |------- | | |--------- | | | | | | | | | | | [0]| |[1] |[2] |[3] |[4] \ ---------------------------------------------------/ \ TPDA0 / \ / ------------------------------------------------ For example, TPDM0 and TPDM1 are connected to the [0] and [1] input ports of the funnel respectively, and output from the [0] and [1] output ports. In this way, when data is output from the Funnel's output port, it needs to know the source component corresponding to this output port. Our solution is to add a property named "label" in the devicetree to mark the source corresponding to the output port. After introducing this new feature, another new problem also needs to be solved. For example, TPDA driver will search for all the TPDMs on a input port. In the topology diagram above, when TPDA searches for TPDM from the input port[0], it will find TPDM0 and TPDM1. Our solution is to add a new property named "qcom,tpda-input-port" to mark the input port number of the TPDA in the devicetree. Tao Zhang (4): dt-bindings: arm: qcom,coresight-funnel: Add label for multi-ouput coresight: Add support for multiple output ports on the funnel dt-bindings: arm: qcom,coresight-tpdm: Mark tpda input port number coresight-tpda: Add support multi-port input on TPDA .../arm/arm,coresight-dynamic-funnel.yaml | 34 +++++++- .../bindings/arm/qcom,coresight-tpdm.yaml | 8 ++ drivers/hwtracing/coresight/coresight-core.c | 81 ++++++++++++++++--- .../hwtracing/coresight/coresight-platform.c | 5 ++ drivers/hwtracing/coresight/coresight-tpda.c | 27 ++++++- include/linux/coresight.h | 2 + 6 files changed, 139 insertions(+), 18 deletions(-) -- 2.17.1

1 month

[PATCH] perf test: Increase buffer size for Coresight basic tests

by James Clark

These tests record in a mode that includes kernel trace but look for samples of a userspace process. This makes them sensitive to any kernel compilation options that increase the amount of time spent in the kernel. If the trace buffer is completely filled before userspace is reached then the test will fail. Double the buffer size to fix this. The other tests in the same file aren't sensitive to this for various reasons, for example the iterate devices test filters by userspace trace only. But in order to keep coverage of all the modes, increase the buffer size rather than filtering by userspace for the basic tests. Fixes: d1efa4a0a696 ("perf cs-etm: Add separate decode paths for timeless and per-thread modes") Signed-off-by: James Clark <james.clark(a)arm.com> --- tools/perf/tests/shell/test_arm_coresight.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/tests/shell/test_arm_coresight.sh b/tools/perf/tests/shell/test_arm_coresight.sh index 65dd85207125..3302ea0b9672 100755 --- a/tools/perf/tests/shell/test_arm_coresight.sh +++ b/tools/perf/tests/shell/test_arm_coresight.sh @@ -188,7 +188,7 @@ arm_cs_etm_snapshot_test() { arm_cs_etm_basic_test() { echo "Recording trace with '$*'" - perf record -o ${perfdata} "$@" -- ls > /dev/null 2>&1 + perf record -o ${perfdata} "$@" -m,8M -- ls > /dev/null 2>&1 perf_script_branch_samples ls && perf_report_branch_samples ls && -- 2.34.1

1 month

Re: [PATCH 00/19] amba: store owner from modules with amba_driver_register()

by Suzuki K Poulose

+ Greg Hi Krzysztof, On 30/03/2024 18:00, Krzysztof Kozlowski wrote: > On 30/03/2024 18:58, Krzysztof Kozlowski wrote: >> >> On Tue, 26 Mar 2024 21:23:30 +0100, Krzysztof Kozlowski wrote: >>> Merging >>> ======= >>> All further patches depend on the first amba patch, therefore please ack >>> and this should go via one tree. >>> >>> Description >>> =========== >>> Modules registering driver with amba_driver_register() often forget to >>> set .owner field. >>> >>> [...] >> >> Applied, thanks! >> >> [01/19] amba: store owner from modules with amba_driver_register() >> (no commit info) > > Patchset applied here: > https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git/log/?h=fo… How do you plan to push this ? Given this affects most of the drivers/, do you plan to send this to Greg ? We have changes in the coresight tree that would conflict with this "tag" ( I haven't merged them yet, but is in my local queue). I want to make sure we can avoid the conflicts. I am happy to merge this to my local tree and base the changes on this, if this is going in for v6.10 and all are in agreement. Kind regards Suzuki > > Best regards, > Krzysztof >

1 month

[PATCH 0/3] coresight: etm4x: Fix CPU idle PM support for ETE

by Suzuki K Poulose

Our CPUidle state save restore has some bugs which are triggered for an ETM with system instructions (e.g. ETE). This is a series of fixes to address them. Suzuki K Poulose (3): coresight: etm4x: Do not hardcode IOMEM access for register restore coresight: etm4x: Do not save/restore Data trace control registers coresight: etm4x: Safe access for TRCQCLTR .../coresight/coresight-etm4x-core.c | 20 +++++++++---------- drivers/hwtracing/coresight/coresight-etm4x.h | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) -- 2.34.1

1 month, 1 week

Re: [PATCH 3/3] coresight: etm4x: Safe access for TRCQCLTR

by Suzuki K Poulose

On 11/04/2024 23:33, Yabin Cui wrote: > On Thu, Apr 11, 2024 at 4:31 AM Suzuki K Poulose <suzuki.poulose(a)arm.com> wrote: >> >> ETM4x implements TRCQCLTR only when the Q elements are supported >> and the Q element filtering is supported (TRCIDR0.QFILT). Access >> to the register otherwise could be fatal. Fix this by tracking the >> availability, like the others. >> >> Fixes: f188b5e76aae9 ("coresight: etm4x: Save/restore state across CPU low power states") >> Reported-by: Yabin Cui <yabinc(a)google.com> >> Signed-off-by: Suzuki K Poulose <suzuki.poulose(a)arm.com> >> --- >> drivers/hwtracing/coresight/coresight-etm4x-core.c | 8 ++++++-- >> drivers/hwtracing/coresight/coresight-etm4x.h | 3 +++ >> 2 files changed, 9 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c >> index ff57aabb24c4..e0ebf7d7db91 100644 >> --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c >> +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c >> @@ -1240,6 +1240,8 @@ static void etm4_init_arch_data(void *info) >> drvdata->nr_event = FIELD_GET(TRCIDR0_NUMEVENT_MASK, etmidr0); >> /* QSUPP, bits[16:15] Q element support field */ >> drvdata->q_support = FIELD_GET(TRCIDR0_QSUPP_MASK, etmidr0); >> + if (drvdata->q_support) >> + drvdata->q_filt = !!(etmidr0 & TRCIDR0_QFILT); >> /* TSSIZE, bits[28:24] Global timestamp size field */ >> drvdata->ts_size = FIELD_GET(TRCIDR0_TSSIZE_MASK, etmidr0); >> >> @@ -1732,7 +1734,8 @@ static int __etm4_cpu_save(struct etmv4_drvdata *drvdata) >> state->trcccctlr = etm4x_read32(csa, TRCCCCTLR); >> state->trcbbctlr = etm4x_read32(csa, TRCBBCTLR); >> state->trctraceidr = etm4x_read32(csa, TRCTRACEIDR); >> - state->trcqctlr = etm4x_read32(csa, TRCQCTLR); >> + if (drvdata->q_filt) >> + state->trcqctlr = etm4x_read32(csa, TRCQCTLR); >> >> state->trcvictlr = etm4x_read32(csa, TRCVICTLR); >> state->trcviiectlr = etm4x_read32(csa, TRCVIIECTLR); >> @@ -1862,7 +1865,8 @@ static void __etm4_cpu_restore(struct etmv4_drvdata *drvdata) >> etm4x_relaxed_write32(csa, state->trcccctlr, TRCCCCTLR); >> etm4x_relaxed_write32(csa, state->trcbbctlr, TRCBBCTLR); >> etm4x_relaxed_write32(csa, state->trctraceidr, TRCTRACEIDR); >> - etm4x_relaxed_write32(csa, state->trcqctlr, TRCQCTLR); >> + if (drvdata->q_filt) >> + etm4x_relaxed_write32(csa, state->trcqctlr, TRCQCTLR); >> >> etm4x_relaxed_write32(csa, state->trcvictlr, TRCVICTLR); >> etm4x_relaxed_write32(csa, state->trcviiectlr, TRCVIIECTLR); >> diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h >> index acd2b1db2052..25dc8ffef5c0 100644 >> --- a/drivers/hwtracing/coresight/coresight-etm4x.h >> +++ b/drivers/hwtracing/coresight/coresight-etm4x.h >> @@ -136,6 +136,7 @@ >> * of _MASK for multi bit fields and BIT() for single bits. >> */ >> #define TRCIDR0_INSTP0_MASK GENMASK(2, 1) >> +#define TRCIDR0_QFILT BIT(4) > > COMMENT: QFILT is BIT(14)? Indeed. I will fix this in the next revision. Thanks Suzuki > >> #define TRCIDR0_TRCBB BIT(5) >> #define TRCIDR0_TRCCOND BIT(6) >> #define TRCIDR0_TRCCCI BIT(7) >> @@ -979,6 +980,7 @@ struct etmv4_save_state { >> * @os_unlock: True if access to management registers is allowed. >> * @instrp0: Tracing of load and store instructions >> * as P0 elements is supported. >> + * @q_filt: Q element filtering support, if Q elements are supported. >> * @trcbb: Indicates if the trace unit supports branch broadcast tracing. >> * @trccond: If the trace unit supports conditional >> * instruction tracing. >> @@ -1041,6 +1043,7 @@ struct etmv4_drvdata { >> bool boot_enable; >> bool os_unlock; >> bool instrp0; >> + bool q_filt; >> bool trcbb; >> bool trccond; >> bool retstack; >> -- >> 2.34.1 >>

1 month, 1 week

Re: [PATCH 1/3] coresight: etm4x: Do not hardcode IOMEM access for register restore

by Suzuki K Poulose

On 11/04/2024 23:30, Yabin Cui wrote: > On Thu, Apr 11, 2024 at 4:31 AM Suzuki K Poulose <suzuki.poulose(a)arm.com> wrote: >> >> When we restore the register state for ETM4x, while coming back >> from CPU idle, we hardcode IOMEM access. This is wrong and could >> blow up for an ETM with system instructions access (and for ETE). >> >> Fixes: f5bd523690d2f ("coresight: etm4x: Convert all register accesses") >> Reported-by: Yabin Cui <yabinc(a)google.com> >> Signed-off-by: Suzuki K Poulose <suzuki.poulose(a)arm.com> >> --- >> drivers/hwtracing/coresight/coresight-etm4x-core.c | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c >> index c2ca4a02dfce..fae96151cdaf 100644 >> --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c >> +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c >> @@ -1843,8 +1843,10 @@ static void __etm4_cpu_restore(struct etmv4_drvdata *drvdata) >> { >> int i; >> struct etmv4_save_state *state = drvdata->save_state; >> - struct csdev_access tmp_csa = CSDEV_ACCESS_IOMEM(drvdata->base); >> - struct csdev_access *csa = &tmp_csa; >> + struct csdev_access *csa = &drvdata->csdev->access; >> + >> + if (!WARN_ON(!drvdata->csdev)) > > COMMENT: Remove ! before WARN_ON? WARN_ON returns 1 when the warning happens. > Yikes! Well spotted, I will fix this. Suzuki >> + return; >> >> etm4_cs_unlock(drvdata, csa); >> etm4x_relaxed_write32(csa, state->trcclaimset, TRCCLAIMSET); >> -- >> 2.34.1 >>

1 month, 1 week

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

CoreSight April 2024