Skip to content

Commit 90cdde8

Browse files
Anshuman Khandualctmarinas
authored andcommitted
arm64/sysreg: Rename TRBBASER_EL1 fields per auto-gen tools format
This renames TRBBASER_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-4-anshuman.khandual@arm.com Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
1 parent e01e173 commit 90cdde8

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

arch/arm64/include/asm/sysreg.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@
248248
#define TRBLIMITR_EL1_E BIT(0)
249249
#define TRBPTR_EL1_PTR_MASK GENMASK_ULL(63, 0)
250250
#define TRBPTR_EL1_PTR_SHIFT 0
251-
#define TRBBASER_BASE_MASK GENMASK_ULL(51, 0)
252-
#define TRBBASER_BASE_SHIFT 12
251+
#define TRBBASER_EL1_BASE_MASK GENMASK_ULL(63, 12)
252+
#define TRBBASER_EL1_BASE_SHIFT 12
253253
#define TRBSR_EC_MASK GENMASK(5, 0)
254254
#define TRBSR_EC_SHIFT 26
255255
#define TRBSR_IRQ BIT(22)

drivers/hwtracing/coresight/coresight-trbe.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ static inline unsigned long get_trbe_limit_pointer(void)
131131
static inline unsigned long get_trbe_base_pointer(void)
132132
{
133133
u64 trbbaser = read_sysreg_s(SYS_TRBBASER_EL1);
134-
unsigned long addr = trbbaser & (TRBBASER_BASE_MASK << TRBBASER_BASE_SHIFT);
134+
unsigned long addr = trbbaser & TRBBASER_EL1_BASE_MASK;
135135

136136
WARN_ON(!IS_ALIGNED(addr, PAGE_SIZE));
137137
return addr;
@@ -140,7 +140,7 @@ static inline unsigned long get_trbe_base_pointer(void)
140140
static inline void set_trbe_base_pointer(unsigned long addr)
141141
{
142142
WARN_ON(is_trbe_enabled());
143-
WARN_ON(!IS_ALIGNED(addr, (1UL << TRBBASER_BASE_SHIFT)));
143+
WARN_ON(!IS_ALIGNED(addr, (1UL << TRBBASER_EL1_BASE_SHIFT)));
144144
WARN_ON(!IS_ALIGNED(addr, PAGE_SIZE));
145145
write_sysreg_s(addr, SYS_TRBBASER_EL1);
146146
}

0 commit comments

Comments
 (0)