Skip to content

Commit b7c3a6e

Browse files
Anshuman Khandualctmarinas
authored andcommitted
arm64/sysreg: Rename TRBMAR_EL1 fields per auto-gen tools format
This renames TRBMAR_EL1 register fields per auto-gen tools format without causing any functional change in the TRBE driver. Cc: Will Deacon <will@kernel.org> Cc: Marc Zyngier <maz@kernel.org> Cc: Mark Brown <broonie@kernel.org> Cc: Rob Herring <robh@kernel.org> Cc: Suzuki K Poulose <suzuki.poulose@arm.com> Cc: James Morse <james.morse@arm.com> Cc: kvmarm@lists.linux.dev Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com> Link: https://lore.kernel.org/r/20230614065949.146187-6-anshuman.khandual@arm.com Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
1 parent 7bb9488 commit b7c3a6e

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

arch/arm64/include/asm/sysreg.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -263,12 +263,10 @@
263263
#define TRBSR_EL1_BSC_SHIFT 0
264264
#define TRBSR_EL1_FSC_MASK GENMASK(5, 0)
265265
#define TRBSR_EL1_FSC_SHIFT 0
266-
#define TRBMAR_SHARE_MASK GENMASK(1, 0)
267-
#define TRBMAR_SHARE_SHIFT 8
268-
#define TRBMAR_OUTER_MASK GENMASK(3, 0)
269-
#define TRBMAR_OUTER_SHIFT 4
270-
#define TRBMAR_INNER_MASK GENMASK(3, 0)
271-
#define TRBMAR_INNER_SHIFT 0
266+
#define TRBMAR_EL1_SH_MASK GENMASK(9, 8)
267+
#define TRBMAR_EL1_SH_SHIFT 8
268+
#define TRBMAR_EL1_Attr_MASK GENMASK(7, 0)
269+
#define TRBMAR_EL1_Attr_SHIFT 0
272270
#define TRBTRG_TRG_MASK GENMASK(31, 0)
273271
#define TRBTRG_TRG_SHIFT 0
274272
#define TRBIDR_FLAG BIT(5)

0 commit comments

Comments
 (0)