From: mathieu.poirier@linaro.org (Mathieu Poirier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 20/21] coresight: introducing a global trace ID function
Date: Wed, 17 Feb 2016 17:52:02 -0700 [thread overview]
Message-ID: <1455756723-8456-21-git-send-email-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <1455756723-8456-1-git-send-email-mathieu.poirier@linaro.org>
TraceID values have to be unique for all tracers and
consistent between drivers and user space. As such
introducing a central function to be used whenever a
traceID value is required.
The patch also account for data traceIDs, which are usually
I(N) + 1.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/hwtracing/coresight/coresight-etm3x.c | 7 ++-----
include/linux/coresight-pmu.h | 12 ++++++++++++
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c
index 77b37413803f..0ba1a3981373 100644
--- a/drivers/hwtracing/coresight/coresight-etm3x.c
+++ b/drivers/hwtracing/coresight/coresight-etm3x.c
@@ -27,6 +27,7 @@
#include <linux/cpu.h>
#include <linux/of.h>
#include <linux/coresight.h>
+#include <linux/coresight-pmu.h>
#include <linux/amba/bus.h>
#include <linux/seq_file.h>
#include <linux/uaccess.h>
@@ -740,11 +741,7 @@ static void etm_init_arch_data(void *info)
static void etm_init_trace_id(struct etm_drvdata *drvdata)
{
- /*
- * A trace ID of value 0 is invalid, so let's start at some
- * random value that fits in 7 bits and go from there.
- */
- drvdata->traceid = 0x10 + drvdata->cpu;
+ drvdata->traceid = coresight_get_trace_id(drvdata->cpu);
}
static int etm_probe(struct amba_device *adev, const struct amba_id *id)
diff --git a/include/linux/coresight-pmu.h b/include/linux/coresight-pmu.h
index 6c5386b23b10..7d410260661b 100644
--- a/include/linux/coresight-pmu.h
+++ b/include/linux/coresight-pmu.h
@@ -19,9 +19,21 @@
#define _LINUX_CORESIGHT_PMU_H
#define CORESIGHT_ETM_PMU_NAME "cs_etm"
+#define CORESIGHT_ETM_PMU_SEED 0x10
/* ETMv3.5/PTM's ETMCR config bit */
#define ETM_OPT_CYCACC 12
#define ETM_OPT_TS 28
+static inline int coresight_get_trace_id(int cpu)
+{
+ /*
+ * A trace ID of value 0 is invalid, so let's start at some
+ * random value that fits in 7 bits and go from there. Since
+ * the common convention is to have data trace IDs be I(N) + 1,
+ * set instruction trace IDs as a function of the CPU number.
+ */
+ return (CORESIGHT_ETM_PMU_SEED + (cpu * 2));
+}
+
#endif
--
2.1.4
next prev parent reply other threads:[~2016-02-18 0:52 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-18 0:51 [PATCH 00/21] coresight: next v4.5-rc4 Mathieu Poirier
2016-02-18 0:51 ` [PATCH 01/21] coresight: "DEVICE_ATTR_RO" should defined as static Mathieu Poirier
2016-02-18 0:51 ` [PATCH 02/21] coresight: etm4x: Check every parameter used by dma_xx_coherent Mathieu Poirier
2016-02-18 0:51 ` [PATCH 03/21] coresight: associating path with session rather than tracer Mathieu Poirier
2016-02-18 0:51 ` [PATCH 04/21] coresight: add API to get sink from path Mathieu Poirier
2016-02-18 0:51 ` [PATCH 05/21] coresight: moving PM runtime operations to core framework Mathieu Poirier
2016-02-18 0:51 ` [PATCH 06/21] coresight: etm3x: moving etm_readl/writel to header file Mathieu Poirier
2016-02-18 0:51 ` [PATCH 07/21] coresight: etm3x: moving sysFS entries to dedicated file Mathieu Poirier
2016-02-18 0:51 ` [PATCH 08/21] coresight: etm3x: unlocking tracers in default arch init Mathieu Poirier
2016-02-18 0:51 ` [PATCH 09/21] coresight: etm3x: splitting struct etm_drvdata Mathieu Poirier
2016-02-18 0:51 ` [PATCH 10/21] coresight: etm3x: adding operation mode for etm_enable() Mathieu Poirier
2016-02-18 0:51 ` [PATCH 11/21] coresight: etm3x: set progbit to stop trace collection Mathieu Poirier
2016-02-18 0:51 ` [PATCH 12/21] coresight: etm3x: changing default trace configuration Mathieu Poirier
2016-02-18 0:51 ` [PATCH 13/21] coresight: etm3x: consolidating initial config Mathieu Poirier
2016-02-18 0:51 ` [PATCH 14/21] coresight: etm3x: implementing user/kernel mode tracing Mathieu Poirier
2016-02-18 0:51 ` [PATCH 15/21] coresight: etm3x: implementing perf_enable/disable() API Mathieu Poirier
2016-02-18 0:51 ` [PATCH 16/21] coresight: etb10: moving to local atomic operations Mathieu Poirier
2016-02-18 0:51 ` [PATCH 17/21] coresight: etb10: adding operation mode for sink->enable() Mathieu Poirier
2016-02-18 0:52 ` [PATCH 18/21] coresight: etb10: implementing AUX API Mathieu Poirier
2016-02-18 0:52 ` [PATCH 19/21] coresight: etm-perf: new PMU driver for ETM tracers Mathieu Poirier
2016-02-18 0:52 ` Mathieu Poirier [this message]
2016-02-18 0:52 ` [PATCH 21/21] drivers/hwtracing: make coresight-* explicitly non-modular Mathieu Poirier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455756723-8456-21-git-send-email-mathieu.poirier@linaro.org \
--to=mathieu.poirier@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).