The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=deb43dafdcd2805a59e7ce29327279c8357dbe03
commit deb43dafdcd2805a59e7ce29327279c8357dbe03 Author: Andrew Turner <[email protected]> AuthorDate: 2026-09-08 00:00:32 +0000 Commit: Andrew Turner <[email protected]> CommitDate: 2026-09-08 03:05:27 +0000 arm64: Fix the capitalization of CurrentEL Use the same capitalization as the Arm documentation. Reviewed by: Kajetan Puchalski <[email protected]> Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D59180 --- sys/arm64/arm64/locore.S | 4 ++-- sys/arm64/arm64/machdep.c | 6 +++--- sys/arm64/include/armreg.h | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index 7d85b54d4688..20b072912ab9 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -349,8 +349,8 @@ END(mp_cpu_spinloop) */ LENTRY(enter_kernel_el) mrs x23, CurrentEL - and x23, x23, #(CURRENTEL_EL_MASK) - cmp x23, #(CURRENTEL_EL_EL2) + and x23, x23, #(CurrentEL_EL_MASK) + cmp x23, #(CurrentEL_EL_EL2) b.eq 1f /* diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index f35ec7ab2e2e..ebe5f8aee4f9 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -252,15 +252,15 @@ CPU_FEAT(feat_mops, "MOPS", bool has_hyp(void) { - return (boot_el == CURRENTEL_EL_EL2); + return (boot_el == CurrentEL_EL_EL2); } bool in_vhe(void) { /* If we are currently in EL2 then must be in VHE */ - return ((READ_SPECIALREG(CurrentEL) & CURRENTEL_EL_MASK) == - CURRENTEL_EL_EL2); + return ((READ_SPECIALREG(CurrentEL) & CurrentEL_EL_MASK) == + CurrentEL_EL_EL2); } static void diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 207f024774e9..d8d695a39477 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -463,12 +463,12 @@ #define CTR_IminLine_SIZE(reg) (4 << (CTR_IminLine_VAL(reg) >> CTR_IminLine_SHIFT)) /* CurrentEL - Current Exception Level */ -#define CURRENTEL_EL_SHIFT 2 -#define CURRENTEL_EL_MASK (0x3 << CURRENTEL_EL_SHIFT) -#define CURRENTEL_EL_EL0 (0x0 << CURRENTEL_EL_SHIFT) -#define CURRENTEL_EL_EL1 (0x1 << CURRENTEL_EL_SHIFT) -#define CURRENTEL_EL_EL2 (0x2 << CURRENTEL_EL_SHIFT) -#define CURRENTEL_EL_EL3 (0x3 << CURRENTEL_EL_SHIFT) +#define CurrentEL_EL_SHIFT 2 +#define CurrentEL_EL_MASK (0x3 << CurrentEL_EL_SHIFT) +#define CurrentEL_EL_EL0 (0x0 << CurrentEL_EL_SHIFT) +#define CurrentEL_EL_EL1 (0x1 << CurrentEL_EL_SHIFT) +#define CurrentEL_EL_EL2 (0x2 << CurrentEL_EL_SHIFT) +#define CurrentEL_EL_EL3 (0x3 << CurrentEL_EL_SHIFT) /* DAIFSet/DAIFClear */ #define DAIF_D (1 << 3)
