Skip to content

Commit a6dab6c

Browse files
brooniectmarinas
authored andcommitted
arm64/sme: Drop SYS_ from SMIDR_EL1 defines
We currently have a non-standard SYS_ prefix in the constants generated for SMIDR_EL1 bitfields. Drop this in preparation for automatic register definition generation, no functional change. Signed-off-by: Mark Brown <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent 5b06dcf commit a6dab6c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

arch/arm64/include/asm/el2_setup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
msr_s SYS_SMCR_EL2, x1 // length for EL1.
172172

173173
mrs_s x1, SYS_SMIDR_EL1 // Priority mapping supported?
174-
ubfx x1, x1, #SYS_SMIDR_EL1_SMPS_SHIFT, #1
174+
ubfx x1, x1, #SMIDR_EL1_SMPS_SHIFT, #1
175175
cbz x1, .Lskip_sme_\@
176176

177177
msr_s SYS_SMPRIMAP_EL2, xzr // Make all priorities equal

arch/arm64/include/asm/sysreg.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,9 +467,9 @@
467467
#define SYS_SMIDR_EL1 sys_reg(3, 1, 0, 0, 6)
468468
#define SYS_AIDR_EL1 sys_reg(3, 1, 0, 0, 7)
469469

470-
#define SYS_SMIDR_EL1_IMPLEMENTER_SHIFT 24
471-
#define SYS_SMIDR_EL1_SMPS_SHIFT 15
472-
#define SYS_SMIDR_EL1_AFFINITY_SHIFT 0
470+
#define SMIDR_EL1_IMPLEMENTER_SHIFT 24
471+
#define SMIDR_EL1_SMPS_SHIFT 15
472+
#define SMIDR_EL1_AFFINITY_SHIFT 0
473473

474474
#define SYS_CSSELR_EL1 sys_reg(3, 2, 0, 0, 0)
475475

0 commit comments

Comments
 (0)