Add 'trace_id' function pointer in ops. It's responsible for
retrieving the device's trace ID.
Signed-off-by: Jie Gan <quic_jiegan@xxxxxxxxxxx>
---
drivers/hwtracing/coresight/coresight-dummy.c | 13 +++++++++
.../coresight/coresight-etm3x-core.c | 29 +++++++++++++++++++
.../coresight/coresight-etm4x-core.c | 28 ++++++++++++++++++
drivers/hwtracing/coresight/coresight-stm.c | 13 +++++++++
drivers/hwtracing/coresight/coresight-tpda.c | 12 ++++++++
include/linux/coresight.h | 5 ++++
6 files changed, 100 insertions(+)
diff --git a/drivers/hwtracing/coresight/coresight-dummy.c b/drivers/hwtracing/coresight/coresight-dummy.c
index 9be53be8964b..dfcf24e9c49a 100644
--- a/drivers/hwtracing/coresight/coresight-dummy.c
+++ b/drivers/hwtracing/coresight/coresight-dummy.c
@@ -41,6 +41,18 @@ 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, enum cs_mode mode,
+ struct coresight_trace_id_map *id_map)
+{
+ struct dummy_drvdata *drvdata;
+
+ if (csdev == NULL)
+ return -EINVAL;
+
+ 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 +71,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..74c6a2ffd07a 100644
--- a/drivers/hwtracing/coresight/coresight-etm3x-core.c
+++ b/drivers/hwtracing/coresight/coresight-etm3x-core.c
@@ -697,10 +697,39 @@ 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)
+{
+ struct etm_drvdata *drvdata;
+ int trace_id;
+
+ 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 = {
diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
index 2c1a60577728..e8934a9df928 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
@@ -1060,10 +1060,38 @@ 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)
+{
+ struct etmv4_drvdata *drvdata;
+ int trace_id;
+
+ 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 = {
diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c
index b581a30a1cd9..13efd5c2e0c4 100644
--- a/drivers/hwtracing/coresight/coresight-stm.c
+++ b/drivers/hwtracing/coresight/coresight-stm.c
@@ -281,9 +281,22 @@ 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)
+{
+ struct stm_drvdata *drvdata;
+
+ if (csdev == NULL)
+ return -EINVAL;
+
+ 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..3632c1791c96 100644
--- a/drivers/hwtracing/coresight/coresight-tpda.c
+++ b/drivers/hwtracing/coresight/coresight-tpda.c
@@ -241,9 +241,21 @@ 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)
+{
+ struct tpda_drvdata *drvdata;
+
+ if (csdev == NULL)
+ return -EINVAL;
+
+ 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..82fbcc70a21c 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: Collect the traceid.
*/
struct coresight_ops_link {
int (*enable)(struct coresight_device *csdev,
@@ -376,6 +377,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);
};
/**
@@ -385,6 +387,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);
@@ -392,6 +395,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_trace_id_map *id_map);
};
/**
--
2.34.1
