@@ -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
@@ -297,12 +298,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;
@@ -310,7 +311,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);
}
}
@@ -327,7 +328,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);
@@ -337,7 +338,8 @@ EXPORT_SYMBOL_GPL(coresight_disable_source);
* disabled.
*/
static void coresight_disable_path_from(struct list_head *path,
- struct coresight_node *nd)
+ struct coresight_node *nd,
+ void *sink_data)
{
u32 type;
struct coresight_device *csdev, *parent, *child;
@@ -382,13 +384,13 @@ 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, sink_data);
}
}
-void coresight_disable_path(struct list_head *path)
+void coresight_disable_path(struct list_head *path, void *sink_data)
{
- coresight_disable_path_from(path, NULL);
+ coresight_disable_path_from(path, NULL, sink_data);
}
EXPORT_SYMBOL_GPL(coresight_disable_path);
@@ -468,10 +470,47 @@ int coresight_enable_path(struct list_head *path, enum cs_mode mode,
out:
return ret;
err:
- coresight_disable_path_from(path, nd);
+ coresight_disable_path_from(path, nd, sink_data);
goto out;
}
+int coresight_read_traceid(struct list_head *path, enum cs_mode mode,
+ struct coresight_trace_id_map *id_map)
+{
+ int trace_id, type;
+ struct coresight_device *csdev;
+ struct coresight_node *nd;
+
+ list_for_each_entry(nd, path, link) {
+ csdev = nd->csdev;
+ type = csdev->type;
+
+ switch (type) {
+ case CORESIGHT_DEV_TYPE_SOURCE:
+ if (source_ops(csdev)->trace_id != NULL) {
+ trace_id = source_ops(csdev)->trace_id(csdev,
+ mode,
+ id_map);
+ if (IS_VALID_CS_TRACE_ID(trace_id))
+ goto out;
+ }
+ break;
+ case CORESIGHT_DEV_TYPE_LINK:
+ if (link_ops(csdev)->trace_id != NULL) {
+ trace_id = link_ops(csdev)->trace_id(csdev);
+ if (IS_VALID_CS_TRACE_ID(trace_id))
+ goto out;
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ return -EINVAL;
+out:
+ return trace_id;
+}
+
struct coresight_device *coresight_get_sink(struct list_head *path)
{
struct coresight_device *csdev;
@@ -173,7 +173,8 @@ static int etb_enable_perf(struct coresight_device *csdev, void *data)
pid_t pid;
unsigned long flags;
struct etb_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
- struct perf_output_handle *handle = data;
+ struct cs_sink_data *sink_data = (struct cs_sink_data *)data;
+ struct perf_output_handle *handle = sink_data->handle;
struct cs_buffers *buf = etm_perf_sink_config(handle);
spin_lock_irqsave(&drvdata->spinlock, flags);
@@ -459,6 +459,7 @@ static void etm_event_start(struct perf_event *event, int flags)
struct perf_output_handle *handle = &ctxt->handle;
struct coresight_device *sink, *csdev = per_cpu(csdev_src, cpu);
struct list_head *path;
+ struct cs_sink_data *sink_data = NULL;
u64 hw_id;
u8 trace_id;
@@ -498,9 +499,20 @@ static void etm_event_start(struct perf_event *event, int flags)
if (WARN_ON_ONCE(!sink))
goto fail_end_stop;
+ sink_data = kzalloc(sizeof(*sink_data), GFP_KERNEL);
+ if (!sink_data)
+ goto fail_end_stop;
+
+ sink_data->sink = sink;
+ sink_data->traceid = coresight_read_traceid(path, CS_MODE_PERF,
+ &sink->perf_sink_id_map);
+ sink_data->handle = handle;
+
/* Nothing will happen without a path */
- if (coresight_enable_path(path, CS_MODE_PERF, handle))
+ if (coresight_enable_path(path, CS_MODE_PERF, sink_data)) {
+ kfree(sink_data);
goto fail_end_stop;
+ }
/* Finally enable the tracer */
if (source_ops(csdev)->enable(csdev, event, CS_MODE_PERF,
@@ -526,6 +538,7 @@ static void etm_event_start(struct perf_event *event, int flags)
perf_report_aux_output_id(event, hw_id);
}
+ kfree(sink_data);
out:
/* Tell the perf core the event is alive */
event->hw.state = 0;
@@ -534,7 +547,8 @@ static void etm_event_start(struct perf_event *event, int flags)
return;
fail_disable_path:
- coresight_disable_path(path);
+ coresight_disable_path(path, sink_data);
+ kfree(sink_data);
fail_end_stop:
/*
* Check if the handle is still associated with the event,
@@ -559,6 +573,7 @@ static void etm_event_stop(struct perf_event *event, int mode)
struct perf_output_handle *handle = &ctxt->handle;
struct etm_event_data *event_data;
struct list_head *path;
+ struct cs_sink_data *sink_data = NULL;
/*
* If we still have access to the event_data via handle,
@@ -603,6 +618,10 @@ static void etm_event_stop(struct perf_event *event, int mode)
if (!sink)
return;
+ sink_data = kzalloc(sizeof(*sink_data), GFP_KERNEL);
+ if (!sink_data)
+ return;
+
/* stop tracer */
coresight_disable_source(csdev, event);
@@ -616,12 +635,16 @@ static void etm_event_stop(struct perf_event *event, int mode)
* have to do anything here.
*/
if (handle->event && (mode & PERF_EF_UPDATE)) {
- if (WARN_ON_ONCE(handle->event != event))
+ if (WARN_ON_ONCE(handle->event != event)) {
+ kfree(sink_data);
return;
+ }
/* update trace information */
- if (!sink_ops(sink)->update_buffer)
+ if (!sink_ops(sink)->update_buffer) {
+ kfree(sink_data);
return;
+ }
size = sink_ops(sink)->update_buffer(sink, handle,
event_data->snk_config);
@@ -642,8 +665,12 @@ static void etm_event_stop(struct perf_event *event, int mode)
WARN_ON(size);
}
+ sink_data->sink = sink;
+ sink_data->traceid = coresight_read_traceid(path, CS_MODE_PERF,
+ &sink->perf_sink_id_map);
/* Disabling the path make its elements available to other sessions */
- coresight_disable_path(path);
+ coresight_disable_path(path, sink_data);
+ kfree(sink_data);
}
static int etm_event_add(struct perf_event *event, int mode)
@@ -697,10 +697,40 @@ static void etm_disable(struct coresight_device *csdev,
coresight_set_mode(csdev, CS_MODE_DISABLED);
}
+static int etm_trace_id(struct coresight_device *csdev,
+ enum cs_mode mode,
+ struct coresight_trace_id_map *id_map)
+{
+ int trace_id;
+ struct etm_drvdata *drvdata;
+
+ if (csdev == NULL)
+ return -EINVAL;
+
+ drvdata = dev_get_drvdata(csdev->dev.parent);
+ switch (mode) {
+ case CS_MODE_SYSFS:
+ trace_id = etm_read_alloc_trace_id(drvdata);
+ break;
+ case CS_MODE_PERF:
+ trace_id = coresight_trace_id_read_cpu_id_map(drvdata->cpu, id_map);
+ if (IS_VALID_CS_TRACE_ID(trace_id))
+ drvdata->traceid = (u8)trace_id;
+ break;
+ default:
+ trace_id = -EINVAL;
+ break;
+ }
+
+ return trace_id;
+}
+
+
static const struct coresight_ops_source etm_source_ops = {
.cpu_id = etm_cpu_id,
.enable = etm_enable,
.disable = etm_disable,
+ .trace_id = etm_trace_id,
};
static const struct coresight_ops etm_cs_ops = {
@@ -1025,10 +1025,39 @@ static void etm4_disable(struct coresight_device *csdev,
coresight_set_mode(csdev, CS_MODE_DISABLED);
}
+static int etm4_trace_id(struct coresight_device *csdev,
+ enum cs_mode mode,
+ struct coresight_trace_id_map *id_map)
+{
+ int trace_id;
+ struct etmv4_drvdata *drvdata;
+
+ if (csdev == NULL)
+ return -EINVAL;
+
+ drvdata = dev_get_drvdata(csdev->dev.parent);
+ switch (mode) {
+ case CS_MODE_SYSFS:
+ trace_id = etm4_read_alloc_trace_id(drvdata);
+ break;
+ case CS_MODE_PERF:
+ trace_id = coresight_trace_id_read_cpu_id_map(drvdata->cpu, id_map);
+ if (IS_VALID_CS_TRACE_ID(trace_id))
+ drvdata->trcid = (u8)trace_id;
+ break;
+ default:
+ trace_id = -EINVAL;
+ break;
+ }
+
+ return trace_id;
+}
+
static const struct coresight_ops_source etm4_source_ops = {
.cpu_id = etm4_cpu_id,
.enable = etm4_enable,
.disable = etm4_disable,
+ .trace_id = etm4_trace_id,
};
static const struct coresight_ops etm4_cs_ops = {
@@ -105,6 +105,15 @@ struct cs_buffers {
void **data_pages;
};
+/**
+ * struct cs_sink_data - data used by coresight_enable_path/coresight_disable_path
+ */
+struct cs_sink_data {
+ struct perf_output_handle *handle;
+ struct coresight_device *sink;
+ u8 traceid;
+};
+
static inline void coresight_insert_barrier_packet(void *buf)
{
if (buf)
@@ -129,9 +138,11 @@ static inline void CS_UNLOCK(void __iomem *addr)
} while (0);
}
-void coresight_disable_path(struct list_head *path);
+void coresight_disable_path(struct list_head *path, void *sink_data);
int coresight_enable_path(struct list_head *path, enum cs_mode mode,
void *sink_data);
+int coresight_read_traceid(struct list_head *path, enum cs_mode mode,
+ struct coresight_trace_id_map *id_map);
struct coresight_device *coresight_get_sink(struct list_head *path);
struct coresight_device *coresight_get_sink_by_id(u32 id);
struct coresight_device *
@@ -281,9 +281,31 @@ static void stm_disable(struct coresight_device *csdev,
}
}
+static int stm_trace_id(struct coresight_device *csdev,
+ enum cs_mode mode,
+ struct coresight_trace_id_map *id_map)
+{
+ int trace_id;
+ struct stm_drvdata *drvdata;
+
+ if (csdev == NULL)
+ return -EINVAL;
+
+ drvdata = dev_get_drvdata(csdev->dev.parent);
+ trace_id = drvdata->traceid;
+ if (!IS_VALID_CS_TRACE_ID(trace_id)) {
+ trace_id = coresight_trace_id_get_system_id();
+ if (IS_VALID_CS_TRACE_ID(trace_id))
+ drvdata->traceid = (u8)trace_id;
+ }
+
+ return trace_id;
+}
+
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 = {
@@ -168,6 +168,7 @@ int coresight_enable_sysfs(struct coresight_device *csdev)
int cpu, ret = 0;
struct coresight_device *sink;
struct list_head *path;
+ struct cs_sink_data *sink_data;
enum coresight_dev_subtype_source subtype;
u32 hash;
@@ -209,7 +210,14 @@ int coresight_enable_sysfs(struct coresight_device *csdev)
goto out;
}
- ret = coresight_enable_path(path, CS_MODE_SYSFS, NULL);
+ sink_data = kzalloc(sizeof(*sink_data), GFP_KERNEL);
+ if (!sink_data) {
+ ret = -ENOMEM;
+ goto out;
+ }
+ sink_data->traceid = coresight_read_traceid(path, CS_MODE_SYSFS, NULL);
+ sink_data->sink = sink;
+ ret = coresight_enable_path(path, CS_MODE_SYSFS, sink_data);
if (ret)
goto err_path;
@@ -246,15 +254,17 @@ int coresight_enable_sysfs(struct coresight_device *csdev)
break;
}
+ kfree(sink_data);
out:
mutex_unlock(&coresight_mutex);
return ret;
err_source:
- coresight_disable_path(path);
+ coresight_disable_path(path, sink_data);
err_path:
coresight_release_path(path);
+ kfree(sink_data);
goto out;
}
EXPORT_SYMBOL_GPL(coresight_enable_sysfs);
@@ -263,6 +273,7 @@ void coresight_disable_sysfs(struct coresight_device *csdev)
{
int cpu, ret;
struct list_head *path = NULL;
+ struct cs_sink_data *sink_data = NULL;
u32 hash;
mutex_lock(&coresight_mutex);
@@ -274,6 +285,10 @@ void coresight_disable_sysfs(struct coresight_device *csdev)
if (!coresight_disable_source_sysfs(csdev, NULL))
goto out;
+ sink_data = kzalloc(sizeof(*sink_data), GFP_KERNEL);
+ if (!sink_data)
+ goto out;
+
switch (csdev->subtype.source_subtype) {
case CORESIGHT_DEV_SUBTYPE_SOURCE_PROC:
cpu = source_ops(csdev)->cpu_id(csdev);
@@ -297,8 +312,11 @@ void coresight_disable_sysfs(struct coresight_device *csdev)
break;
}
- coresight_disable_path(path);
+ sink_data->sink = coresight_find_activated_sysfs_sink(csdev);
+ sink_data->traceid = coresight_read_traceid(path, CS_MODE_SYSFS, NULL);
+ coresight_disable_path(path, sink_data);
coresight_release_path(path);
+ kfree(sink_data);
out:
mutex_unlock(&coresight_mutex);
@@ -250,7 +250,8 @@ static int tmc_enable_etf_sink_perf(struct coresight_device *csdev, void *data)
pid_t pid;
unsigned long flags;
struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
- struct perf_output_handle *handle = data;
+ struct cs_sink_data *sink_data = (struct cs_sink_data *)data;
+ struct perf_output_handle *handle = sink_data->handle;
struct cs_buffers *buf = etm_perf_sink_config(handle);
spin_lock_irqsave(&drvdata->spinlock, flags);
@@ -1254,7 +1254,8 @@ static int tmc_enable_etr_sink_sysfs(struct coresight_device *csdev)
struct etr_buf *tmc_etr_get_buffer(struct coresight_device *csdev,
enum cs_mode mode, void *data)
{
- struct perf_output_handle *handle = data;
+ struct cs_sink_data *sink_data = (struct cs_sink_data *)data;
+ struct perf_output_handle *handle = sink_data->handle;
struct etr_perf_buffer *etr_perf;
switch (mode) {
@@ -1648,7 +1649,8 @@ static int tmc_enable_etr_sink_perf(struct coresight_device *csdev, void *data)
pid_t pid;
unsigned long flags;
struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
- struct perf_output_handle *handle = data;
+ struct cs_sink_data *sink_data = (struct cs_sink_data *)data;
+ struct perf_output_handle *handle = sink_data->handle;
struct etr_perf_buffer *etr_perf = etm_perf_sink_config(handle);
spin_lock_irqsave(&drvdata->spinlock, flags);
@@ -232,9 +232,29 @@ 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)
+{
+ int trace_id;
+ struct tpda_drvdata *drvdata;
+
+ if (csdev == NULL)
+ return -EINVAL;
+
+ drvdata = dev_get_drvdata(csdev->dev.parent);
+ trace_id = drvdata->atid;
+ if (!IS_VALID_CS_TRACE_ID(trace_id)) {
+ trace_id = coresight_trace_id_get_system_id();
+ if (IS_VALID_CS_TRACE_ID(trace_id))
+ drvdata->atid = (u8)trace_id;
+ }
+
+ return trace_id;
+}
+
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 = {
@@ -21,6 +21,7 @@
#include "coresight-self-hosted-trace.h"
#include "coresight-trbe.h"
+#include "coresight-priv.h"
#define PERF_IDX2OFF(idx, buf) ((idx) % ((buf)->nr_pages << PAGE_SHIFT))
@@ -1012,7 +1013,8 @@ static int arm_trbe_enable(struct coresight_device *csdev, enum cs_mode mode,
{
struct trbe_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
struct trbe_cpudata *cpudata = dev_get_drvdata(&csdev->dev);
- struct perf_output_handle *handle = data;
+ struct cs_sink_data *sink_data = (struct cs_sink_data *)data;
+ struct perf_output_handle *handle = sink_data->handle;
struct trbe_buf *buf = etm_perf_sink_config(handle);
WARN_ON(cpudata->cpu != smp_processor_id());
@@ -216,7 +216,8 @@ static void smb_enable_sysfs(struct coresight_device *csdev)
static int smb_enable_perf(struct coresight_device *csdev, void *data)
{
struct smb_drv_data *drvdata = dev_get_drvdata(csdev->dev.parent);
- struct perf_output_handle *handle = data;
+ struct cs_sink_data *sink_data = (struct cs_sink_data *)data;
+ struct perf_output_handle *handle = sink_data->handle;
struct cs_buffers *buf = etm_perf_sink_config(handle);
pid_t pid;
@@ -363,6 +363,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: Collect the traceid.
*/
struct coresight_ops_link {
int (*enable)(struct coresight_device *csdev,
@@ -371,6 +372,7 @@ 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);
};
/**
@@ -380,6 +382,7 @@ struct coresight_ops_link {
* is associated to.
* @enable: enables tracing for a source.
* @disable: disables tracing for a source.
+ * @trace_id: collect the traceid.
*/
struct coresight_ops_source {
int (*cpu_id)(struct coresight_device *csdev);
@@ -387,6 +390,9 @@ 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_trace_id_map *id_map);
};
/**
Add 'trace_id' function pointer in ops. It's responsible for retrieving the device's trace ID. Add 'struct cs_sink_data' to store the data that is needed by coresight_enable_path/coresight_disable_path. The structure will be transmitted to the helper and sink device to enable related funcationalities. Signed-off-by: Jie Gan <quic_jiegan@quicinc.com> --- drivers/hwtracing/coresight/coresight-core.c | 59 +++++++++++++++---- drivers/hwtracing/coresight/coresight-etb10.c | 3 +- .../hwtracing/coresight/coresight-etm-perf.c | 37 ++++++++++-- .../coresight/coresight-etm3x-core.c | 30 ++++++++++ .../coresight/coresight-etm4x-core.c | 29 +++++++++ drivers/hwtracing/coresight/coresight-priv.h | 13 +++- drivers/hwtracing/coresight/coresight-stm.c | 22 +++++++ drivers/hwtracing/coresight/coresight-sysfs.c | 24 +++++++- .../hwtracing/coresight/coresight-tmc-etf.c | 3 +- .../hwtracing/coresight/coresight-tmc-etr.c | 6 +- drivers/hwtracing/coresight/coresight-tpda.c | 20 +++++++ drivers/hwtracing/coresight/coresight-trbe.c | 4 +- drivers/hwtracing/coresight/ultrasoc-smb.c | 3 +- include/linux/coresight.h | 6 ++ 14 files changed, 234 insertions(+), 25 deletions(-)