Commit cf0c7f18 authored by James Clark's avatar James Clark Committed by Mathieu Poirier
Browse files

coresight: etm4x: Cleanup TRCIDR2 register accesses 



This is a no-op change for style and consistency and has no effect on
the binary output by the compiler. In sysreg.h fields are defined as
the register name followed by the field name and then _MASK. This
allows for grepping for fields by name rather than using magic numbers.

Signed-off-by: default avatarJames Clark <james.clark@arm.com>
Reviewed-by: default avatarMike Leach <mike.leach@linaro.org>
Link: https://lore.kernel.org/r/20220304171913.2292458-3-james.clark@arm.com


Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent e601cc9a

drivers/hwtracing/coresight/coresight-etm4x-core.c

+3 −3
Original line number Diff line number Diff line
@@ -1116,11 +1116,11 @@ static void etm4_init_arch_data(void *info) 
	/* maximum size of resources */

	etmidr2 = etm4x_relaxed_read32(csa, TRCIDR2);

	/* CIDSIZE, bits[9:5] Indicates the Context ID size */

	drvdata->ctxid_size = BMVAL(etmidr2, 5, 9);

	drvdata->ctxid_size = FIELD_GET(TRCIDR2_CIDSIZE_MASK, etmidr2);

	/* VMIDSIZE, bits[14:10] Indicates the VMID size */

	drvdata->vmid_size = BMVAL(etmidr2, 10, 14);

	drvdata->vmid_size = FIELD_GET(TRCIDR2_VMIDSIZE_MASK, etmidr2);

	/* CCSIZE, bits[28:25] size of the cycle counter in bits minus 12 */

	drvdata->ccsize = BMVAL(etmidr2, 25, 28);

	drvdata->ccsize = FIELD_GET(TRCIDR2_CCSIZE_MASK, etmidr2);



	etmidr3 = etm4x_relaxed_read32(csa, TRCIDR3);

	/* CCITMIN, bits[11:0] minimum threshold value that can be programmed */

drivers/hwtracing/coresight/coresight-etm4x.h

+4 −0
Original line number Diff line number Diff line
@@ -143,6 +143,10 @@ 
#define TRCIDR0_QSUPP_MASK			GENMASK(16, 15)

#define TRCIDR0_TSSIZE_MASK			GENMASK(28, 24)



#define TRCIDR2_CIDSIZE_MASK			GENMASK(9, 5)

#define TRCIDR2_VMIDSIZE_MASK			GENMASK(14, 10)

#define TRCIDR2_CCSIZE_MASK			GENMASK(28, 25)



/*

 * System instructions to access ETM registers.

 * See ETMv4.4 spec ARM IHI0064F section 4.3.6 System instructions