Commit 5cedd223 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Greg Kroah-Hartman

coresight: ETM: Add support for Arm Cortex-A73 and Cortex-A35

Add ETM PIDs of the Arm cortex-A CPUs to the white list of ETMs.
While at it add a helper macro to make it easier to add the new
entries.

Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 25b4a2b9
...@@ -1027,7 +1027,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) ...@@ -1027,7 +1027,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)
} }
pm_runtime_put(&adev->dev); pm_runtime_put(&adev->dev);
dev_info(dev, "%s initialized\n", (char *)id->data); dev_info(dev, "CPU%d: ETM v%d.%d initialized\n",
drvdata->cpu, drvdata->arch >> 4, drvdata->arch & 0xf);
if (boot_enable) { if (boot_enable) {
coresight_enable(drvdata->csdev); coresight_enable(drvdata->csdev);
...@@ -1045,23 +1046,19 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) ...@@ -1045,23 +1046,19 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)
return ret; return ret;
} }
#define ETM4x_AMBA_ID(pid) \
{ \
.id = pid, \
.mask = 0x000fffff, \
}
static const struct amba_id etm4_ids[] = { static const struct amba_id etm4_ids[] = {
{ /* ETM 4.0 - Cortex-A53 */ ETM4x_AMBA_ID(0x000bb95d), /* Cortex-A53 */
.id = 0x000bb95d, ETM4x_AMBA_ID(0x000bb95e), /* Cortex-A57 */
.mask = 0x000fffff, ETM4x_AMBA_ID(0x000bb95a), /* Cortex-A72 */
.data = "ETM 4.0", ETM4x_AMBA_ID(0x000bb959), /* Cortex-A73 */
}, ETM4x_AMBA_ID(0x000bb9da), /* Cortex-A35 */
{ /* 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},
}; };
static struct amba_driver etm4x_driver = { static struct amba_driver etm4x_driver = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment