Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a06a424b authored by Linus Walleij's avatar Linus Walleij Committed by Shashank Mittal
Browse files

coresight: etm: print what version of ETM/PTM is detected 



Helpfully report a bit more about the hardware found in the
silicon when matching the AMBA device IDs by using the associated
.data pointer in the AMBA match.

Change-Id: I4fb8db49448704d4b01a90d026ec443fb0ffe306
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: 1c65b3885ad9b635d5bc6ded43361fd84b55cd09
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: default avatarShashank Mittal <mittals@codeaurora.org>
parent c7183de2

drivers/hwtracing/coresight/coresight-etm3x.c

+5 −1
Original line number Diff line number Diff line
@@ -1859,7 +1859,7 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) 
		goto err_arch_supported;

	}



	dev_info(dev, "ETM initialized\n");

	dev_info(dev, "%s initialized\n", (char *)id->data);



	if (boot_enable) {

		coresight_enable(drvdata->csdev);
@@ -1890,18 +1890,22 @@ static struct amba_id etm_ids[] = { 
	{	/* ETM 3.3 */

		.id	= 0x0003b921,

		.mask	= 0x0003ffff,

		.data	= "ETM 3.3",

	},

	{	/* ETM 3.5 */

		.id	= 0x0003b956,

		.mask	= 0x0003ffff,

		.data	= "ETM 3.5",

	},

	{	/* PTM 1.0 */

		.id	= 0x0003b950,

		.mask	= 0x0003ffff,

		.data	= "PTM 1.0",

	},

	{	/* PTM 1.1 */

		.id	= 0x0003b95f,

		.mask	= 0x0003ffff,

		.data	= "PTM 1.1",

	},

	{ 0, 0},

};