git: 801160f4c0a3 - main - arm64: Rename drop_to_el1 to enter_kernel_el

The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=801160f4c0a3afbd136a1a6402c9ca233dfdc1eb

commit 801160f4c0a3afbd136a1a6402c9ca233dfdc1eb
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-02-15 14:48:54 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-03-18 16:20:51 +0000

    arm64: Rename drop_to_el1 to enter_kernel_el
    
    In the future we may not drop to EL1, e.g. when we support FEAT_VHE
    where the kernel runs in EL2.
    
    Reviewed by:    emaste, imp
    Sponsored by:   Arm Ltd
    Differential Revision:  https://reviews.freebsd.org/D43976
---
 sys/arm64/arm64/locore.S | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S
index 6589d3e35a3a..fd77938edae9 100644
--- a/sys/arm64/arm64/locore.S
+++ b/sys/arm64/arm64/locore.S
@@ -62,8 +62,8 @@
  */
 
 ENTRY(_start)
-	/* Drop to EL1 */
-	bl	drop_to_el1
+	/* Enter the kernel exception level */
+	bl	enter_kernel_el
 
 	/*
 	 * Disable the MMU. We may have entered the kernel with it on and
@@ -201,8 +201,8 @@ ENTRY(mpentry)
 	/* Disable interrupts */
 	msr	daifset, #DAIF_INTR
 
-	/* Drop to EL1 */
-	bl	drop_to_el1
+	/* Enter the kernel exception level */
+	bl	enter_kernel_el
 
 	/* Set the context id */
 	msr	contextidr_el1, xzr
@@ -265,7 +265,7 @@ END(mpentry)
  * If we are started in EL2, configure the required hypervisor
  * registers and drop to EL1.
  */
-LENTRY(drop_to_el1)
+LENTRY(enter_kernel_el)
 	mrs	x23, CurrentEL
 	and	x23, x23, #(CURRENTEL_EL_MASK)
 	cmp	x23, #(CURRENTEL_EL_EL2)
@@ -358,7 +358,7 @@ LENTRY(drop_to_el1)
 	.align 3
 .Lsctlr_res1:
 	.quad SCTLR_RES1
-LEND(drop_to_el1)
+LEND(enter_kernel_el)
 
 /*
  * Get the physical address the kernel was loaded at.