Commit 28941701 authored by Mike Leach's avatar Mike Leach Committed by Russell King
Browse files

ARM: 8837/1: coresight: etmv4: Update ID register table to add UCI support 



Adds macro to enable UCI entries to be added to AMBA ID tables.

Updates the ID register tables to contain a UCI entry for the A35 ETM
device to allow correct matching of driver in the amba bus code.

Signed-off-by: default avatarMike Leach <mike.leach@linaro.org>
Reviewed-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Tested-by: default avatarSai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent 4a2910fa

drivers/hwtracing/coresight/coresight-etm4x.c

+12 −9
Original line number Diff line number Diff line
@@ -1067,18 +1067,21 @@ err_arch_supported: 
	return ret;

}



#define ETM4x_AMBA_ID(pid)			\

	{					\

		.id	= pid,			\

		.mask	= 0x000fffff,		\

static struct amba_cs_uci_id uci_id_etm4[] = {

	{

		/*  ETMv4 UCI data */

		.devarch	= 0x47704a13,

		.devarch_mask	= 0xfff0ffff,

		.devtype	= 0x00000013,

	}

};



static const struct amba_id etm4_ids[] = {

	ETM4x_AMBA_ID(0x000bb95d),		/* Cortex-A53 */

	ETM4x_AMBA_ID(0x000bb95e),		/* Cortex-A57 */

	ETM4x_AMBA_ID(0x000bb95a),		/* Cortex-A72 */

	ETM4x_AMBA_ID(0x000bb959),		/* Cortex-A73 */

	ETM4x_AMBA_ID(0x000bb9da),		/* Cortex-A35 */

	CS_AMBA_ID(0x000bb95d),		/* Cortex-A53 */

	CS_AMBA_ID(0x000bb95e),		/* Cortex-A57 */

	CS_AMBA_ID(0x000bb95a),		/* Cortex-A72 */

	CS_AMBA_ID(0x000bb959),		/* Cortex-A73 */

	CS_AMBA_UCI_ID(0x000bb9da, uci_id_etm4),	/* Cortex-A35 */

	{},

};

drivers/hwtracing/coresight/coresight-priv.h

+8 −0
Original line number Diff line number Diff line
@@ -183,6 +183,14 @@ static inline int etm_writel_cp14(u32 off, u32 val) { return 0; } 
			}				\

	}



/* coresight AMBA ID, full UCI structure: id table entry. */

#define CS_AMBA_UCI_ID(pid, uci_ptr)	\

	{				\

		.id	= pid,		\

		.mask	= 0x000fffff,	\

		.data	= uci_ptr	\

	}



/* extract the data value from a UCI structure given amba_id pointer. */

static inline void *coresight_get_uci_data(const struct amba_id *id)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE