Page MenuHomeFreeBSD
Files F170971741

D59180.diff
No OneTemporary
Actions

D59180.diff
View Options

diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S
--- a/sys/arm64/arm64/locore.S
+++ b/sys/arm64/arm64/locore.S
@@ -349,8 +349,8 @@
*/
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
--- a/sys/arm64/arm64/machdep.c
+++ b/sys/arm64/arm64/machdep.c
@@ -252,15 +252,15 @@
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
--- 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)

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 8, 10:48 PM (4 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38064227
Default Alt Text
D59180.diff (1 KB)

Event Timeline