Subject: Re: [PATCH v4 11/25] coresight: etm4x: Define DEVARCH register fields

From: Mathieu Poirier <[email-masked]>
Date: Mon, 30 Nov 2020 14:19:08 -0700

On Thu, Nov 19, 2020 at 04:45:33PM +0000, Suzuki K Poulose wrote:
> Define the fields of the DEVARCH register for identifying
> a component as an ETMv4.x unit. Going forward, we use the
> DEVARCH register for the component identification, rather
> than the TRCIDR3.
> 
> Cc: Mathieu Poirier <[email-masked]>
> Cc: Mike Leach <[email-masked]>
> Signed-off-by: Suzuki K Poulose <[email-masked]>
> ---
>  .../coresight/coresight-etm4x-core.c          |  4 +-
>  drivers/hwtracing/coresight/coresight-etm4x.h | 42 +++++++++++++++++++
>  2 files changed, 44 insertions(+), 2 deletions(-)

Reviewed-by: Mathieu Poirier <[email-masked]>

> 
> diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
> index c2499b62e64e..6f776f075602 100644
> --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
> +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
> @@ -1622,8 +1622,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)
>  static struct amba_cs_uci_id uci_id_etm4[] = {
>  	{
>  		/*  ETMv4 UCI data */
> -		.devarch	= 0x47704a13,
> -		.devarch_mask	= 0xfff0ffff,
> +		.devarch	= ETM_DEVARCH_ETMv4x_ARCH,
> +		.devarch_mask	= ETM_DEVARCH_ID_MASK,
>  		.devtype	= 0x00000013,
>  	}
>  };
> diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h
> index 6591a59c1012..d8f047547a36 100644
> --- a/drivers/hwtracing/coresight/coresight-etm4x.h
> +++ b/drivers/hwtracing/coresight/coresight-etm4x.h
> @@ -498,6 +498,48 @@
>  					 ETM_MODE_EXCL_KERN | \
>  					 ETM_MODE_EXCL_USER)
>  
> +/*
> + * TRCDEVARCH Bit field definitions
> + * Bits[31:21]	- ARCHITECT = Always Arm Ltd.
> + *                * Bits[31:28] = 0x4
> + *                * Bits[27:21] = 0b0111011
> + * Bit[20]	- PRESENT,  Indicates the presence of this register.
> + *
> + * Bit[19:16]	- REVISION, Revision of the architecture.
> + *
> + * Bit[15:0]	- ARCHID, Identifies this component as an ETM
> + *                * Bits[15:12] - architecture version of ETM
> + *                *             = 4 for ETMv4
> + *                * Bits[11:0] = 0xA13, architecture part number for ETM.
> + */
> +#define ETM_DEVARCH_ARCHITECT_MASK		GENMASK(31, 21)
> +#define ETM_DEVARCH_ARCHITECT_ARM		((0x4 << 28) | (0b0111011 << 21))
> +#define ETM_DEVARCH_PRESENT			BIT(20)
> +#define ETM_DEVARCH_REVISION_SHIFT		16
> +#define ETM_DEVARCH_REVISION_MASK		GENMASK(19, 16)
> +#define ETM_DEVARCH_REVISION(x)			\
> +	(((x) & ETM_DEVARCH_REVISION_MASK) >> ETM_DEVARCH_REVISION_SHIFT)
> +#define ETM_DEVARCH_ARCHID_MASK			GENMASK(15, 0)
> +#define ETM_DEVARCH_ARCHID_ARCH_VER_SHIFT	12
> +#define ETM_DEVARCH_ARCHID_ARCH_VER_MASK	GENMASK(15, 12)
> +#define ETM_DEVARCH_ARCHID_ARCH_VER(x)		\
> +	(((x) & ETM_DEVARCH_ARCHID_ARCH_VER_MASK) >> ETM_DEVARCH_ARCHID_ARCH_VER_SHIFT)
> +
> +#define ETM_DEVARCH_MAKE_ARCHID_ARCH_VER(ver)			\
> +	(((ver) << ETM_DEVARCH_ARCHID_ARCH_VER_SHIFT) & ETM_DEVARCH_ARCHID_ARCH_VER_MASK)
> +
> +#define ETM_DEVARCH_ARCHID_ARCH_PART(x)		((x) & 0xfffUL)
> +
> +#define ETM_DEVARCH_MAKE_ARCHID(major)			\
> +	((ETM_DEVARCH_MAKE_ARCHID_ARCH_VER(major)) | ETM_DEVARCH_ARCHID_ARCH_PART(0xA13))
> +
> +#define ETM_DEVARCH_ARCHID_ETMv4x		ETM_DEVARCH_MAKE_ARCHID(0x4)
> +
> +#define ETM_DEVARCH_ID_MASK						\
> +	(ETM_DEVARCH_ARCHITECT_MASK | ETM_DEVARCH_ARCHID_MASK | ETM_DEVARCH_PRESENT)
> +#define ETM_DEVARCH_ETMv4x_ARCH						\
> +	(ETM_DEVARCH_ARCHITECT_ARM | ETM_DEVARCH_ARCHID_ETMv4x | ETM_DEVARCH_PRESENT)
> +
>  #define TRCSTATR_IDLE_BIT		0
>  #define TRCSTATR_PMSTABLE_BIT		1
>  #define ETM_DEFAULT_ADDR_COMP		0
> -- 
> 2.24.1
> 

_______________________________________________
linux-arm-kernel mailing list
[email-masked]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel