CoreSight

coresight@lists.linaro.org

5 participants
2659 discussions

[PATCH AUTOSEL 5.4 164/330] perf cs-etm: Swap packets for instruction samples

by Sasha Levin

From: Leo Yan <leo.yan(a)linaro.org> [ Upstream commit d01751563caf0dec7be36f81de77cc0197b77e59 ] If use option '--itrace=iNNN' with Arm CoreSight trace data, perf tool fails inject instruction samples; the root cause is the packets are only swapped for branch samples and last branches but not for instruction samples, so the new coming packets cannot be properly handled for only synthesizing instruction samples. To fix this issue, this patch refactors the code with a new function cs_etm__packet_swap() which is used to swap packets and adds the condition for instruction samples. Signed-off-by: Leo Yan <leo.yan(a)linaro.org> Reviewed-by: Mathieu Poirier <mathieu.poirier(a)linaro.org> Reviewed-by: Mike Leach <mike.leach(a)linaro.org> Cc: Alexander Shishkin <alexander.shishkin(a)linux.intel.com> Cc: Jiri Olsa <jolsa(a)redhat.com> Cc: Mark Rutland <mark.rutland(a)arm.com> Cc: Namhyung Kim <namhyung(a)kernel.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Robert Walker <robert.walker(a)arm.com> Cc: Suzuki Poulouse <suzuki.poulose(a)arm.com> Cc: coresight ml <coresight(a)lists.linaro.org> Cc: linux-arm-kernel(a)lists.infradead.org Link: http://lore.kernel.org/lkml/20200219021811.20067-2-leo.yan@linaro.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/perf/util/cs-etm.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index f5f855fff412e..38298cbb07524 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -363,6 +363,23 @@ struct cs_etm_packet_queue return NULL; } +static void cs_etm__packet_swap(struct cs_etm_auxtrace *etm, + struct cs_etm_traceid_queue *tidq) +{ + struct cs_etm_packet *tmp; + + if (etm->sample_branches || etm->synth_opts.last_branch || + etm->sample_instructions) { + /* + * Swap PACKET with PREV_PACKET: PACKET becomes PREV_PACKET for + * the next incoming packet. + */ + tmp = tidq->packet; + tidq->packet = tidq->prev_packet; + tidq->prev_packet = tmp; + } +} + static void cs_etm__packet_dump(const char *pkt_string) { const char *color = PERF_COLOR_BLUE; @@ -1340,7 +1357,6 @@ static int cs_etm__sample(struct cs_etm_queue *etmq, struct cs_etm_traceid_queue *tidq) { struct cs_etm_auxtrace *etm = etmq->etm; - struct cs_etm_packet *tmp; int ret; u8 trace_chan_id = tidq->trace_chan_id; u64 instrs_executed = tidq->packet->instr_count; @@ -1404,15 +1420,7 @@ static int cs_etm__sample(struct cs_etm_queue *etmq, } } - if (etm->sample_branches || etm->synth_opts.last_branch) { - /* - * Swap PACKET with PREV_PACKET: PACKET becomes PREV_PACKET for - * the next incoming packet. - */ - tmp = tidq->packet; - tidq->packet = tidq->prev_packet; - tidq->prev_packet = tmp; - } + cs_etm__packet_swap(etm, tidq); return 0; } @@ -1441,7 +1449,6 @@ static int cs_etm__flush(struct cs_etm_queue *etmq, { int err = 0; struct cs_etm_auxtrace *etm = etmq->etm; - struct cs_etm_packet *tmp; /* Handle start tracing packet */ if (tidq->prev_packet->sample_type == CS_ETM_EMPTY) @@ -1476,15 +1483,7 @@ static int cs_etm__flush(struct cs_etm_queue *etmq, } swap_packet: - if (etm->sample_branches || etm->synth_opts.last_branch) { - /* - * Swap PACKET with PREV_PACKET: PACKET becomes PREV_PACKET for - * the next incoming packet. - */ - tmp = tidq->packet; - tidq->packet = tidq->prev_packet; - tidq->prev_packet = tmp; - } + cs_etm__packet_swap(etm, tidq); return err; } -- 2.25.1

6 years

[PATCH] coresight: etm4x: Fix number of resources check for ETM 4.3 and above.

by Mike Leach

The initialisation code checks TRCIDR4 to determine the number of resource selectors available on the system. Since ETM v 4.3, the value 0 has a different meaning. This patch takes into account this change. Signed-off-by: Mike Leach <mike.leach(a)linaro.org> --- drivers/hwtracing/coresight/coresight-etm4x.c | 8 +++++++- drivers/hwtracing/coresight/coresight-etm4x.h | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c index 00c9f0bb8b1a..be687276704c 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.c +++ b/drivers/hwtracing/coresight/coresight-etm4x.c @@ -742,8 +742,14 @@ static void etm4_init_arch_data(void *info) * The number of resource pairs conveyed by the HW starts at 0, i.e a * value of 0x0 indicate 1 resource pair, 0x1 indicate two and so on. * As such add 1 to the value of NUMRSPAIR for a better representation. + * + * For ETM v4.3 and later, 0x0 means 0, and no pairs are available - + * the default TRUE and FALSE resource selectors are omitted. + * Otherwise for values 0x1 and above the number is N + 1 as per v4.2. */ - drvdata->nr_resource = BMVAL(etmidr4, 16, 19) + 1; + drvdata->nr_resource = BMVAL(etmidr4, 16, 19); + if ((drvdata->arch < ETM4X_ARCH_4V3) || (drvdata->nr_resource > 0)) + drvdata->nr_resource += 1; /* * NUMSSCC, bits[23:20] the number of single-shot * comparator control for tracing. Read any status regs as these diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h index 5259f96fd28a..eefc7371c6c4 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.h +++ b/drivers/hwtracing/coresight/coresight-etm4x.h @@ -200,6 +200,9 @@ /* NS MON (EL3) mode never implemented */ #define ETM_EXLEVEL_NS_VICTLR_MASK GENMASK(22, 20) +/* Interpretation of resource numbers change at ETM v4.3 architecture */ +#define ETM4X_ARCH_4V3 0x43 + /** * struct etmv4_config - configuration information related to an ETMv4 * @mode: Controls various modes supported by this ETM. -- 2.17.1

6 years

Re: [Linaro/OpenCSD] ARM traces with speculation information (#27)

by Mike Leach

Hi, I.m adding in the Coresight mailing list in case anyone else has further information. I am unaware of any current implementation available that has speculative trace. The speculative trace support has been tested within ARM as part of internal architecture validation that is not available publicly. Regards Mike On Fri, 11 Sep 2020 at 07:36, Albert Schulz <notifications(a)github.com> wrote: > ETMv4 supports giving speculative information for program flow, but most > implementation does not seem to support that, nor any traces containing > these are existent in this repository. Do you know about implementations / > architectures supporting that so we could enrich the testsuites? > > — > You are receiving this because you are subscribed to this thread. > Reply to this email directly, view it on GitHub > <https://github.com/Linaro/OpenCSD/issues/27>, or unsubscribe > <https://github.com/notifications/unsubscribe-auth/ADF7BMYMQCLYALIFQLLHYDTSF…> > . > -- Mike Leach Principal Engineer, ARM Ltd. Manchester Design Centre. UK

6 years

[PATCH v3 0/6] tracing: export event trace and trace_marker

by Tingwei Zhang

Ftrace has ability to export trace packets to other destination. Currently, only function trace can be exported. This series extends the support to event trace and trace_maker. STM is one possible destination to export ftrace. Use separate channel for each CPU to avoid mixing up packets from different CPUs together. Change from v2: Change flag definition to BIT(). (Steven) Add comment in stm_ftrace_write() to clarify it's safe to use smp_processor_id() here since preempt is disabled. (Steven) Change from v1: All changes are suggested by Steven Rostedt. User separate flag to control function trace, event trace and trace mark. Allocate channels according to num_possible_cpu() dynamically. Move ftrace_exports routines up so all ftrace can use them. Tingwei Zhang (6): stm class: ftrace: change dependency to TRACING tracing: add flag to control different traces tracing: add trace_export support for event trace tracing: add trace_export support for trace_marker stm class: ftrace: enable supported trace export flag stm class: ftrace: use different channel accroding to CPU drivers/hwtracing/stm/Kconfig | 2 +- drivers/hwtracing/stm/ftrace.c | 7 +- include/linux/trace.h | 7 + kernel/trace/trace.c | 270 ++++++++++++++++++--------------- 4 files changed, 159 insertions(+), 127 deletions(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

6 years

[PATCH v10 00/24] coresight: allow to build coresight as modules

by Tingwei Zhang

Allow to build coresight as modules. This gives developers the feasibility to test their code without reboot. This series is based on below two series. - "coresight: allow to build components as modules" https://lkml.org/lkml/2018/6/5/989 - "coresight: make drivers modular" https://lkml.org/lkml/2020/1/17/468 Change from v9: Fix warning reported by kernel test robot <lkp(a)intel.com> Rebase to coresight-next Change from v8: Protect etmdrvdata[] by modifying it on relevant CPU (Mathieu and Suzuki) Grab the device before allocating memory for the node (Mathieu) Add author of coresight core driver (Mathieu) Change from v7: Depends on below change for ETM hotplug (Sai) https://lore.kernel.org/linux-arm-kernel/20200729051310.18436-1-saiprakash.… Add mutex lock to protect etmdrvdata[] (Suzuki) Add helper function coresight_get_ref() (Suzuki) Reorg replicator and funnel change. Use two patches to support these two drivers. (Suzuki) Add fix tag to "coresight: etm: perf: Fix warning caused by etm_setup_aux failure" (Suzuki) Update author of "coresight: cti: Fix bug clearing sysfs links on callback" Change from v6: Correct module description for CATU (Mike) Check ect_ret equals 0 and set ect_enabled flag (Mike) Add Tested-by and Reviewed-by from Mike Change from v5: Add below CTI clean up change from Mike into series -https://lists.linaro.org/pipermail/coresight/2020-July/004349.html Increase module reference count when enabling CTI device (Mike) Change from v4: Fix error handling in coresight_grab_devicei() (Greg) Add coresight: cti: Fix remove sysfs link error from Mike -https://lists.linaro.org/pipermail/coresight/2020-July/004275.html Move cti_remove_conn_xrefs() into cti_remove() (Mike) Align patch subject to coresight: <component>: <description> (Mike) Change from v3: Rebase to coresight-next (Mike and Mathieu) Reorder try_get_module() (Suzuki) Clean up etmdrvdata[] in device remote path (Mike) Move cti_remove_conn_xrefs to cti_remove (Mike) Change from v2: Rebase to 5.8-rc5. Export coresight_add_sysfs_link and coresight_remove_sysfs_link Fix one cut and paste error on MODULE_DESCRIPTION of CTI Change from v1: Use try_module_get() to avoid module to be unloaded when device is used in active trace session. (Mathieu P) Change from above two series. This series adds the support to dynamically remove module when the device in that module is enabled and used by some trace path. It disables all trace paths with that device and release the trace path. Kim Phillips (8): coresight: use IS_ENABLED for CONFIGs that may be modules coresight: etm3x: allow etm3x to be built as a module coresight: etm4x: allow etm4x to be built as a module coresight: etb: allow etb to be built as a module coresight: tpiu: allow tpiu to be built as a module coresight: tmc: allow tmc to be built as a module coresight: allow funnel driver to be built as module coresight: allow replicator driver to be built as module Mian Yousaf Kaukab (2): coresight: export global symbols coresight: tmc-etr: add function to register catu ops Mike Leach (2): coresight: cti: Fix remove sysfs link error coresight: cti: Fix bug clearing sysfs links on callback Tingwei Zhang (12): coresight: cpu_debug: add module name in Kconfig coresight: cpu_debug: define MODULE_DEVICE_TABLE coresight: add coresight prefix to barrier_pkt coresight: add try_get_module() in coresight_grab_device() coresight: stm: allow to build coresight-stm as a module coresight: etm: perf: Fix warning caused by etm_setup_aux failure coresight: cti: add function to register cti associate ops coresight: cti: don't disable ect device if it's not enabled coresight: cti: increase reference count when enabling cti coresight: cti: allow cti to be built as a module coresight: catu: allow catu drivers to be built as modules coresight: allow the coresight core driver to be built as a module drivers/hwtracing/coresight/Kconfig | 54 ++++-- drivers/hwtracing/coresight/Makefile | 22 +-- drivers/hwtracing/coresight/coresight-catu.c | 37 ++++- drivers/hwtracing/coresight/coresight-catu.h | 2 - .../{coresight.c => coresight-core.c} | 154 +++++++++++++++--- .../hwtracing/coresight/coresight-cpu-debug.c | 2 + .../{coresight-cti.c => coresight-cti-core.c} | 67 ++++++-- drivers/hwtracing/coresight/coresight-etb10.c | 28 +++- .../hwtracing/coresight/coresight-etm-perf.c | 13 +- .../hwtracing/coresight/coresight-etm-perf.h | 5 +- ...resight-etm3x.c => coresight-etm3x-core.c} | 28 +++- ...resight-etm4x.c => coresight-etm4x-core.c} | 84 +++++++--- .../hwtracing/coresight/coresight-funnel.c | 64 +++++++- .../hwtracing/coresight/coresight-platform.c | 1 + drivers/hwtracing/coresight/coresight-priv.h | 24 ++- .../coresight/coresight-replicator.c | 65 +++++++- drivers/hwtracing/coresight/coresight-stm.c | 20 ++- drivers/hwtracing/coresight/coresight-sysfs.c | 2 + .../{coresight-tmc.c => coresight-tmc-core.c} | 25 ++- .../hwtracing/coresight/coresight-tmc-etf.c | 2 +- .../hwtracing/coresight/coresight-tmc-etr.c | 21 ++- drivers/hwtracing/coresight/coresight-tmc.h | 3 + drivers/hwtracing/coresight/coresight-tpiu.c | 20 ++- include/linux/coresight.h | 3 +- 24 files changed, 636 insertions(+), 110 deletions(-) rename drivers/hwtracing/coresight/{coresight.c => coresight-core.c} (92%) rename drivers/hwtracing/coresight/{coresight-cti.c => coresight-cti-core.c} (94%) rename drivers/hwtracing/coresight/{coresight-etm3x.c => coresight-etm3x-core.c} (97%) rename drivers/hwtracing/coresight/{coresight-etm4x.c => coresight-etm4x-core.c} (96%) rename drivers/hwtracing/coresight/{coresight-tmc.c => coresight-tmc-core.c} (95%) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

6 years

Re: [PATCH v10 21/24] coresight: cti: allow cti to be built as a module

by Mathieu Poirier

On Fri, Sep 11, 2020 at 02:51:33AM +0000, Tingwei Zhang wrote: > On Fri, Sep 11, 2020 at 07:03:03AM +0800, Mathieu Poirier wrote: > > On Fri, Aug 21, 2020 at 11:44:42AM +0800, Tingwei Zhang wrote: > > > Allow to build coresight-cti as a module, for ease of development. > > > > > > - Kconfig becomes a tristate, to allow =m > > > - append -core to source file name to allow module to > > > be called coresight-cti by the Makefile > > > - add an cti_remove function, for module unload > > > - move cti_remove_conn_xrefs to cti_remove > > > - add a MODULE_DEVICE_TABLE for autoloading on boot > > > > > > Signed-off-by: Tingwei Zhang <tingwei(a)codeaurora.org> > > > Tested-by: Mike Leach <mike.leach(a)linaro.org> > > > Reviewed-by Mike Leach <mike.leach(a)linaro.org> > > > --- > > > drivers/hwtracing/coresight/Kconfig | 5 ++++- > > > drivers/hwtracing/coresight/Makefile | 4 ++-- > > > .../{coresight-cti.c => coresight-cti-core.c} | 20 ++++++++++++++++++- > > > .../hwtracing/coresight/coresight-platform.c | 1 + > > > drivers/hwtracing/coresight/coresight.c | 1 + > > > 5 files changed, 27 insertions(+), 4 deletions(-) > > > rename drivers/hwtracing/coresight/{coresight-cti.c => > > coresight-cti-core.c} (98%) > > > > > > diff --git a/drivers/hwtracing/coresight/Kconfig > > b/drivers/hwtracing/coresight/Kconfig > > > index f31778dd0b5d..b04aae2ceecc 100644 > > > --- a/drivers/hwtracing/coresight/Kconfig > > > +++ b/drivers/hwtracing/coresight/Kconfig > > > @@ -136,7 +136,7 @@ config CORESIGHT_CPU_DEBUG > > > module will be called coresight-cpu-debug. > > > > > > config CORESIGHT_CTI > > > - bool "CoreSight Cross Trigger Interface (CTI) driver" > > > + tristate "CoreSight Cross Trigger Interface (CTI) driver" > > > depends on ARM || ARM64 > > > help > > > This driver provides support for CoreSight CTI and CTM > > components. > > > @@ -147,6 +147,9 @@ config CORESIGHT_CTI > > > halt compared to disabling sources and sinks normally in driver > > > software. > > > > > > + To compile this driver as a module, choose M here: the > > > + module will be called coresight-cti. > > > + > > > config CORESIGHT_CTI_INTEGRATION_REGS > > > bool "Access CTI CoreSight Integration Registers" > > > depends on CORESIGHT_CTI > > > diff --git a/drivers/hwtracing/coresight/Makefile > > b/drivers/hwtracing/coresight/Makefile > > > index f2a568b969c4..0359d5a1588f 100644 > > > --- a/drivers/hwtracing/coresight/Makefile > > > +++ b/drivers/hwtracing/coresight/Makefile > > > @@ -19,6 +19,6 @@ coresight-etm4x-y := coresight-etm4x-core.o > > coresight-etm4x-sysfs.o > > > obj-$(CONFIG_CORESIGHT_STM) += coresight-stm.o > > > obj-$(CONFIG_CORESIGHT_CPU_DEBUG) += coresight-cpu-debug.o > > > obj-$(CONFIG_CORESIGHT_CATU) += coresight-catu.o > > > -obj-$(CONFIG_CORESIGHT_CTI) += coresight-cti.o \ > > > - coresight-cti-platform.o \ > > > +obj-$(CONFIG_CORESIGHT_CTI) += coresight-cti.o > > > +coresight-cti-y := coresight-cti-core.o coresight-cti-platform.o \ > > > coresight-cti-sysfs.o > > > diff --git a/drivers/hwtracing/coresight/coresight-cti.c > > b/drivers/hwtracing/coresight/coresight-cti-core.c > > > similarity index 98% > > > rename from drivers/hwtracing/coresight/coresight-cti.c > > > rename to drivers/hwtracing/coresight/coresight-cti-core.c > > > index ec286d617b73..d6d5419ec21c 100644 > > > --- a/drivers/hwtracing/coresight/coresight-cti.c > > > +++ b/drivers/hwtracing/coresight/coresight-cti-core.c > > > @@ -838,7 +838,6 @@ static void cti_device_release(struct device *dev) > > > struct cti_drvdata *ect_item, *ect_tmp; > > > > > > mutex_lock(&ect_mutex); > > > - cti_remove_conn_xrefs(drvdata); > > > cti_pm_release(drvdata); > > > > > > /* remove from the list */ > > > @@ -853,6 +852,18 @@ static void cti_device_release(struct device *dev) > > > if (drvdata->csdev_release) > > > drvdata->csdev_release(dev); > > > } > > > +static int __exit cti_remove(struct amba_device *adev) > > > +{ > > > + struct cti_drvdata *drvdata = dev_get_drvdata(&adev->dev); > > > + > > > + mutex_lock(&ect_mutex); > > > + cti_remove_conn_xrefs(drvdata); > > > + mutex_unlock(&ect_mutex); > > > + > > > + coresight_unregister(drvdata->csdev); > > > + > > > + return 0; > > > > Once again my recommendations from V8 were not followed. > > > > Sorry for missing your comment. I'll add reason for above change > in commit message in V11. > I have a couple more things to check on this set - please hold off on V11. I will let you know when I'm done. > Thanks, > Tingwei > > > > +} > > > > > > static int cti_probe(struct amba_device *adev, const struct amba_id > > *id) > > > { > > > @@ -973,6 +984,8 @@ static const struct amba_id cti_ids[] = { > > > { 0, 0}, > > > }; > > > > > > +MODULE_DEVICE_TABLE(amba, cti_ids); > > > + > > > static struct amba_driver cti_driver = { > > > .drv = { > > > .name = "coresight-cti", > > > @@ -980,6 +993,7 @@ static struct amba_driver cti_driver = { > > > .suppress_bind_attrs = true, > > > }, > > > .probe = cti_probe, > > > + .remove = cti_remove, > > > .id_table = cti_ids, > > > }; > > > > > > @@ -1002,3 +1016,7 @@ static void __exit cti_exit(void) > > > > > > module_init(cti_init); > > > module_exit(cti_exit); > > > + > > > +MODULE_AUTHOR("Mike Leach <mike.leach(a)linaro.org>"); > > > +MODULE_DESCRIPTION("Arm CoreSight CTI Driver"); > > > +MODULE_LICENSE("GPL v2"); > > > diff --git a/drivers/hwtracing/coresight/coresight-platform.c > > b/drivers/hwtracing/coresight/coresight-platform.c > > > index 227e234a2470..3629b7885aca 100644 > > > --- a/drivers/hwtracing/coresight/coresight-platform.c > > > +++ b/drivers/hwtracing/coresight/coresight-platform.c > > > @@ -75,6 +75,7 @@ coresight_find_csdev_by_fwnode(struct fwnode_handle > > *r_fwnode) > > > } > > > return csdev; > > > } > > > +EXPORT_SYMBOL_GPL(coresight_find_csdev_by_fwnode); > > > > > > #ifdef CONFIG_OF > > > static inline bool of_coresight_legacy_ep_is_input(struct device_node > > *ep) > > > diff --git a/drivers/hwtracing/coresight/coresight.c > > b/drivers/hwtracing/coresight/coresight.c > > > index 6c9f6930b8b8..668963b4b7d4 100644 > > > --- a/drivers/hwtracing/coresight/coresight.c > > > +++ b/drivers/hwtracing/coresight/coresight.c > > > @@ -288,6 +288,7 @@ void coresight_set_assoc_ectdev_mutex(struct > > coresight_device *csdev, > > > csdev->ect_dev = ect_csdev; > > > mutex_unlock(&coresight_mutex); > > > } > > > +EXPORT_SYMBOL_GPL(coresight_set_assoc_ectdev_mutex); > > > > > > static int coresight_enable_sink(struct coresight_device *csdev, > > > u32 mode, void *data) > > > -- > > > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora > > Forum, > > > a Linux Foundation Collaborative Project > > >

6 years

Re: [PATCH v9 00/24] coresight: allow to build coresight as modules

by Tingwei Zhang

On Thu, Sep 10, 2020 at 04:45:52AM +0800, tsoni(a)codeaurora.org wrote: > On 2020-09-09 09:15, Mathieu Poirier wrote: > >On Wed, Sep 09, 2020 at 02:54:33AM +0000, Tingwei Zhang wrote: > >>On Wed, Sep 09, 2020 at 01:53:51AM +0800, Mathieu Poirier wrote: > >>> Hi Tingwei, > >>> > >>> Apologies for the untimely response to this set, I am hoping to get > to > >>> it in the next two weeks. > >>> > >> > >>It's fine, Mathieu. Please let me know your comments once you have time. > >>I'm targeting to get these set merged in 5.10 Kernel. > > > >From the above it is not clear if you want this set to be _in_ the 5.10 > >cycle > >or added to my list _during_ the 5.10 cycle, which would make it part of > >the > >5.11 cycle. In any case the latter seems more realistic. > > Tingwei can correct me here, but we prefer to have patches to be part of the > 5.10 release. It means they should get merged in Linus's tree in the next > merge window. Yes. The target is to merge this series into Linus's tree in 5.10 Kernel. Thanks, Tingwei > > ---Trilok Soni

6 years

Re: [PATCH v9 00/24] coresight: allow to build coresight as modules

by Mathieu Poirier

On Wed, Sep 09, 2020 at 02:54:33AM +0000, Tingwei Zhang wrote: > On Wed, Sep 09, 2020 at 01:53:51AM +0800, Mathieu Poirier wrote: > > Hi Tingwei, > > > > Apologies for the untimely response to this set, I am hoping to get to > > it in the next two weeks. > > > > It's fine, Mathieu. Please let me know your comments once you have time. > I'm targeting to get these set merged in 5.10 Kernel. >From the above it is not clear if you want this set to be _in_ the 5.10 cycle or added to my list _during_ the 5.10 cycle, which would make it part of the 5.11 cycle. In any case the latter seems more realistic. > > > Thanks, > > Mathieu > > > > On Wed, 19 Aug 2020 at 23:47, Tingwei Zhang <tingwei(a)codeaurora.org> > > wrote: > > > > > > Allow to build coresight as modules. This gives developers the > > feasibility to > > > test their code without reboot. > > > > > > This series is based on below two series. > > > > > > - "coresight: allow to build components as modules" > > > https://lkml.org/lkml/2018/6/5/989 > > > - "coresight: make drivers modular" > > > https://lkml.org/lkml/2020/1/17/468 > > > > > > Change from v8: > > > Protect etmdrvdata[] by modifying it on relevant CPU (Mathieu and > > Suzuki) > > > Grab the device before allocating memory for the node (Mathieu) > > > Add author of coresight core driver (Mathieu) > > > > > > Change from v7: > > > Depends on below change for ETM hotplug (Sai) > > > > > https://lore.kernel.org/linux-arm-kernel/20200729051310.18436-1-saiprakash > > .ranjan(a)codeaurora.org/ > > > Add mutex lock to protect etmdrvdata[] (Suzuki) > > > Add helper function coresight_get_ref() (Suzuki) > > > Reorg replicator and funnel change. Use two patches to support these > > > two drivers. (Suzuki) > > > Add fix tag to "coresight: etm: perf: Fix warning caused by > > etm_setup_aux > > > failure" (Suzuki) > > > Update author of "coresight: cti: Fix bug clearing sysfs links on > > callback" > > > > > > Change from v6: > > > Correct module description for CATU (Mike) > > > Check ect_ret equals 0 and set ect_enabled flag (Mike) > > > Add Tested-by and Reviewed-by from Mike > > > > > > Change from v5: > > > Add below CTI clean up change from Mike into series > > > -https://lists.linaro.org/pipermail/coresight/2020-July/004349.html > > > Increase module reference count when enabling CTI device (Mike) > > > > > > Change from v4: > > > Fix error handling in coresight_grab_devicei() (Greg) > > > Add coresight: cti: Fix remove sysfs link error from Mike > > > -https://lists.linaro.org/pipermail/coresight/2020-July/004275.html > > > Move cti_remove_conn_xrefs() into cti_remove() (Mike) > > > Align patch subject to coresight: <component>: <description> (Mike) > > > > > > Change from v3: > > > Rebase to coresight-next (Mike and Mathieu) > > > Reorder try_get_module() (Suzuki) > > > Clean up etmdrvdata[] in device remote path (Mike) > > > Move cti_remove_conn_xrefs to cti_remove (Mike) > > > > > > Change from v2: > > > Rebase to 5.8-rc5. Export coresight_add_sysfs_link and > > > coresight_remove_sysfs_link > > > Fix one cut and paste error on MODULE_DESCRIPTION of CTI > > > > > > Change from v1: > > > Use try_module_get() to avoid module to be unloaded when device is used > > > in active trace session. (Mathieu P) > > > > > > Change from above two series. > > > This series adds the support to dynamically remove module when the > > device in > > > that module is enabled and used by some trace path. It disables all > > trace > > > paths with that device and release the trace path. > > > > > > Kim Phillips (8): > > > coresight: use IS_ENABLED for CONFIGs that may be modules > > > coresight: etm3x: allow etm3x to be built as a module > > > coresight: etm4x: allow etm4x to be built as a module > > > coresight: etb: allow etb to be built as a module > > > coresight: tpiu: allow tpiu to be built as a module > > > coresight: tmc: allow tmc to be built as a module > > > coresight: allow funnel driver to be built as module > > > coresight: allow replicator driver to be built as module > > > > > > Mian Yousaf Kaukab (2): > > > coresight: export global symbols > > > coresight: tmc-etr: add function to register catu ops > > > > > > Mike Leach (2): > > > coresight: cti: Fix remove sysfs link error > > > coresight: cti: Fix bug clearing sysfs links on callback > > > > > > Tingwei Zhang (12): > > > coresight: cpu_debug: add module name in Kconfig > > > coresight: cpu_debug: define MODULE_DEVICE_TABLE > > > coresight: add coresight prefix to barrier_pkt > > > coresight: add try_get_module() in coresight_grab_device() > > > coresight: stm: allow to build coresight-stm as a module > > > coresight: etm: perf: Fix warning caused by etm_setup_aux failure > > > coresight: cti: add function to register cti associate ops > > > coresight: cti: don't disable ect device if it's not enabled > > > coresight: cti: increase reference count when enabling cti > > > coresight: cti: allow cti to be built as a module > > > coresight: catu: allow catu drivers to be built as modules > > > coresight: allow the coresight core driver to be built as a module > > > > > > drivers/hwtracing/coresight/Kconfig | 54 ++++-- > > > drivers/hwtracing/coresight/Makefile | 22 +-- > > > drivers/hwtracing/coresight/coresight-catu.c | 37 ++++- > > > drivers/hwtracing/coresight/coresight-catu.h | 2 - > > > .../{coresight.c => coresight-core.c} | 154 +++++++++++++++--- > > > .../hwtracing/coresight/coresight-cpu-debug.c | 2 + > > > .../{coresight-cti.c => coresight-cti-core.c} | 63 ++++++- > > > drivers/hwtracing/coresight/coresight-etb10.c | 28 +++- > > > .../hwtracing/coresight/coresight-etm-perf.c | 13 +- > > > .../hwtracing/coresight/coresight-etm-perf.h | 5 +- > > > ...resight-etm3x.c => coresight-etm3x-core.c} | 28 +++- > > > ...resight-etm4x.c => coresight-etm4x-core.c} | 84 +++++++--- > > > .../hwtracing/coresight/coresight-funnel.c | 64 +++++++- > > > .../hwtracing/coresight/coresight-platform.c | 1 + > > > drivers/hwtracing/coresight/coresight-priv.h | 24 ++- > > > .../coresight/coresight-replicator.c | 65 +++++++- > > > drivers/hwtracing/coresight/coresight-stm.c | 20 ++- > > > drivers/hwtracing/coresight/coresight-sysfs.c | 2 + > > > .../{coresight-tmc.c => coresight-tmc-core.c} | 25 ++- > > > .../hwtracing/coresight/coresight-tmc-etf.c | 2 +- > > > .../hwtracing/coresight/coresight-tmc-etr.c | 21 ++- > > > drivers/hwtracing/coresight/coresight-tmc.h | 3 + > > > drivers/hwtracing/coresight/coresight-tpiu.c | 20 ++- > > > include/linux/coresight.h | 3 +- > > > 24 files changed, 634 insertions(+), 108 deletions(-) > > > rename drivers/hwtracing/coresight/{coresight.c => coresight-core.c} > > (92%) > > > rename drivers/hwtracing/coresight/{coresight-cti.c => > > coresight-cti-core.c} (94%) > > > rename drivers/hwtracing/coresight/{coresight-etm3x.c => > > coresight-etm3x-core.c} (97%) > > > rename drivers/hwtracing/coresight/{coresight-etm4x.c => > > coresight-etm4x-core.c} (96%) > > > rename drivers/hwtracing/coresight/{coresight-tmc.c => > > coresight-tmc-core.c} (95%) > > > > > > -- > > > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora > > Forum, > > > a Linux Foundation Collaborative Project > > > > > > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel(a)lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

6 years

Re: [PATCH] coresight: etm4x: fix issues on trcseqevr access

by Mathieu Poirier

Hi Mike, On Mon, 7 Sep 2020 at 10:52, Mike Leach <mike.leach(a)linaro.org> wrote: > > Hi, > > On Thu, 3 Sep 2020 at 18:42, Mathieu Poirier <mathieu.poirier(a)linaro.org> wrote: > > > > On Wed, Sep 02, 2020 at 06:37:13PM +0800, Jonathan Zhou wrote: > > > The TRCSEQEVR(3) is reserved, using '@nrseqstate - 1' instead to avoid > > > accessing the reserved register. > > > > > > Fixes: f188b5e76aae ("coresight: etm4x: Save/restore state across CPU low power states") > > > Cc: Mathieu Poirier <mathieu.poirier(a)linaro.org> > > > Cc: Suzuki K Poulose <suzuki.poulose(a)arm.com> > > > Cc: Mike Leach <mike.leach(a)linaro.org> > > > Cc: Shaokun Zhang <zhangshaokun(a)hisilicon.com> > > > Cc: lizixian(a)hisilicon.com > > > > > > Signed-off-by: Jonathan Zhou <jonathan.zhouwen(a)huawei.com> > > > --- > > > drivers/hwtracing/coresight/coresight-etm4x.c | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c > > > index 96425e818fc2..44e44c817bf8 100644 > > > --- a/drivers/hwtracing/coresight/coresight-etm4x.c > > > +++ b/drivers/hwtracing/coresight/coresight-etm4x.c > > > @@ -1183,7 +1183,7 @@ static int etm4_cpu_save(struct etmv4_drvdata *drvdata) > > > state->trcvdsacctlr = readl(drvdata->base + TRCVDSACCTLR); > > > state->trcvdarcctlr = readl(drvdata->base + TRCVDARCCTLR); > > > > > > - for (i = 0; i < drvdata->nrseqstate; i++) > > > + for (i = 0; i < drvdata->nrseqstate - 1; i++) > > > state->trcseqevr[i] = readl(drvdata->base + TRCSEQEVRn(i)); > > > > The section 3.4.3 "Guidelines for trace unit registers to be saved and restored" > > of the ETM4 Architecture Specification (ARM IHI0064F ID042818) is clear on the > > fact that registers TRCSEQEVR0-3 have to be taken into account when saving the > > I think this is a typo in the TRM. I'll ping the docs people in ARM. Did you get an answer from the document people? Is this really a typographical problem? Thanks, Mathieu > > > trace unit state. > > > > Looking @ the register descriptions for TRCSEQEVRn (7.3.63) in the > above document n=0-2. > The number of states is set by TRCIDR5.NUMSEQSTATE (7.3.35). This can > take the value 0 or 4. > If 4 then there are 3 TRCSEQEVR(n) registers - 0 to 2 - one for each > state transition. > > Thus this patch is correct in using nrseqstate - 1. > > Regards > > Mike > > > Thanks, > > Mathieu > > > > > > > > state->trcseqrstevr = readl(drvdata->base + TRCSEQRSTEVR); > > > @@ -1288,7 +1288,7 @@ static void etm4_cpu_restore(struct etmv4_drvdata *drvdata) > > > writel_relaxed(state->trcvdsacctlr, drvdata->base + TRCVDSACCTLR); > > > writel_relaxed(state->trcvdarcctlr, drvdata->base + TRCVDARCCTLR); > > > > > > - for (i = 0; i < drvdata->nrseqstate; i++) > > > + for (i = 0; i < drvdata->nrseqstate - 1; i++) > > > writel_relaxed(state->trcseqevr[i], > > > drvdata->base + TRCSEQEVRn(i)); > > > -- > > > 1.9.1 > > > > > > > -- > Mike Leach > Principal Engineer, ARM Ltd. > Manchester Design Centre. UK

6 years

[PATCH v9 00/24] coresight: allow to build coresight as modules

by Tingwei Zhang

Allow to build coresight as modules. This gives developers the feasibility to test their code without reboot. This series is based on below two series. - "coresight: allow to build components as modules" https://lkml.org/lkml/2018/6/5/989 - "coresight: make drivers modular" https://lkml.org/lkml/2020/1/17/468 Change from v8: Protect etmdrvdata[] by modifying it on relevant CPU (Mathieu and Suzuki) Grab the device before allocating memory for the node (Mathieu) Add author of coresight core driver (Mathieu) Change from v7: Depends on below change for ETM hotplug (Sai) https://lore.kernel.org/linux-arm-kernel/20200729051310.18436-1-saiprakash.… Add mutex lock to protect etmdrvdata[] (Suzuki) Add helper function coresight_get_ref() (Suzuki) Reorg replicator and funnel change. Use two patches to support these two drivers. (Suzuki) Add fix tag to "coresight: etm: perf: Fix warning caused by etm_setup_aux failure" (Suzuki) Update author of "coresight: cti: Fix bug clearing sysfs links on callback" Change from v6: Correct module description for CATU (Mike) Check ect_ret equals 0 and set ect_enabled flag (Mike) Add Tested-by and Reviewed-by from Mike Change from v5: Add below CTI clean up change from Mike into series -https://lists.linaro.org/pipermail/coresight/2020-July/004349.html Increase module reference count when enabling CTI device (Mike) Change from v4: Fix error handling in coresight_grab_devicei() (Greg) Add coresight: cti: Fix remove sysfs link error from Mike -https://lists.linaro.org/pipermail/coresight/2020-July/004275.html Move cti_remove_conn_xrefs() into cti_remove() (Mike) Align patch subject to coresight: <component>: <description> (Mike) Change from v3: Rebase to coresight-next (Mike and Mathieu) Reorder try_get_module() (Suzuki) Clean up etmdrvdata[] in device remote path (Mike) Move cti_remove_conn_xrefs to cti_remove (Mike) Change from v2: Rebase to 5.8-rc5. Export coresight_add_sysfs_link and coresight_remove_sysfs_link Fix one cut and paste error on MODULE_DESCRIPTION of CTI Change from v1: Use try_module_get() to avoid module to be unloaded when device is used in active trace session. (Mathieu P) Change from above two series. This series adds the support to dynamically remove module when the device in that module is enabled and used by some trace path. It disables all trace paths with that device and release the trace path. Kim Phillips (8): coresight: use IS_ENABLED for CONFIGs that may be modules coresight: etm3x: allow etm3x to be built as a module coresight: etm4x: allow etm4x to be built as a module coresight: etb: allow etb to be built as a module coresight: tpiu: allow tpiu to be built as a module coresight: tmc: allow tmc to be built as a module coresight: allow funnel driver to be built as module coresight: allow replicator driver to be built as module Mian Yousaf Kaukab (2): coresight: export global symbols coresight: tmc-etr: add function to register catu ops Mike Leach (2): coresight: cti: Fix remove sysfs link error coresight: cti: Fix bug clearing sysfs links on callback Tingwei Zhang (12): coresight: cpu_debug: add module name in Kconfig coresight: cpu_debug: define MODULE_DEVICE_TABLE coresight: add coresight prefix to barrier_pkt coresight: add try_get_module() in coresight_grab_device() coresight: stm: allow to build coresight-stm as a module coresight: etm: perf: Fix warning caused by etm_setup_aux failure coresight: cti: add function to register cti associate ops coresight: cti: don't disable ect device if it's not enabled coresight: cti: increase reference count when enabling cti coresight: cti: allow cti to be built as a module coresight: catu: allow catu drivers to be built as modules coresight: allow the coresight core driver to be built as a module drivers/hwtracing/coresight/Kconfig | 54 ++++-- drivers/hwtracing/coresight/Makefile | 22 +-- drivers/hwtracing/coresight/coresight-catu.c | 37 ++++- drivers/hwtracing/coresight/coresight-catu.h | 2 - .../{coresight.c => coresight-core.c} | 154 +++++++++++++++--- .../hwtracing/coresight/coresight-cpu-debug.c | 2 + .../{coresight-cti.c => coresight-cti-core.c} | 63 ++++++- drivers/hwtracing/coresight/coresight-etb10.c | 28 +++- .../hwtracing/coresight/coresight-etm-perf.c | 13 +- .../hwtracing/coresight/coresight-etm-perf.h | 5 +- ...resight-etm3x.c => coresight-etm3x-core.c} | 28 +++- ...resight-etm4x.c => coresight-etm4x-core.c} | 84 +++++++--- .../hwtracing/coresight/coresight-funnel.c | 64 +++++++- .../hwtracing/coresight/coresight-platform.c | 1 + drivers/hwtracing/coresight/coresight-priv.h | 24 ++- .../coresight/coresight-replicator.c | 65 +++++++- drivers/hwtracing/coresight/coresight-stm.c | 20 ++- drivers/hwtracing/coresight/coresight-sysfs.c | 2 + .../{coresight-tmc.c => coresight-tmc-core.c} | 25 ++- .../hwtracing/coresight/coresight-tmc-etf.c | 2 +- .../hwtracing/coresight/coresight-tmc-etr.c | 21 ++- drivers/hwtracing/coresight/coresight-tmc.h | 3 + drivers/hwtracing/coresight/coresight-tpiu.c | 20 ++- include/linux/coresight.h | 3 +- 24 files changed, 634 insertions(+), 108 deletions(-) rename drivers/hwtracing/coresight/{coresight.c => coresight-core.c} (92%) rename drivers/hwtracing/coresight/{coresight-cti.c => coresight-cti-core.c} (94%) rename drivers/hwtracing/coresight/{coresight-etm3x.c => coresight-etm3x-core.c} (97%) rename drivers/hwtracing/coresight/{coresight-etm4x.c => coresight-etm4x-core.c} (96%) rename drivers/hwtracing/coresight/{coresight-tmc.c => coresight-tmc-core.c} (95%) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

6 years

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

CoreSight