Add ETM PIDs of the Arm cortex-A CPUs to the white list of ETMs. While at it, also add description of the CPU to which the ETM belongs, to make it easier to identify the ETM devices.
Cc: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Suzuki K Poulose suzuki.poulose@arm.com --- drivers/hwtracing/coresight/coresight-etm4x.c | 32 +++++++++++++-------------- 1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c index cf364a5..fe5b41c 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.c +++ b/drivers/hwtracing/coresight/coresight-etm4x.c @@ -1034,7 +1034,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) }
pm_runtime_put(&adev->dev); - dev_info(dev, "%s initialized\n", (char *)id->data); + dev_info(dev, "CPU%d: %s initialized\n", + drvdata->cpu, (char *)id->data);
if (boot_enable) { coresight_enable(drvdata->csdev); @@ -1052,23 +1053,20 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) return ret; }
+#define ETM4_AMBA_ID(cpu, pid) \ + { \ + .id = pid, \ + .mask = 0x000fffff, \ + .data = #cpu " ETM v4.x", \ + } + static const struct amba_id etm4_ids[] = { - { /* ETM 4.0 - Cortex-A53 */ - .id = 0x000bb95d, - .mask = 0x000fffff, - .data = "ETM 4.0", - }, - { /* ETM 4.0 - Cortex-A57 */ - .id = 0x000bb95e, - .mask = 0x000fffff, - .data = "ETM 4.0", - }, - { /* ETM 4.0 - A72, Maia, HiSilicon */ - .id = 0x000bb95a, - .mask = 0x000fffff, - .data = "ETM 4.0", - }, - { 0, 0}, + ETM4_AMBA_ID(Cortex-A53, 0x000bb95d), + ETM4_AMBA_ID(Cortex-A57, 0x000bb95e), + ETM4_AMBA_ID(Cortex-A72, 0x000bb95a), + ETM4_AMBA_ID(Cortex-A73, 0x000bb959), + ETM4_AMBA_ID(Cortex-A35, 0x000bb9da), + {}, };
static struct amba_driver etm4x_driver = {