CoreSight

coresight@lists.linaro.org

4 participants
2387 discussions

Re: [PATCH] coresight: catu: Fix number of pages while using 64k pages

by Suzuki K Poulose

On Thu, 9 Jan 2025 21:53:48 +0000, Ilkka Koskinen wrote: > Trying to record a trace on kernel with 64k pages resulted in -ENOMEM. > This happens due to a bug in calculating the number of table pages, which > returns zero. Fix the issue by rounding up. > > $ perf record --kcore -e cs_etm/@tmc_etr55,cycacc,branch_broadcast/k --per-thread taskset --cpu-list 1 dd if=/dev/zero of=/dev/null > failed to mmap with 12 (Cannot allocate memory) > > [...] Applied, thanks! [1/1] coresight: catu: Fix number of pages while using 64k pages https://git.kernel.org/coresight/c/0e14e062f5ff Best regards, -- Suzuki K Poulose <suzuki.poulose(a)arm.com>

4 months, 1 week

Re: [PATCH v12 6/7] Coresight: Add Coresight TMC Control Unit driver

by Suzuki K Poulose

On 17/02/2025 09:30, Jie Gan wrote: > The Coresight TMC Control Unit hosts miscellaneous configuration registers > which control various features related to TMC ETR sink. > > Based on the trace ID, which is programmed in the related CTCU ATID > register of a specific ETR, trace data with that trace ID gets into > the ETR buffer, while other trace data gets dropped. > > Enabling source device sets one bit of the ATID register based on > source device's trace ID. > Disabling source device resets the bit according to the source > device's trace ID. > > Reviewed-by: James Clark <james.clark(a)linaro.org> > Signed-off-by: Jie Gan <quic_jiegan(a)quicinc.com> > --- > drivers/hwtracing/coresight/Kconfig | 12 + > drivers/hwtracing/coresight/Makefile | 1 + > drivers/hwtracing/coresight/coresight-ctcu.c | 268 +++++++++++++++++++ > drivers/hwtracing/coresight/coresight-ctcu.h | 24 ++ > include/linux/coresight.h | 3 +- > 5 files changed, 307 insertions(+), 1 deletion(-) > create mode 100644 drivers/hwtracing/coresight/coresight-ctcu.c > create mode 100644 drivers/hwtracing/coresight/coresight-ctcu.h > > diff --git a/drivers/hwtracing/coresight/Kconfig b/drivers/hwtracing/coresight/Kconfig > index 06f0a7594169..ecd7086a5b83 100644 > --- a/drivers/hwtracing/coresight/Kconfig > +++ b/drivers/hwtracing/coresight/Kconfig > @@ -133,6 +133,18 @@ config CORESIGHT_STM > To compile this driver as a module, choose M here: the > module will be called coresight-stm. > > +config CORESIGHT_CTCU > + tristate "CoreSight TMC Control Unit driver" > + depends on CORESIGHT_LINK_AND_SINK_TMC > + help > + This driver provides support for CoreSight TMC Control Unit > + that hosts miscellaneous configuration registers. This is > + primarily used for controlling the behaviors of the TMC > + ETR device. > + > + To compile this driver as a module, choose M here: the > + module will be called coresight-ctcu. > + > config CORESIGHT_CPU_DEBUG > tristate "CoreSight CPU Debug driver" > depends on ARM || ARM64 > diff --git a/drivers/hwtracing/coresight/Makefile b/drivers/hwtracing/coresight/Makefile > index 4ba478211b31..1b7869910a12 100644 > --- a/drivers/hwtracing/coresight/Makefile > +++ b/drivers/hwtracing/coresight/Makefile > @@ -51,3 +51,4 @@ coresight-cti-y := coresight-cti-core.o coresight-cti-platform.o \ > coresight-cti-sysfs.o > obj-$(CONFIG_ULTRASOC_SMB) += ultrasoc-smb.o > obj-$(CONFIG_CORESIGHT_DUMMY) += coresight-dummy.o > +obj-$(CONFIG_CORESIGHT_CTCU) += coresight-ctcu.o > diff --git a/drivers/hwtracing/coresight/coresight-ctcu.c b/drivers/hwtracing/coresight/coresight-ctcu.c > new file mode 100644 > index 000000000000..e1460a627c4d > --- /dev/null > +++ b/drivers/hwtracing/coresight/coresight-ctcu.c > @@ -0,0 +1,268 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. > + */ > + > +#include <linux/clk.h> > +#include <linux/coresight.h> > +#include <linux/device.h> > +#include <linux/err.h> > +#include <linux/kernel.h> > +#include <linux/init.h> > +#include <linux/io.h> > +#include <linux/module.h> > +#include <linux/mutex.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/slab.h> > + > +#include "coresight-ctcu.h" > +#include "coresight-priv.h" > + > +DEFINE_CORESIGHT_DEVLIST(ctcu_devs, "ctcu"); > + > +#define ctcu_writel(drvdata, val, offset) __raw_writel((val), drvdata->base + offset) > +#define ctcu_readl(drvdata, offset) __raw_readl(drvdata->base + offset) > + > +/* > + * The TMC Coresight Control Unit uses four ATID registers to control the data > + * filter function based on the trace ID for each TMC ETR sink. The length of > + * each ATID register is 32 bits. Therefore, the ETR has a related field in > + * CTCU that is 128 bits long. Each trace ID is represented by one bit in that > + * filed. > + * e.g. ETR0ATID0 layout, set bit 5 for traceid 5 > + * bit5 > + * ------------------------------------------------------ > + * | |28| |24| |20| |16| |12| |8| 1|4| |0| > + * ------------------------------------------------------ > + * > + * e.g. ETR0: > + * 127 0 from ATID_offset for ETR0ATID0 > + * ------------------------- > + * |ATID3|ATID2|ATID1|ATID0| > + */ > +#define CTCU_ATID_REG_OFFSET(traceid, atid_offset) \ > + ((traceid / 32) * 4 + atid_offset) > + > +#define CTCU_ATID_REG_BIT(traceid) (traceid % 32) > +#define CTCU_ATID_REG_SIZE 0x10 > + > +struct ctcu_atid_config { > + const u32 atid_offset; > + const u32 port_num; > +}; > + > +struct ctcu_config { > + const struct ctcu_atid_config *atid_config; > + int num_atid_config; > +}; > + > +static const struct ctcu_atid_config sa8775p_atid_cfgs[] = { > + {0xf8, 0}, > + {0x108, 1}, > +}; > + > +static const struct ctcu_config sa8775p_cfgs = { > + .atid_config = sa8775p_atid_cfgs, > + .num_atid_config = ARRAY_SIZE(sa8775p_atid_cfgs), > +}; > + > +static void ctcu_program_atid_register(struct ctcu_drvdata *drvdata, u32 reg_offset, > + u8 bit, bool enable) > +{ > + u32 val; > + > + CS_UNLOCK(drvdata->base); > + val = ctcu_readl(drvdata, reg_offset); > + val = enable? (val | BIT(bit)) : (val & ~BIT(bit)); minor nit: If possible do not use the ternary operator like this. It is much better readable as: if (enable) val |= BIT(bit); else val &= ~BIT(bit); > + ctcu_writel(drvdata, val, reg_offset); > + CS_LOCK(drvdata->base); > +} > + > +/* > + * __ctcu_set_etr_traceid: Set bit in the ATID register based on trace ID when enable is true. > + * Reset the bit of the ATID register based on trace ID when enable is false. > + * > + * @csdev: coresight_device struct related to the device > + * @traceid: trace ID of the source tracer. > + * @port_num: port number from TMC ETR sink. > + * @enable: True for set bit and false for reset bit. > + * > + * Returns 0 indicates success. Non-zero result means failure. > + */ > +static int __ctcu_set_etr_traceid(struct coresight_device *csdev, u8 traceid, int port_num, > + bool enable) > +{ > + struct ctcu_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); > + u32 atid_offset, reg_offset; > + u8 refcnt, bit; > + > + atid_offset = drvdata->atid_offset[port_num]; > + if (atid_offset == 0) > + return -EINVAL; > + > + bit = CTCU_ATID_REG_BIT(traceid); > + reg_offset = CTCU_ATID_REG_OFFSET(traceid, atid_offset); > + if (reg_offset - atid_offset > CTCU_ATID_REG_SIZE) > + return -EINVAL; > + > + guard(raw_spinlock_irqsave)(&drvdata->spin_lock); > + refcnt = drvdata->traceid_refcnt[port_num][traceid]; > + /* Only program the atid register when the refcnt value is 0 or 1 */ A normal trace source won't be enabled more than once (e.g., ETM). The only odd one out is the STM, which may be driven by multiple agents. So this refcounting looks necessary. > + if (enable && (++refcnt == 1)) > + ctcu_program_atid_register(drvdata, reg_offset, bit, enable); > + else if (!enable && (--refcnt == 0)) > + ctcu_program_atid_register(drvdata, reg_offset, bit, enable); minor nit: if ((enable && !refcount++) || (!enable && --refcount)) ctcu_program_atid_register(drvdata, reg_offset, bit, enable); Also, see my comment the bottom for "refcount" being u8 . > + > + drvdata->traceid_refcnt[port_num][traceid] = refcnt; > + > + return 0; > +} > + > +static int ctcu_get_active_port(struct coresight_device *sink, struct coresight_device *helper) > +{ > + int i; > + > + for (i = 0; i < sink->pdata->nr_outconns; ++i) { > + if (sink->pdata->out_conns[i]->dest_dev) > + return sink->pdata->out_conns[i]->dest_port; Don't we need to make sure it matches the helper ? What if there are multiple helpers ? e.g, a CATU connected to the ETR and CTCU ? Or even try the opposite ? i.e. search the helper and find the port matching the sink ? struct coresight_platform_data *pdata = helper->pdata; for (i = 0; i < pdata->nr_inconns; ++i) if (pdata->in_conns[i]->dest_dev == sink) return pdata->in_conns[i]->src_port; Not sure if that works with the helper device connection, James ? > + } > + > + return -EINVAL; > +} > + > +static int ctcu_set_etr_traceid(struct coresight_device *csdev, struct coresight_path *path, > + bool enable) > +{ > + struct coresight_device *sink = coresight_get_sink(path); > + u8 traceid = path->trace_id; > + int port_num; > + > + if ((sink == NULL) || !IS_VALID_CS_TRACE_ID(traceid)) { > + dev_err(&csdev->dev, "Invalid parameters\n"); > + return -EINVAL; > + } > + > + port_num = ctcu_get_active_port(sink, csdev); > + if (port_num < 0) > + return -EINVAL; > + > + dev_dbg(&csdev->dev, "traceid is %d\n", traceid); > + > + return __ctcu_set_etr_traceid(csdev, traceid, port_num, enable); > +} > + > +static int ctcu_enable(struct coresight_device *csdev, enum cs_mode mode, > + void *data) > +{ > + struct coresight_path *path = (struct coresight_path *)data; > + > + return ctcu_set_etr_traceid(csdev, path, true); > +} > + > +static int ctcu_disable(struct coresight_device *csdev, void *data) > +{ > + struct coresight_path *path = (struct coresight_path *)data; > + > + return ctcu_set_etr_traceid(csdev, path, false); > +} > + > +static const struct coresight_ops_helper ctcu_helper_ops = { > + .enable = ctcu_enable, > + .disable = ctcu_disable, > +}; > + > +static const struct coresight_ops ctcu_ops = { > + .helper_ops = &ctcu_helper_ops, > +}; > + > +static int ctcu_probe(struct platform_device *pdev) > +{ > + int i; > + void __iomem *base; > + struct device *dev = &pdev->dev; > + struct coresight_platform_data *pdata; > + struct ctcu_drvdata *drvdata; > + struct coresight_desc desc = { 0 }; > + const struct ctcu_config *cfgs; > + const struct ctcu_atid_config *atid_cfg; > + > + desc.name = coresight_alloc_device_name(&ctcu_devs, dev); > + if (!desc.name) > + return -ENOMEM; > + > + drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); > + if (!drvdata) > + return -ENOMEM; > + > + pdata = coresight_get_platform_data(dev); > + if (IS_ERR(pdata)) > + return PTR_ERR(pdata); > + dev->platform_data = pdata; > + > + base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL); > + if (!base) > + return -ENOMEM; > + > + drvdata->apb_clk = coresight_get_enable_apb_pclk(dev); > + if (IS_ERR(drvdata->apb_clk)) > + return -ENODEV; > + > + cfgs = of_device_get_match_data(dev); > + if (cfgs) { > + if (cfgs->num_atid_config <= ATID_MAX_NUM) { > + for (i = 0; i < cfgs->num_atid_config; i++) { > + atid_cfg = &cfgs->atid_config[i]; > + drvdata->atid_offset[i] = atid_cfg->atid_offset; > + } > + } > + } > + > + drvdata->base = base; > + drvdata->dev = dev; > + platform_set_drvdata(pdev, drvdata); > + > + desc.type = CORESIGHT_DEV_TYPE_HELPER; > + desc.subtype.helper_subtype = CORESIGHT_DEV_SUBTYPE_HELPER_CTCU; > + desc.pdata = pdata; > + desc.dev = dev; > + desc.ops = &ctcu_ops; Please set the desc.access desc.access = CSDEV_ACCESS_IOMEM(drvdata->base); > + > + drvdata->csdev = coresight_register(&desc); > + if (IS_ERR(drvdata->csdev)) { > + if (!IS_ERR_OR_NULL(drvdata->apb_clk)) > + clk_put(drvdata->apb_clk); > + > + return PTR_ERR(drvdata->csdev); > + } > + > + return 0; > +} > + > +static void ctcu_remove(struct platform_device *pdev) > +{ > + struct ctcu_drvdata *drvdata = platform_get_drvdata(pdev); > + > + coresight_unregister(drvdata->csdev); > + if (!IS_ERR_OR_NULL(drvdata->apb_clk)) > + clk_put(drvdata->apb_clk); Why isn't the clock get/put at runtime via pm_runtime calls ? See coresight-replicator driver for e.g. > +} > + > +static const struct of_device_id ctcu_match[] = { > + {.compatible = "qcom,sa8775p-ctcu", .data = &sa8775p_cfgs}, > + {} > +}; > + > +static struct platform_driver ctcu_driver = { > + .probe = ctcu_probe, > + .remove = ctcu_remove, > + .driver = { > + .name = "coresight-ctcu", > + .of_match_table = ctcu_match, > + .suppress_bind_attrs = true, > + }, > +}; > +module_platform_driver(ctcu_driver); > + > +MODULE_LICENSE("GPL"); > +MODULE_DESCRIPTION("CoreSight TMC Control Unit driver"); > diff --git a/drivers/hwtracing/coresight/coresight-ctcu.h b/drivers/hwtracing/coresight/coresight-ctcu.h > new file mode 100644 > index 000000000000..9890c3da5ec8 > --- /dev/null > +++ b/drivers/hwtracing/coresight/coresight-ctcu.h > @@ -0,0 +1,24 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. > + */ > + > +#ifndef _CORESIGHT_CTCU_H > +#define _CORESIGHT_CTCU_H > +#include "coresight-trace-id.h" > + > +/* Maximum number of supported sink devices for a single CTCU in current projects. */ > +#define ATID_MAX_NUM 2 > + > +struct ctcu_drvdata { > + void __iomem *base; > + struct clk *apb_clk; > + phys_addr_t pbase; Where is this used ? > + struct device *dev; > + struct coresight_device *csdev; > + raw_spinlock_t spin_lock; > + u32 atid_offset[ATID_MAX_NUM]; > + /* refcnt for each traceid of each sink */ > + u8 traceid_refcnt[ATID_MAX_NUM][CORESIGHT_TRACE_ID_RES_TOP]; Hopefully u8 is sufficient, but is it ? Why don't we check this in "enable" path to see if we are going to overflow ? > +}; > +#endif > diff --git a/include/linux/coresight.h b/include/linux/coresight.h > index 03d833a15726..55bb825d509e 100644 > --- a/include/linux/coresight.h > +++ b/include/linux/coresight.h > @@ -71,7 +71,8 @@ enum coresight_dev_subtype_source { > > enum coresight_dev_subtype_helper { > CORESIGHT_DEV_SUBTYPE_HELPER_CATU, > - CORESIGHT_DEV_SUBTYPE_HELPER_ECT_CTI > + CORESIGHT_DEV_SUBTYPE_HELPER_ECT_CTI, > + CORESIGHT_DEV_SUBTYPE_HELPER_CTCU, > }; > > /**

4 months, 1 week

Re: [PATCH v12 4/7] Coresight: Introduce a new struct coresight_path

by Suzuki K Poulose

On 17/02/2025 09:30, Jie Gan wrote: > Add 'struct coresight_path' to store the data that is needed by > coresight_enable_path/coresight_disable_path. The structure will be > transmitted to any required devices to enable related funcationalities. > > The trace_id will be allocated after the path is built. Consequently, > The ETM3x and ETM4x devices will directly read the trace_id from path > which result in etm_read_alloc_trace_id and etm4_read_alloc_trace_id > being deleted. > > Co-developed-by: James Clark <james.clark(a)linaro.org> > Signed-off-by: James Clark <james.clark(a)linaro.org> > Reviewed-by: James Clark <james.clark(a)linaro.org> > Signed-off-by: Jie Gan <quic_jiegan(a)quicinc.com> > --- Personally, I find this patch doing 3 things in one shot, which is complicated TBH for the patch review. 1. Introduce coresight_path 2. Move trace-id to coresight_path and allocate it after building the path. 3. Change enable/disable to accept the "coresight_path" Please do not repeat this in the future, split them accordingly. At the least we could split this patch into 1 and 2+3 > drivers/hwtracing/coresight/coresight-core.c | 106 +++++++++++++----- > drivers/hwtracing/coresight/coresight-dummy.c | 5 +- > .../hwtracing/coresight/coresight-etm-perf.c | 24 ++-- > .../hwtracing/coresight/coresight-etm-perf.h | 2 +- > drivers/hwtracing/coresight/coresight-etm.h | 1 - > .../coresight/coresight-etm3x-core.c | 54 ++------- > .../coresight/coresight-etm4x-core.c | 54 ++------- > drivers/hwtracing/coresight/coresight-etm4x.h | 1 - > drivers/hwtracing/coresight/coresight-priv.h | 12 +- > drivers/hwtracing/coresight/coresight-stm.c | 3 +- > drivers/hwtracing/coresight/coresight-sysfs.c | 17 ++- > drivers/hwtracing/coresight/coresight-tpdm.c | 3 +- > include/linux/coresight.h | 12 +- > 13 files changed, 140 insertions(+), 154 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c > index 6cad777757f3..182bfa2420cc 100644 > --- a/drivers/hwtracing/coresight/coresight-core.c > +++ b/drivers/hwtracing/coresight/coresight-core.c > @@ -76,14 +76,14 @@ struct coresight_device *coresight_get_percpu_sink(int cpu) > } > EXPORT_SYMBOL_GPL(coresight_get_percpu_sink); > > -static struct coresight_device *coresight_get_source(struct list_head *path) > +static struct coresight_device *coresight_get_source(struct coresight_path *path) > { > struct coresight_device *csdev; > > if (!path) > return NULL; > > - csdev = list_first_entry(path, struct coresight_node, link)->csdev; > + csdev = list_first_entry(path->path_list, struct coresight_node, link)->csdev; > if (!coresight_is_device_source(csdev)) > return NULL; > > @@ -332,12 +332,12 @@ static int coresight_enable_helper(struct coresight_device *csdev, > return helper_ops(csdev)->enable(csdev, mode, data); > } > > -static void coresight_disable_helper(struct coresight_device *csdev) > +static void coresight_disable_helper(struct coresight_device *csdev, void *data) > { > - helper_ops(csdev)->disable(csdev, NULL); > + helper_ops(csdev)->disable(csdev, data); > } > > -static void coresight_disable_helpers(struct coresight_device *csdev) > +static void coresight_disable_helpers(struct coresight_device *csdev, void *data) > { > int i; > struct coresight_device *helper; > @@ -345,7 +345,7 @@ static void coresight_disable_helpers(struct coresight_device *csdev) > for (i = 0; i < csdev->pdata->nr_outconns; ++i) { > helper = csdev->pdata->out_conns[i]->dest_dev; > if (helper && coresight_is_helper(helper)) > - coresight_disable_helper(helper); > + coresight_disable_helper(helper, data); > } > } > > @@ -362,7 +362,7 @@ static void coresight_disable_helpers(struct coresight_device *csdev) > void coresight_disable_source(struct coresight_device *csdev, void *data) > { > source_ops(csdev)->disable(csdev, data); > - coresight_disable_helpers(csdev); > + coresight_disable_helpers(csdev, NULL); > } > EXPORT_SYMBOL_GPL(coresight_disable_source); > > @@ -371,16 +371,16 @@ EXPORT_SYMBOL_GPL(coresight_disable_source); > * @nd in the list. If @nd is NULL, all the components, except the SOURCE are > * disabled. > */ > -static void coresight_disable_path_from(struct list_head *path, > +static void coresight_disable_path_from(struct coresight_path *path, > struct coresight_node *nd) > { > u32 type; > struct coresight_device *csdev, *parent, *child; > > if (!nd) > - nd = list_first_entry(path, struct coresight_node, link); > + nd = list_first_entry(path->path_list, struct coresight_node, link); > > - list_for_each_entry_continue(nd, path, link) { > + list_for_each_entry_continue(nd, path->path_list, link) { > csdev = nd->csdev; > type = csdev->type; > > @@ -418,11 +418,11 @@ static void coresight_disable_path_from(struct list_head *path, > } > > /* Disable all helpers adjacent along the path last */ > - coresight_disable_helpers(csdev); > + coresight_disable_helpers(csdev, path); > } > } > > -void coresight_disable_path(struct list_head *path) > +void coresight_disable_path(struct coresight_path *path) > { > coresight_disable_path_from(path, NULL); > } > @@ -447,7 +447,7 @@ static int coresight_enable_helpers(struct coresight_device *csdev, > return 0; > } > > -int coresight_enable_path(struct list_head *path, enum cs_mode mode, > +int coresight_enable_path(struct coresight_path *path, enum cs_mode mode, > void *sink_data) > { > int ret = 0; > @@ -457,12 +457,12 @@ int coresight_enable_path(struct list_head *path, enum cs_mode mode, > struct coresight_device *source; > > source = coresight_get_source(path); > - list_for_each_entry_reverse(nd, path, link) { > + list_for_each_entry_reverse(nd, path->path_list, link) { > csdev = nd->csdev; > type = csdev->type; > > /* Enable all helpers adjacent to the path first */ > - ret = coresight_enable_helpers(csdev, mode, sink_data); > + ret = coresight_enable_helpers(csdev, mode, path); > if (ret) > goto err; > /* > @@ -510,20 +510,21 @@ int coresight_enable_path(struct list_head *path, enum cs_mode mode, > goto out; > } > > -struct coresight_device *coresight_get_sink(struct list_head *path) > +struct coresight_device *coresight_get_sink(struct coresight_path *path) > { > struct coresight_device *csdev; > > if (!path) > return NULL; > > - csdev = list_last_entry(path, struct coresight_node, link)->csdev; > + csdev = list_last_entry(path->path_list, struct coresight_node, link)->csdev; > if (csdev->type != CORESIGHT_DEV_TYPE_SINK && > csdev->type != CORESIGHT_DEV_TYPE_LINKSINK) > return NULL; > > return csdev; > } > +EXPORT_SYMBOL_GPL(coresight_get_sink); > > u32 coresight_get_sink_id(struct coresight_device *csdev) > { > @@ -654,6 +655,51 @@ static void coresight_drop_device(struct coresight_device *csdev) > } > } > > +/* > + * Links or sources will read their existing or alloc a trace ID, if their ID > + * callback is set. > + */ Please could we document the return value conditions here ? > +static int coresight_get_trace_id(struct coresight_device *csdev, > + enum cs_mode mode, > + struct coresight_device *sink) > +{ > + if (csdev->type == CORESIGHT_DEV_TYPE_LINK && link_ops(csdev)->trace_id) > + return link_ops(csdev)->trace_id(csdev, mode, sink); > + > + if (csdev->type == CORESIGHT_DEV_TYPE_SOURCE && source_ops(csdev)->trace_id) > + return source_ops(csdev)->trace_id(csdev, mode, sink); > + > + return 0; > +} > + > +/* > + * Call this after creating the path and before enabling it. This leaves > + * the trace ID set on the path and returns the ID, or an error if it > + * couldn't be assigned. > + */ > +int coresight_path_assign_trace_id(struct coresight_path *path, > + enum cs_mode mode) > +{ > + struct coresight_device *sink = coresight_get_sink(path); > + struct coresight_node *nd; > + int ret; Might be better to rename this as "trace_id" ? As we return the trace id not a status of whether it was allocated or not. Or drop it completely and return path->trace_id, below when we succeed. Or it could even be a void, as the caller can check IS_VALID(path->trace_id) > + > + list_for_each_entry(nd, path->path_list, link) { > + /* Assign a trace ID to the path for the first device that wants to do it */ > + ret = coresight_get_trace_id(nd->csdev, mode, sink); > + > + /* > + * 0 in this context is that it didn't want to assign so keep searching. > + * Non 0 is either success or fail, return it either way. > + */ > + if (ret != 0) { > + path->trace_id = ret; > + return ret; > + } > + } > + return 0; > +} > + > /** > * _coresight_build_path - recursively build a path from a @csdev to a sink. > * @csdev: The device to start from. > @@ -669,7 +715,7 @@ static void coresight_drop_device(struct coresight_device *csdev) > static int _coresight_build_path(struct coresight_device *csdev, > struct coresight_device *source, > struct coresight_device *sink, > - struct list_head *path) > + struct coresight_path *path) > { > int i, ret; > bool found = false; > @@ -722,28 +768,37 @@ static int _coresight_build_path(struct coresight_device *csdev, > return -ENOMEM; > > node->csdev = csdev; > - list_add(&node->link, path); > + list_add(&node->link, path->path_list); > > return 0; > } > > -struct list_head *coresight_build_path(struct coresight_device *source, > +struct coresight_path *coresight_build_path(struct coresight_device *source, > struct coresight_device *sink) > { > - struct list_head *path; > + struct coresight_path *path; > + struct list_head *path_list; > int rc; > > if (!sink) > return ERR_PTR(-EINVAL); > > - path = kzalloc(sizeof(struct list_head), GFP_KERNEL); > + path = kzalloc(sizeof(struct coresight_path), GFP_KERNEL); > if (!path) > return ERR_PTR(-ENOMEM); > > - INIT_LIST_HEAD(path); > + path_list = kzalloc(sizeof(struct list_head), GFP_KERNEL); > + if (!path_list) { > + kfree(path); > + return ERR_PTR(-ENOMEM); > + } > + > + INIT_LIST_HEAD(path_list); > + path->path_list = path_list; > > rc = _coresight_build_path(source, source, sink, path); > if (rc) { > + kfree(path_list); > kfree(path); > return ERR_PTR(rc); > } > @@ -758,12 +813,12 @@ struct list_head *coresight_build_path(struct coresight_device *source, > * Go through all the elements of a path and 1) removed it from the list and > * 2) free the memory allocated for each node. > */ > -void coresight_release_path(struct list_head *path) > +void coresight_release_path(struct coresight_path *path) > { > struct coresight_device *csdev; > struct coresight_node *nd, *next; > > - list_for_each_entry_safe(nd, next, path, link) { > + list_for_each_entry_safe(nd, next, path->path_list, link) { > csdev = nd->csdev; > > coresight_drop_device(csdev); > @@ -771,6 +826,7 @@ void coresight_release_path(struct list_head *path) > kfree(nd); > } > > + kfree(path->path_list); > kfree(path); > } > > diff --git a/drivers/hwtracing/coresight/coresight-dummy.c b/drivers/hwtracing/coresight/coresight-dummy.c > index c47f0382b943..d9a811d44885 100644 > --- a/drivers/hwtracing/coresight/coresight-dummy.c > +++ b/drivers/hwtracing/coresight/coresight-dummy.c > @@ -22,9 +22,8 @@ struct dummy_drvdata { > DEFINE_CORESIGHT_DEVLIST(source_devs, "dummy_source"); > DEFINE_CORESIGHT_DEVLIST(sink_devs, "dummy_sink"); > > -static int dummy_source_enable(struct coresight_device *csdev, > - struct perf_event *event, enum cs_mode mode, > - __maybe_unused struct coresight_trace_id_map *id_map) > +static int dummy_source_enable(struct coresight_device *csdev, struct perf_event *event, > + enum cs_mode mode, struct coresight_path *path) > { > if (!coresight_take_mode(csdev, mode)) > return -EBUSY; > diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c > index ad6a8f4b70b6..ebdcf56b7463 100644 > --- a/drivers/hwtracing/coresight/coresight-etm-perf.c > +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c > @@ -136,13 +136,13 @@ static const struct attribute_group *etm_pmu_attr_groups[] = { > NULL, > }; > > -static inline struct list_head ** > +static inline struct coresight_path ** > etm_event_cpu_path_ptr(struct etm_event_data *data, int cpu) > { > return per_cpu_ptr(data->path, cpu); > } > > -static inline struct list_head * > +static inline struct coresight_path * > etm_event_cpu_path(struct etm_event_data *data, int cpu) > { > return *etm_event_cpu_path_ptr(data, cpu); > @@ -226,7 +226,7 @@ static void free_event_data(struct work_struct *work) > cscfg_deactivate_config(event_data->cfg_hash); > > for_each_cpu(cpu, mask) { > - struct list_head **ppath; > + struct coresight_path **ppath; > > ppath = etm_event_cpu_path_ptr(event_data, cpu); > if (!(IS_ERR_OR_NULL(*ppath))) { > @@ -276,7 +276,7 @@ static void *alloc_event_data(int cpu) > * unused memory when dealing with single CPU trace scenarios is small > * compared to the cost of searching through an optimized array. > */ > - event_data->path = alloc_percpu(struct list_head *); > + event_data->path = alloc_percpu(struct coresight_path *); > > if (!event_data->path) { > kfree(event_data); > @@ -352,7 +352,7 @@ static void *etm_setup_aux(struct perf_event *event, void **pages, > * CPUs, we can handle it and fail the session. > */ > for_each_cpu(cpu, mask) { > - struct list_head *path; > + struct coresight_path *path; > struct coresight_device *csdev; > > csdev = per_cpu(csdev_src, cpu); > @@ -407,7 +407,7 @@ static void *etm_setup_aux(struct perf_event *event, void **pages, > } > > /* ensure we can allocate a trace ID for this CPU */ > - trace_id = coresight_trace_id_get_cpu_id_map(cpu, &sink->perf_sink_id_map); > + trace_id = coresight_path_assign_trace_id(path, CS_MODE_PERF); > if (!IS_VALID_CS_TRACE_ID(trace_id)) { > cpumask_clear_cpu(cpu, mask); > coresight_release_path(path); > @@ -458,9 +458,8 @@ static void etm_event_start(struct perf_event *event, int flags) > struct etm_ctxt *ctxt = this_cpu_ptr(&etm_ctxt); > struct perf_output_handle *handle = &ctxt->handle; > struct coresight_device *sink, *csdev = per_cpu(csdev_src, cpu); > - struct list_head *path; > + struct coresight_path *path; > u64 hw_id; > - u8 trace_id; > > if (!csdev) > goto fail; > @@ -503,8 +502,7 @@ static void etm_event_start(struct perf_event *event, int flags) > goto fail_end_stop; > > /* Finally enable the tracer */ > - if (source_ops(csdev)->enable(csdev, event, CS_MODE_PERF, > - &sink->perf_sink_id_map)) > + if (source_ops(csdev)->enable(csdev, event, CS_MODE_PERF, path)) > goto fail_disable_path; > > /* > @@ -514,13 +512,11 @@ static void etm_event_start(struct perf_event *event, int flags) > if (!cpumask_test_cpu(cpu, &event_data->aux_hwid_done)) { > cpumask_set_cpu(cpu, &event_data->aux_hwid_done); > > - trace_id = coresight_trace_id_read_cpu_id_map(cpu, &sink->perf_sink_id_map); > - > hw_id = FIELD_PREP(CS_AUX_HW_ID_MAJOR_VERSION_MASK, > CS_AUX_HW_ID_MAJOR_VERSION); > hw_id |= FIELD_PREP(CS_AUX_HW_ID_MINOR_VERSION_MASK, > CS_AUX_HW_ID_MINOR_VERSION); > - hw_id |= FIELD_PREP(CS_AUX_HW_ID_TRACE_ID_MASK, trace_id); > + hw_id |= FIELD_PREP(CS_AUX_HW_ID_TRACE_ID_MASK, path->trace_id); > hw_id |= FIELD_PREP(CS_AUX_HW_ID_SINK_ID_MASK, coresight_get_sink_id(sink)); > > perf_report_aux_output_id(event, hw_id); > @@ -558,7 +554,7 @@ static void etm_event_stop(struct perf_event *event, int mode) > struct etm_ctxt *ctxt = this_cpu_ptr(&etm_ctxt); > struct perf_output_handle *handle = &ctxt->handle; > struct etm_event_data *event_data; > - struct list_head *path; > + struct coresight_path *path; > > /* > * If we still have access to the event_data via handle, > diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.h b/drivers/hwtracing/coresight/coresight-etm-perf.h > index 744531158d6b..5febbcdb8696 100644 > --- a/drivers/hwtracing/coresight/coresight-etm-perf.h > +++ b/drivers/hwtracing/coresight/coresight-etm-perf.h > @@ -59,7 +59,7 @@ struct etm_event_data { > cpumask_t aux_hwid_done; > void *snk_config; > u32 cfg_hash; > - struct list_head * __percpu *path; > + struct coresight_path * __percpu *path; > }; > > int etm_perf_symlink(struct coresight_device *csdev, bool link); > diff --git a/drivers/hwtracing/coresight/coresight-etm.h b/drivers/hwtracing/coresight/coresight-etm.h > index e02c3ea972c9..171f1384f7c0 100644 > --- a/drivers/hwtracing/coresight/coresight-etm.h > +++ b/drivers/hwtracing/coresight/coresight-etm.h > @@ -284,6 +284,5 @@ extern const struct attribute_group *coresight_etm_groups[]; > void etm_set_default(struct etm_config *config); > void etm_config_trace_mode(struct etm_config *config); > struct etm_config *get_etm_config(struct etm_drvdata *drvdata); > -int etm_read_alloc_trace_id(struct etm_drvdata *drvdata); > void etm_release_trace_id(struct etm_drvdata *drvdata); > #endif > diff --git a/drivers/hwtracing/coresight/coresight-etm3x-core.c b/drivers/hwtracing/coresight/coresight-etm3x-core.c > index a38e72ef8e79..cb8a30a3b48e 100644 > --- a/drivers/hwtracing/coresight/coresight-etm3x-core.c > +++ b/drivers/hwtracing/coresight/coresight-etm3x-core.c > @@ -455,26 +455,6 @@ static int etm_cpu_id(struct coresight_device *csdev) > return drvdata->cpu; > } > > -int etm_read_alloc_trace_id(struct etm_drvdata *drvdata) > -{ > - int trace_id; > - > - /* > - * This will allocate a trace ID to the cpu, > - * or return the one currently allocated. > - * > - * trace id function has its own lock > - */ > - trace_id = coresight_trace_id_get_cpu_id(drvdata->cpu); > - if (IS_VALID_CS_TRACE_ID(trace_id)) > - drvdata->traceid = (u8)trace_id; > - else > - dev_err(&drvdata->csdev->dev, > - "Failed to allocate trace ID for %s on CPU%d\n", > - dev_name(&drvdata->csdev->dev), drvdata->cpu); > - return trace_id; > -} > - > void etm_release_trace_id(struct etm_drvdata *drvdata) > { > coresight_trace_id_put_cpu_id(drvdata->cpu); > @@ -482,38 +462,22 @@ void etm_release_trace_id(struct etm_drvdata *drvdata) > > static int etm_enable_perf(struct coresight_device *csdev, > struct perf_event *event, > - struct coresight_trace_id_map *id_map) > + struct coresight_path *path) > { > struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); > - int trace_id; > > if (WARN_ON_ONCE(drvdata->cpu != smp_processor_id())) > return -EINVAL; > > /* Configure the tracer based on the session's specifics */ > etm_parse_event_config(drvdata, event); > - > - /* > - * perf allocates cpu ids as part of _setup_aux() - device needs to use > - * the allocated ID. This reads the current version without allocation. > - * > - * This does not use the trace id lock to prevent lock_dep issues > - * with perf locks - we know the ID cannot change until perf shuts down > - * the session > - */ > - trace_id = coresight_trace_id_read_cpu_id_map(drvdata->cpu, id_map); > - if (!IS_VALID_CS_TRACE_ID(trace_id)) { > - dev_err(&drvdata->csdev->dev, "Failed to set trace ID for %s on CPU%d\n", > - dev_name(&drvdata->csdev->dev), drvdata->cpu); > - return -EINVAL; > - } > - drvdata->traceid = (u8)trace_id; > + drvdata->traceid = path->trace_id; > > /* And enable it */ > return etm_enable_hw(drvdata); > } > > -static int etm_enable_sysfs(struct coresight_device *csdev) > +static int etm_enable_sysfs(struct coresight_device *csdev, struct coresight_path *path) > { > struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); > struct etm_enable_arg arg = { }; > @@ -521,10 +485,7 @@ static int etm_enable_sysfs(struct coresight_device *csdev) > > spin_lock(&drvdata->spinlock); > > - /* sysfs needs to allocate and set a trace ID */ > - ret = etm_read_alloc_trace_id(drvdata); > - if (ret < 0) > - goto unlock_enable_sysfs; > + drvdata->traceid = path->trace_id; > > /* > * Configure the ETM only if the CPU is online. If it isn't online > @@ -545,7 +506,6 @@ static int etm_enable_sysfs(struct coresight_device *csdev) > if (ret) > etm_release_trace_id(drvdata); > > -unlock_enable_sysfs: > spin_unlock(&drvdata->spinlock); > > if (!ret) > @@ -554,7 +514,7 @@ static int etm_enable_sysfs(struct coresight_device *csdev) > } > > static int etm_enable(struct coresight_device *csdev, struct perf_event *event, > - enum cs_mode mode, struct coresight_trace_id_map *id_map) > + enum cs_mode mode, struct coresight_path *path) > { > int ret; > struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); > @@ -566,10 +526,10 @@ static int etm_enable(struct coresight_device *csdev, struct perf_event *event, > > switch (mode) { > case CS_MODE_SYSFS: > - ret = etm_enable_sysfs(csdev); > + ret = etm_enable_sysfs(csdev, path); > break; > case CS_MODE_PERF: > - ret = etm_enable_perf(csdev, event, id_map); > + ret = etm_enable_perf(csdev, event, path); > break; > default: > ret = -EINVAL; > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c > index 1a993d5380e7..3d0fc25085ea 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c > @@ -233,25 +233,6 @@ static int etm4_cpu_id(struct coresight_device *csdev) > return drvdata->cpu; > } > > -int etm4_read_alloc_trace_id(struct etmv4_drvdata *drvdata) > -{ > - int trace_id; > - > - /* > - * This will allocate a trace ID to the cpu, > - * or return the one currently allocated. > - * The trace id function has its own lock > - */ > - trace_id = coresight_trace_id_get_cpu_id(drvdata->cpu); > - if (IS_VALID_CS_TRACE_ID(trace_id)) > - drvdata->trcid = (u8)trace_id; > - else > - dev_err(&drvdata->csdev->dev, > - "Failed to allocate trace ID for %s on CPU%d\n", > - dev_name(&drvdata->csdev->dev), drvdata->cpu); > - return trace_id; > -} > - > void etm4_release_trace_id(struct etmv4_drvdata *drvdata) > { > coresight_trace_id_put_cpu_id(drvdata->cpu); > @@ -788,9 +769,9 @@ static int etm4_parse_event_config(struct coresight_device *csdev, > > static int etm4_enable_perf(struct coresight_device *csdev, > struct perf_event *event, > - struct coresight_trace_id_map *id_map) > + struct coresight_path *path) > { > - int ret = 0, trace_id; > + int ret = 0; > struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); > > if (WARN_ON_ONCE(drvdata->cpu != smp_processor_id())) { > @@ -803,22 +784,7 @@ static int etm4_enable_perf(struct coresight_device *csdev, > if (ret) > goto out; > > - /* > - * perf allocates cpu ids as part of _setup_aux() - device needs to use > - * the allocated ID. This reads the current version without allocation. > - * > - * This does not use the trace id lock to prevent lock_dep issues > - * with perf locks - we know the ID cannot change until perf shuts down > - * the session > - */ > - trace_id = coresight_trace_id_read_cpu_id_map(drvdata->cpu, id_map); > - if (!IS_VALID_CS_TRACE_ID(trace_id)) { > - dev_err(&drvdata->csdev->dev, "Failed to set trace ID for %s on CPU%d\n", > - dev_name(&drvdata->csdev->dev), drvdata->cpu); > - ret = -EINVAL; > - goto out; > - } > - drvdata->trcid = (u8)trace_id; > + drvdata->trcid = path->trace_id; > > /* And enable it */ > ret = etm4_enable_hw(drvdata); > @@ -827,7 +793,7 @@ static int etm4_enable_perf(struct coresight_device *csdev, > return ret; > } > > -static int etm4_enable_sysfs(struct coresight_device *csdev) > +static int etm4_enable_sysfs(struct coresight_device *csdev, struct coresight_path *path) > { > struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); > struct etm4_enable_arg arg = { }; > @@ -844,10 +810,7 @@ static int etm4_enable_sysfs(struct coresight_device *csdev) > > spin_lock(&drvdata->spinlock); > > - /* sysfs needs to read and allocate a trace ID */ > - ret = etm4_read_alloc_trace_id(drvdata); > - if (ret < 0) > - goto unlock_sysfs_enable; > + drvdata->trcid = path->trace_id; > > /* > * Executing etm4_enable_hw on the cpu whose ETM is being enabled > @@ -864,7 +827,6 @@ static int etm4_enable_sysfs(struct coresight_device *csdev) > if (ret) > etm4_release_trace_id(drvdata); > > -unlock_sysfs_enable: > spin_unlock(&drvdata->spinlock); > > if (!ret) > @@ -873,7 +835,7 @@ static int etm4_enable_sysfs(struct coresight_device *csdev) > } > > static int etm4_enable(struct coresight_device *csdev, struct perf_event *event, > - enum cs_mode mode, struct coresight_trace_id_map *id_map) > + enum cs_mode mode, struct coresight_path *path) > { > int ret; > > @@ -884,10 +846,10 @@ static int etm4_enable(struct coresight_device *csdev, struct perf_event *event, > > switch (mode) { > case CS_MODE_SYSFS: > - ret = etm4_enable_sysfs(csdev); > + ret = etm4_enable_sysfs(csdev, path); > break; > case CS_MODE_PERF: > - ret = etm4_enable_perf(csdev, event, id_map); > + ret = etm4_enable_perf(csdev, event, path); > break; > default: > ret = -EINVAL; > diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h > index 1119762b5cec..2b92de17b5a2 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x.h > +++ b/drivers/hwtracing/coresight/coresight-etm4x.h > @@ -1066,6 +1066,5 @@ static inline bool etm4x_is_ete(struct etmv4_drvdata *drvdata) > return drvdata->arch >= ETM_ARCH_ETE; > } > > -int etm4_read_alloc_trace_id(struct etmv4_drvdata *drvdata); > void etm4_release_trace_id(struct etmv4_drvdata *drvdata); > #endif > diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h > index 76403530f33e..c10dd3643854 100644 > --- a/drivers/hwtracing/coresight/coresight-priv.h > +++ b/drivers/hwtracing/coresight/coresight-priv.h > @@ -132,16 +132,16 @@ static inline void CS_UNLOCK(void __iomem *addr) > } while (0); > } > > -void coresight_disable_path(struct list_head *path); > -int coresight_enable_path(struct list_head *path, enum cs_mode mode, > +void coresight_disable_path(struct coresight_path *path); > +int coresight_enable_path(struct coresight_path *path, enum cs_mode mode, > void *sink_data); > -struct coresight_device *coresight_get_sink(struct list_head *path); > +struct coresight_device *coresight_get_sink(struct coresight_path *path); > struct coresight_device *coresight_get_sink_by_id(u32 id); > struct coresight_device * > coresight_find_default_sink(struct coresight_device *csdev); > -struct list_head *coresight_build_path(struct coresight_device *csdev, > +struct coresight_path *coresight_build_path(struct coresight_device *csdev, > struct coresight_device *sink); > -void coresight_release_path(struct list_head *path); > +void coresight_release_path(struct coresight_path *path); > int coresight_add_sysfs_link(struct coresight_sysfs_link *info); > void coresight_remove_sysfs_link(struct coresight_sysfs_link *info); > int coresight_create_conns_sysfs_group(struct coresight_device *csdev); > @@ -152,6 +152,8 @@ int coresight_make_links(struct coresight_device *orig, > void coresight_remove_links(struct coresight_device *orig, > struct coresight_connection *conn); > u32 coresight_get_sink_id(struct coresight_device *csdev); > +int coresight_path_assign_trace_id(struct coresight_path *path, > + enum cs_mode mode); > > #if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM3X) > extern int etm_readl_cp14(u32 off, unsigned int *val); > diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c > index 64fcfa916562..0d4a9d325df4 100644 > --- a/drivers/hwtracing/coresight/coresight-stm.c > +++ b/drivers/hwtracing/coresight/coresight-stm.c > @@ -194,8 +194,7 @@ static void stm_enable_hw(struct stm_drvdata *drvdata) > } > > static int stm_enable(struct coresight_device *csdev, struct perf_event *event, > - enum cs_mode mode, > - __maybe_unused struct coresight_trace_id_map *trace_id) > + enum cs_mode mode, struct coresight_path *path) > { > struct stm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); > > diff --git a/drivers/hwtracing/coresight/coresight-sysfs.c b/drivers/hwtracing/coresight/coresight-sysfs.c > index a01c9e54e2ed..c2b0a1f59d1a 100644 > --- a/drivers/hwtracing/coresight/coresight-sysfs.c > +++ b/drivers/hwtracing/coresight/coresight-sysfs.c > @@ -22,7 +22,7 @@ static DEFINE_IDR(path_idr); > * When operating Coresight drivers from the sysFS interface, only a single > * path can exist from a tracer (associated to a CPU) to a sink. > */ > -static DEFINE_PER_CPU(struct list_head *, tracer_path); > +static DEFINE_PER_CPU(struct coresight_path *, tracer_path); > > ssize_t coresight_simple_show_pair(struct device *_dev, > struct device_attribute *attr, char *buf) > @@ -53,7 +53,8 @@ ssize_t coresight_simple_show32(struct device *_dev, > EXPORT_SYMBOL_GPL(coresight_simple_show32); > > static int coresight_enable_source_sysfs(struct coresight_device *csdev, > - enum cs_mode mode, void *data) > + enum cs_mode mode, > + struct coresight_path *path) > { > int ret; > > @@ -64,7 +65,7 @@ static int coresight_enable_source_sysfs(struct coresight_device *csdev, > */ > lockdep_assert_held(&coresight_mutex); > if (coresight_get_mode(csdev) != CS_MODE_SYSFS) { > - ret = source_ops(csdev)->enable(csdev, data, mode, NULL); > + ret = source_ops(csdev)->enable(csdev, NULL, mode, path); > if (ret) > return ret; > } > @@ -167,7 +168,7 @@ int coresight_enable_sysfs(struct coresight_device *csdev) > { > int cpu, ret = 0; > struct coresight_device *sink; > - struct list_head *path; > + struct coresight_path *path; > enum coresight_dev_subtype_source subtype; > u32 hash; > > @@ -209,11 +210,15 @@ int coresight_enable_sysfs(struct coresight_device *csdev) > goto out; > } > > + ret = coresight_path_assign_trace_id(path, CS_MODE_SYSFS); > + if (ret < 0) > + goto err_path; > + > ret = coresight_enable_path(path, CS_MODE_SYSFS, NULL); > if (ret) > goto err_path; > > - ret = coresight_enable_source_sysfs(csdev, CS_MODE_SYSFS, NULL); > + ret = coresight_enable_source_sysfs(csdev, CS_MODE_SYSFS, path); > if (ret) > goto err_source; > > @@ -262,7 +267,7 @@ EXPORT_SYMBOL_GPL(coresight_enable_sysfs); > void coresight_disable_sysfs(struct coresight_device *csdev) > { > int cpu, ret; > - struct list_head *path = NULL; > + struct coresight_path *path = NULL; > u32 hash; > > mutex_lock(&coresight_mutex); > diff --git a/drivers/hwtracing/coresight/coresight-tpdm.c b/drivers/hwtracing/coresight/coresight-tpdm.c > index c38f9701665e..f0880a62028f 100644 > --- a/drivers/hwtracing/coresight/coresight-tpdm.c > +++ b/drivers/hwtracing/coresight/coresight-tpdm.c > @@ -439,8 +439,7 @@ static void __tpdm_enable(struct tpdm_drvdata *drvdata) > } > > static int tpdm_enable(struct coresight_device *csdev, struct perf_event *event, > - enum cs_mode mode, > - __maybe_unused struct coresight_trace_id_map *id_map) > + enum cs_mode mode, struct coresight_path *path) > { > struct tpdm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); > > diff --git a/include/linux/coresight.h b/include/linux/coresight.h > index 70407d61262e..03d833a15726 100644 > --- a/include/linux/coresight.h > +++ b/include/linux/coresight.h > @@ -329,6 +329,16 @@ static struct coresight_dev_list (var) = { \ > > #define to_coresight_device(d) container_of(d, struct coresight_device, dev) > > +/** > + * struct coresight_path - data needed by enable/disable path > + * @path: path from source to sink. > + * @trace_id: trace_id of the whole path. > + */ > +struct coresight_path { > + struct list_head *path_list; Minor nit: We could do struct list_head path_list; to avoid allocating/freeing the head node without multiple kzalloc/kfree Suzuki > + u8 trace_id; > +}; > + > enum cs_mode { > CS_MODE_DISABLED, > CS_MODE_SYSFS, > @@ -393,7 +403,7 @@ struct coresight_ops_link { > struct coresight_ops_source { > int (*cpu_id)(struct coresight_device *csdev); > int (*enable)(struct coresight_device *csdev, struct perf_event *event, > - enum cs_mode mode, struct coresight_trace_id_map *id_map); > + enum cs_mode mode, struct coresight_path *path); > void (*disable)(struct coresight_device *csdev, > struct perf_event *event); > int (*trace_id)(struct coresight_device *csdev, enum cs_mode mode,

4 months, 2 weeks

[PATCH 0/5] coresight: Add Coresight Trace NOC driver

by Yuanfang Zhang

The Trace NoC is an integration hierarchy which is a replacement of Dragonlink configuration. It brings together debug component like TPDA, funnel and interconnect Trace Noc which collects trace from subsystems and transfers to QDSS sink. Compared to DL, it has the following advantages: 1. Reduce wires between subsystems. 2. Continue cleaning the infrastructure. 3. Reduce Data overhead by transporting raw data from source to target. +--------------+ +-------------+ | SDCC5 TPDM | | SDCC5 TPDM | +--------------+ +-------------+ | | | | +----------|-------------------+ | | v | | | +----v----+ Dragon Link | v | |DLNT TPDA| North | +----------------------+ | +---------+ | | TRACE NOC AG | | | | | | | v-------------+ | +----------------------+ | | | | | +------v-----+ | | | | DLNT Funnel| | | | +------------+ | | | | | | +-------------------|----------+ | <-----+ | | | | | v v +----------------+ +---------------+ | QDSS | | QDSS | +----------------+ +---------------+ Signed-off-by: Yuanfang Zhang <quic_yuanfang(a)quicinc.com> --- --- Yuanfang Zhang (5): dt-bindings: arm: Add Coresight device Trace NOC definition coresight: add coresight Trace NOC driver coresight-tnoc: add nodes to configure flush coresight-tnoc: add node to configure flag type coresight-tnoc: add nodes to configure freq packet .../bindings/arm/qcom,coresight-tnoc.yaml | 107 ++++++ drivers/hwtracing/coresight/Kconfig | 10 + drivers/hwtracing/coresight/Makefile | 1 + drivers/hwtracing/coresight/coresight-tnoc.c | 401 +++++++++++++++++++++ drivers/hwtracing/coresight/coresight-tnoc.h | 57 +++ 5 files changed, 576 insertions(+) --- base-commit: 92514ef226f511f2ca1fb1b8752966097518edc0 change-id: 20250212-trace-noc-driver-9e75d78114fa Best regards, -- Yuanfang Zhang <quic_yuanfang(a)quicinc.com>

4 months, 2 weeks

Re: [PATCH v12 2/7] Coresight: Add trace_id function to retrieving the trace ID

by Suzuki K Poulose

On 17/02/2025 09:30, Jie Gan wrote: > Add 'trace_id' function pointer in ops. It's responsible for > retrieving the device's trace ID. > > Co-developed-by: James Clark <james.clark(a)linaro.org> > Signed-off-by: James Clark <james.clark(a)linaro.org> > Reviewed-by: James Clark <james.clark(a)linaro.org> > Signed-off-by: Jie Gan <quic_jiegan(a)quicinc.com> minor nit: Given this is an optional callback, we could as well make this a generic ops and avoid checking if it is a link/source etc. We anyway check if the op is available before calling it. i.e.: struct coresight_ops { + int (*trace_id)(struct coresight *csdev,...); ... }; Suzuki > --- > drivers/hwtracing/coresight/coresight-core.c | 27 +++++++++++++++++++ > drivers/hwtracing/coresight/coresight-dummy.c | 11 ++++++++ > .../coresight/coresight-etm3x-core.c | 1 + > .../coresight/coresight-etm4x-core.c | 1 + > drivers/hwtracing/coresight/coresight-stm.c | 11 ++++++++ > drivers/hwtracing/coresight/coresight-tpda.c | 11 ++++++++ > include/linux/coresight.h | 8 ++++++ > 7 files changed, 70 insertions(+) > > diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c > index 0a9380350fb5..6cad777757f3 100644 > --- a/drivers/hwtracing/coresight/coresight-core.c > +++ b/drivers/hwtracing/coresight/coresight-core.c > @@ -23,6 +23,7 @@ > #include "coresight-etm-perf.h" > #include "coresight-priv.h" > #include "coresight-syscfg.h" > +#include "coresight-trace-id.h" > > /* > * Mutex used to lock all sysfs enable and disable actions and loading and > @@ -1515,6 +1516,32 @@ void coresight_remove_driver(struct amba_driver *amba_drv, > } > EXPORT_SYMBOL_GPL(coresight_remove_driver); > > +int coresight_etm_get_trace_id(struct coresight_device *csdev, enum cs_mode mode, > + struct coresight_device *sink) > +{ > + int trace_id; > + int cpu = source_ops(csdev)->cpu_id(csdev); > + > + switch (mode) { > + case CS_MODE_SYSFS: > + trace_id = coresight_trace_id_get_cpu_id(cpu); > + break; > + case CS_MODE_PERF: > + trace_id = coresight_trace_id_get_cpu_id_map(cpu, &sink->perf_sink_id_map); > + break; > + default: > + trace_id = -EINVAL; > + break; > + } > + > + if (!IS_VALID_CS_TRACE_ID(trace_id)) > + dev_err(&csdev->dev, > + "Failed to allocate trace ID on CPU%d\n", cpu); > + > + return trace_id; > +} > +EXPORT_SYMBOL_GPL(coresight_etm_get_trace_id); > + > MODULE_LICENSE("GPL v2"); > MODULE_AUTHOR("Pratik Patel <pratikp(a)codeaurora.org>"); > MODULE_AUTHOR("Mathieu Poirier <mathieu.poirier(a)linaro.org>"); > diff --git a/drivers/hwtracing/coresight/coresight-dummy.c b/drivers/hwtracing/coresight/coresight-dummy.c > index 9be53be8964b..c47f0382b943 100644 > --- a/drivers/hwtracing/coresight/coresight-dummy.c > +++ b/drivers/hwtracing/coresight/coresight-dummy.c > @@ -41,6 +41,16 @@ static void dummy_source_disable(struct coresight_device *csdev, > dev_dbg(csdev->dev.parent, "Dummy source disabled\n"); > } > > +static int dummy_source_trace_id(struct coresight_device *csdev, __maybe_unused enum cs_mode mode, > + __maybe_unused struct coresight_device *sink) > +{ > + struct dummy_drvdata *drvdata; > + > + drvdata = dev_get_drvdata(csdev->dev.parent); > + > + return drvdata->traceid; > +} > + > static int dummy_sink_enable(struct coresight_device *csdev, enum cs_mode mode, > void *data) > { > @@ -59,6 +69,7 @@ static int dummy_sink_disable(struct coresight_device *csdev) > static const struct coresight_ops_source dummy_source_ops = { > .enable = dummy_source_enable, > .disable = dummy_source_disable, > + .trace_id = dummy_source_trace_id, > }; > > static const struct coresight_ops dummy_source_cs_ops = { > diff --git a/drivers/hwtracing/coresight/coresight-etm3x-core.c b/drivers/hwtracing/coresight/coresight-etm3x-core.c > index c103f4c70f5d..a38e72ef8e79 100644 > --- a/drivers/hwtracing/coresight/coresight-etm3x-core.c > +++ b/drivers/hwtracing/coresight/coresight-etm3x-core.c > @@ -701,6 +701,7 @@ static const struct coresight_ops_source etm_source_ops = { > .cpu_id = etm_cpu_id, > .enable = etm_enable, > .disable = etm_disable, > + .trace_id = coresight_etm_get_trace_id, > }; > > static const struct coresight_ops etm_cs_ops = { > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c > index 2c1a60577728..1a993d5380e7 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c > @@ -1064,6 +1064,7 @@ static const struct coresight_ops_source etm4_source_ops = { > .cpu_id = etm4_cpu_id, > .enable = etm4_enable, > .disable = etm4_disable, > + .trace_id = coresight_etm_get_trace_id, > }; > > static const struct coresight_ops etm4_cs_ops = { > diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c > index b581a30a1cd9..64fcfa916562 100644 > --- a/drivers/hwtracing/coresight/coresight-stm.c > +++ b/drivers/hwtracing/coresight/coresight-stm.c > @@ -281,9 +281,20 @@ static void stm_disable(struct coresight_device *csdev, > } > } > > +static int stm_trace_id(struct coresight_device *csdev, __maybe_unused enum cs_mode mode, > + __maybe_unused struct coresight_device *sink) > +{ > + struct stm_drvdata *drvdata; > + > + drvdata = dev_get_drvdata(csdev->dev.parent); > + > + return drvdata->traceid; > +} > + > static const struct coresight_ops_source stm_source_ops = { > .enable = stm_enable, > .disable = stm_disable, > + .trace_id = stm_trace_id, > }; > > static const struct coresight_ops stm_cs_ops = { > diff --git a/drivers/hwtracing/coresight/coresight-tpda.c b/drivers/hwtracing/coresight/coresight-tpda.c > index 189a4abc2561..d80b6427e5a6 100644 > --- a/drivers/hwtracing/coresight/coresight-tpda.c > +++ b/drivers/hwtracing/coresight/coresight-tpda.c > @@ -241,9 +241,20 @@ static void tpda_disable(struct coresight_device *csdev, > dev_dbg(drvdata->dev, "TPDA inport %d disabled\n", in->dest_port); > } > > +static int tpda_trace_id(struct coresight_device *csdev, __maybe_unused enum cs_mode mode, > + __maybe_unused struct coresight_device *sink) > +{ > + struct tpda_drvdata *drvdata; > + > + drvdata = dev_get_drvdata(csdev->dev.parent); > + > + return drvdata->atid; > +} > + > static const struct coresight_ops_link tpda_link_ops = { > .enable = tpda_enable, > .disable = tpda_disable, > + .trace_id = tpda_trace_id, > }; > > static const struct coresight_ops tpda_cs_ops = { > diff --git a/include/linux/coresight.h b/include/linux/coresight.h > index 157c4bd009a1..70407d61262e 100644 > --- a/include/linux/coresight.h > +++ b/include/linux/coresight.h > @@ -368,6 +368,7 @@ struct coresight_ops_sink { > * Operations available for links. > * @enable: enables flow between iport and oport. > * @disable: disables flow between iport and oport. > + * @trace_id: alloc or read the traceid. > */ > struct coresight_ops_link { > int (*enable)(struct coresight_device *csdev, > @@ -376,6 +377,8 @@ struct coresight_ops_link { > void (*disable)(struct coresight_device *csdev, > struct coresight_connection *in, > struct coresight_connection *out); > + int (*trace_id)(struct coresight_device *csdev, enum cs_mode mode, > + struct coresight_device *sink); > }; > > /** > @@ -385,6 +388,7 @@ struct coresight_ops_link { > * is associated to. > * @enable: enables tracing for a source. > * @disable: disables tracing for a source. > + * @trace_id: alloc or read the traceid. > */ > struct coresight_ops_source { > int (*cpu_id)(struct coresight_device *csdev); > @@ -392,6 +396,8 @@ struct coresight_ops_source { > enum cs_mode mode, struct coresight_trace_id_map *id_map); > void (*disable)(struct coresight_device *csdev, > struct perf_event *event); > + int (*trace_id)(struct coresight_device *csdev, enum cs_mode mode, > + struct coresight_device *sink); > }; > > /** > @@ -697,4 +703,6 @@ int coresight_init_driver(const char *drv, struct amba_driver *amba_drv, > > void coresight_remove_driver(struct amba_driver *amba_drv, > struct platform_driver *pdev_drv); > +int coresight_etm_get_trace_id(struct coresight_device *csdev, enum cs_mode mode, > + struct coresight_device *sink); > #endif /* _LINUX_COREISGHT_H */

4 months, 2 weeks

[PATCH 0/5] coresight: Add Coresight Trace NOC driver

by Yuanfang Zhang

The Trace NoC is an integration hierarchy which is a replacement of Dragonlink configuration. It brings together debug component like TPDA, funnel and interconnect Trace Noc which collects trace from subsystems and transfers to QDSS sink. Compared to DL, it has the following advantages: 1. Reduce wires between subsystems. 2. Continue cleaning the infrastructure. 3. Reduce Data overhead by transporting raw data from source to target. +--------------+ +-------------+ | SDCC5 TPDM | | SDCC5 TPDM | +--------------+ +-------------+ | | | | +----------|-------------------+ | | v | | | +----v----+ Dragon Link | v | |DLNT TPDA| North | +----------------------+ | +---------+ | | TRACE NOC AG | | | | | | | v-------------+ | +----------------------+ | | | | | +------v-----+ | | | | DLNT Funnel| | | | +------------+ | | | | | | +-------------------|----------+ | <-----+ | | | | | v v +----------------+ +---------------+ | QDSS | | QDSS | +----------------+ +---------------+ Signed-off-by: Yuanfang Zhang <quic_yuanfang(a)quicinc.com> --- Yuanfang Zhang (5): dt-bindings: arm: Add Coresight device Trace NOC definition coresight: add coresight Trace NOC driver coresight-tnoc: add nodes to configure flush coresight-tnoc: add node to configure flag type coresight-tnoc: add nodes to configure freq packet .../bindings/arm/qcom,coresight-tnoc.yaml | 107 ++++++ drivers/hwtracing/coresight/Kconfig | 10 + drivers/hwtracing/coresight/Makefile | 1 + drivers/hwtracing/coresight/coresight-tnoc.c | 401 +++++++++++++++++++++ drivers/hwtracing/coresight/coresight-tnoc.h | 57 +++ 5 files changed, 576 insertions(+) --- base-commit: 92514ef226f511f2ca1fb1b8752966097518edc0 change-id: 20250212-trace-noc-driver-9e75d78114fa Best regards, -- Yuanfang Zhang <quic_yuanfang(a)quicinc.com>

4 months, 2 weeks

Re: CoreSight on Nvidia Jetson

by vincent.ernst＠web.de

Hi Suzuki, thanks for the reply! The CPUs of the boards I am using are all based on Arm-v8(.2), but I found the components' addresses in the manuals of the SoCs. I managed to modify the Devicetree by writing my own .dtsi file (see attachment) and finally got the CoreSight devices in /sys/devices/. However, dmesg shows the following: [ 0.000000] Booting Linux on physical CPU 0x0 [ 0.000000] Linux version 4.9.253-coresight (user@user-desktop) (gcc version 7.5.0 (Ubuntu/Linaro 7.5.0-3ubuntu1~18.04) ) #1 SMP PREEMPT Wed Jan 1 18:45:04 CET 2025 [ 0.000000] Boot CPU: AArch64 Processor [411fd071] (omitted 87 lines) [ 0.212039] DTS File Name: /home/user/Downloads/Linux_for_Tegra/source/public/kernel/kernel-4.9/arch/arm64/boot/dts/../../../../../../hardware/nvidia/platform/t210/porg/kernel-dts/tegra210-p3448-0000-p3449-0000-a02.dts [ 0.212045] DTB Build time: Jan 1 2025 16:04:45 (omitted 35 lines) [ 0.420616] DTS File Name: /home/user/Downloads/Linux_for_Tegra/source/public/kernel/kernel-4.9/arch/arm64/boot/dts/../../../../../../hardware/nvidia/platform/t210/porg/kernel-dts/tegra210-p3448-0000-p3449-0000-a02.dts [ 0.420622] DTB Build time: Jan 1 2025 16:04:45 (omitted 75 lines) [ 0.524166] OF: amba_device_add() failed (-19) for /funnel_bccplex@73001000 (omitted 367 lines) [ 1.330484] OF: graph: no port node found in /etf@72030000 [ 1.330757] OF: graph: no port node found in /etr@72050000 [ 1.330987] OF: graph: no port node found in /funnel_major@72010000 [ 1.331238] OF: graph: no port node found in /ptm0@73440000 [ 1.331451] coresight-etm4x 73440000.ptm0: CPU0: Cortex-A57 ETM v4.0 initialized [ 1.331482] OF: graph: no port node found in /ptm1@73540000 [ 1.331689] coresight-etm4x 73540000.ptm1: CPU1: Cortex-A57 ETM v4.0 initialized [ 1.331719] OF: graph: no port node found in /ptm2@73640000 [ 1.331938] coresight-etm4x 73640000.ptm2: CPU2: Cortex-A57 ETM v4.0 initialized [ 1.331944] extcon-disp-state extcon:disp-state: cable 47 state 0 [ 1.331946] Extcon AUX1(HDMI) disable [ 1.331976] OF: graph: no port node found in /ptm3@73740000 [ 1.332192] coresight-etm4x 73740000.ptm3: CPU3: Cortex-A57 ETM v4.0 initialized [ 1.332250] OF: graph: no port node found in /replicator@72040000 [ 1.332305] coresight-replicator-qcom 72040000.replicator: REPLICATOR 1.0 initialized [ 1.332350] OF: graph: no port node found in /stm@72070000 [ 1.332386] coresight-stm 72070000.stm: stm_register_device failed, probing deffered (omitted 64 lines) [ 1.411751] OF: graph: no port node found in /stm@72070000 [ 1.412025] coresight-stm 72070000.stm: STM32 initialized (omitted 212 lines) Do you have an idea what I did wrong? In the end, I want to be able to follow the steps described here: https://docs.nvidia.com/jetson/archives/l4t-archived/l4t-3275/index.html#pa… Best regards, Vincent (P.S. There was a problem sending this email a first time, but it should work now)

4 months, 2 weeks

Re: [PATCH v12 0/7] Coresight: Add Coresight TMC Control Unit driver

by James Clark

On 17/02/2025 9:30 am, Jie Gan wrote: > From: Jie Gan <jie.gan(a)oss.qualcomm.com> > > The Coresight TMC Control Unit(CTCU) device hosts miscellaneous configuration > registers to control various features related to TMC ETR device. > > The CTCU device works as a helper device physically connected to the TMC ETR device. > --------------------------------------------------------- > |ETR0| |ETR1| > . \ / . > . \ / . > . \ / . > . \ / . > --------------------------------------------------- > ETR0ATID0-ETR0ATID3 CTCU ETR1ATID0-ETR1ATID3 > --------------------------------------------------- > Each ETR has four ATID registers with 128 bits long in total. > e.g. ETR0ATID0-ETR0ATID3 registers are used by ETR0 device. > > Based on the trace id which is programed in CTCU ATID register of > specific ETR, trace data with that trace id can get into ETR's buffer > while other trace data gets ignored. The number of CTCU ATID registers > depends on the number of defined TMC ETR devices. For example, two TMC > ETR devices need eight ATID registers. ETR0 with ETR0ATID0-ETR0ATID3 > and ETR1 with ETR1ATID0-ETRATID3. > > The significant challenge in enabling the data filter function is how > to collect the trace ID of the source device. The introduction of > trace_id callback function addresses this challenge. The callback function > collects trace ID of the device and return it back. The trace ID will be > stored in the structure called coresight_path and transmitted to helper > and sink devices. > > The coresight_path structure is created to address how to transmit > parameters needs by coresight_enable_path/coresight_disbale_path > functions. > > Here is the definition of the struct coresight_path: > /** > * struct coresight_path - data needed by enable/disable path > * @path: path from source to sink. > * @trace_id: trace_id of the whole path. > */ > struct coresight_path { > struct list_head *path; > u8 trace_id; > }; > > The atid_offset mentioned before is the offset to ATID register in CTCU > device. > > Enabling the source device will configure one bit in the ATID register based > on its trace ID. > Disabling the source devices will reset the bit in the AITD register > based on its trace ID. > > Useage: > Enable: > STM device with trace ID 5 and ETR0 is activated. > Bitmap before the enablement: > ETR0ATID0: > 31..................543210 > ========================== > 0000000000000000000000...0 > ========================== > > Bitmap after the enablement: > 31..................543210 > ========================== > 0000000000000...0000100000 > ========================== > > The bit 5 of the ETR0ATID0 register is configured to 1 when enabling the > STM device. > > Disable: > STM device with trace ID 5 and ETR0 is activated. > Bitmap before the disablement: > ETR0ATID0: > 31................6543210 > ========================= > 000000000010111...0100000 > ========================= > > Bitmap after the disablement > ETR0ATID0: > 31................6543210 > ========================= > 000000000010111...0000000 > ========================= > > The bit 5 of the ETR0ATID0 register is reset to 0 when disabling the STM > device. > > Sincere thanks to James Clark for providing an excellent idea to handle > the trace_id of the path. > > Changes in V12: > 1. Update the method for allocating trace_id for perf mode. > Link to V11 - https://lore.kernel.org/linux-arm-msm/20250214024021.249655-1-quic_jiegan@q… > I tested the latest change, looks good to me.

4 months, 2 weeks

Re: [PATCH v12 3/7] Coresight: Use coresight_etm_get_trace_id() in traceid_show()

by James Clark

On 17/02/2025 9:30 am, Jie Gan wrote: > From: James Clark <james.clark(a)linaro.org> > > Use the new API, coresight_etm_get_trace_id, to read the traceid of the ETM > device when call traceid_show via sysfs node. > > Signed-off-by: James Clark <james.clark(a)linaro.org> > Signed-off-by: Jie Gan <quic_jiegan(a)quicinc.com> > --- > drivers/hwtracing/coresight/coresight-etm3x-sysfs.c | 3 +-- > drivers/hwtracing/coresight/coresight-etm4x-sysfs.c | 4 ++-- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c > index 68c644be9813..b9006451f515 100644 > --- a/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c > +++ b/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c > @@ -1190,10 +1190,9 @@ static DEVICE_ATTR_RO(cpu); > static ssize_t traceid_show(struct device *dev, > struct device_attribute *attr, char *buf) > { > - int trace_id; > struct etm_drvdata *drvdata = dev_get_drvdata(dev->parent); > + int trace_id = coresight_etm_get_trace_id(drvdata->csdev, CS_MODE_SYSFS, NULL); > > - trace_id = etm_read_alloc_trace_id(drvdata); > if (trace_id < 0) > return trace_id; > > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c > index c767f8ae4cf1..e5216c0f60da 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c > @@ -4,6 +4,7 @@ > * Author: Mathieu Poirier <mathieu.poirier(a)linaro.org> > */ > > +#include <linux/coresight.h> > #include <linux/pid_namespace.h> > #include <linux/pm_runtime.h> > #include <linux/sysfs.h> > @@ -2402,10 +2403,9 @@ static ssize_t trctraceid_show(struct device *dev, > struct device_attribute *attr, > char *buf) > { > - int trace_id; > struct etmv4_drvdata *drvdata = dev_get_drvdata(dev->parent); > + int trace_id = coresight_etm_get_trace_id(drvdata->csdev, CS_MODE_SYSFS, NULL); > > - trace_id = etm4_read_alloc_trace_id(drvdata); > if (trace_id < 0) > return trace_id; > Reviewed-by: James Clark <james.clark(a)linaro.org>

4 months, 2 weeks

Re: [PATCH v10 4/7] Coresight: Introduce a new struct coresight_path

by James Clark

On 17/02/2025 1:14 am, Jie Gan wrote: > > > On 2/14/2025 7:09 PM, James Clark wrote: >> >> >> On 14/02/2025 1:34 am, Jie Gan wrote: >>> >>> >>> On 2/14/2025 12:00 AM, James Clark wrote: >>>> >>>> >>>> On 07/02/2025 6:42 am, Jie Gan wrote: >>>>> Add 'struct coresight_path' to store the data that is needed by >>>>> coresight_enable_path/coresight_disable_path. The structure will be >>>>> transmitted to any required devices to enable related >>>>> funcationalities. >>>>> >>>>> The trace_id will be allocated after the path is built. Consequently, >>>>> The ETM3x and ETM4x devices will directly read the trace_id from path >>>>> which result in etm_read_alloc_trace_id and etm4_read_alloc_trace_id >>>>> being deleted. >>>>> >>>>> Co-developed-by: James Clark <james.clark(a)linaro.org> >>>>> Signed-off-by: James Clark <james.clark(a)linaro.org> >>>>> Signed-off-by: Jie Gan <quic_jiegan(a)quicinc.com> >>>>> --- >>>>> drivers/hwtracing/coresight/coresight-core.c | 106 ++++++++++++ >>>>> +----- >>>>> drivers/hwtracing/coresight/coresight-dummy.c | 5 +- >>>>> .../hwtracing/coresight/coresight-etm-perf.c | 30 +++-- >>>>> .../hwtracing/coresight/coresight-etm-perf.h | 2 +- >>>>> drivers/hwtracing/coresight/coresight-etm.h | 1 - >>>>> .../coresight/coresight-etm3x-core.c | 54 ++------- >>>>> .../coresight/coresight-etm4x-core.c | 54 ++------- >>>>> drivers/hwtracing/coresight/coresight-etm4x.h | 1 - >>>>> drivers/hwtracing/coresight/coresight-priv.h | 12 +- >>>>> drivers/hwtracing/coresight/coresight-stm.c | 3 +- >>>>> drivers/hwtracing/coresight/coresight-sysfs.c | 17 ++- >>>>> drivers/hwtracing/coresight/coresight-tpdm.c | 3 +- >>>>> include/linux/coresight.h | 12 +- >>>>> 13 files changed, 143 insertions(+), 157 deletions(-) >>>>> >>>> [...] >>>>> @@ -352,7 +352,7 @@ static void *etm_setup_aux(struct perf_event >>>>> *event, void **pages, >>>>> * CPUs, we can handle it and fail the session. >>>>> */ >>>>> for_each_cpu(cpu, mask) { >>>>> - struct list_head *path; >>>>> + struct coresight_path *path; >>>>> struct coresight_device *csdev; >>>>> csdev = per_cpu(csdev_src, cpu); >>>>> @@ -405,15 +405,15 @@ static void *etm_setup_aux(struct perf_event >>>>> *event, void **pages, >>>>> cpumask_clear_cpu(cpu, mask); >>>>> continue; >>>>> } >>>>> - >>>>> /* ensure we can allocate a trace ID for this CPU */ >>>>> - trace_id = coresight_trace_id_get_cpu_id_map(cpu, &sink- >>>>> >perf_sink_id_map); >>>>> - if (!IS_VALID_CS_TRACE_ID(trace_id)) { >>>>> + trace_id = coresight_path_assign_trace_id(path, >>>>> CS_MODE_PERF); >>>>> + >>>>> + /* Can be 0 and valid, ETE doesn't need an ID */ >>>>> + if (trace_id < 0) { >>>> >>>> Not sure why I wrote it like this, but I think we should leave it as >>>> it was with !IS_VALID_CS_TRACE_ID(). Even with ETE it calls the >>>> trace ID allocator, so nothing has changed here. >>>> >>> Sure, Will restore. For ETE or ETM, we dont need traverse the path, >>> just directly allocate the trace id based on cpu id. >>> >>> Jie >>> >>> >> >> Sorry I meant to only keep the !IS_VALID_CS_TRACE_ID() bit. We still >> need to call the new coresight_path_assign_trace_id() otherwise it >> doesn't get assigned to the path. I saw that got removed in v11. >> >> > Sorry for the misunderstanding, I was focused on "nothing has changed > here", lol. > > I got your point here. > So the updated codes should be: > ... > /* ensure we can allocate a trace ID for this CPU */ > trace_id = coresight_path_assign_trace_id(path, > CS_MODE_PERF); > if (!IS_VALID_CS_TRACE_ID(trace_id)) { > cpumask_clear_cpu(cpu, mask); > coresight_release_path(path); > continue; > } > ... > > > Thanks, > Jie Yes that looks good.

4 months, 2 weeks

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

CoreSight