lkml.org 
[lkml]   [2021]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v7 09/23] arm64: Move SCTLR_EL1 initialisation to EL-agnostic code
    Date
    We can now move the initial SCTLR_EL1 setup to be used for both
    EL1 and EL2 setup.

    Signed-off-by: Marc Zyngier <maz@kernel.org>
    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
    Acked-by: David Brazdil <dbrazdil@google.com>
    ---
    arch/arm64/kernel/head.S | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
    index 36212c05df42..b425d2587cdb 100644
    --- a/arch/arm64/kernel/head.S
    +++ b/arch/arm64/kernel/head.S
    @@ -479,13 +479,14 @@ EXPORT_SYMBOL(kimage_vaddr)
    * booted in EL1 or EL2 respectively.
    */
    SYM_FUNC_START(init_kernel_el)
    + mov_q x0, INIT_SCTLR_EL1_MMU_OFF
    + msr sctlr_el1, x0
    +
    mrs x0, CurrentEL
    cmp x0, #CurrentEL_EL2
    b.eq init_el2

    SYM_INNER_LABEL(init_el1, SYM_L_LOCAL)
    - mov_q x0, INIT_SCTLR_EL1_MMU_OFF
    - msr sctlr_el1, x0
    isb
    mov_q x0, INIT_PSTATE_EL1
    msr spsr_el1, x0
    @@ -494,9 +495,6 @@ SYM_INNER_LABEL(init_el1, SYM_L_LOCAL)
    eret

    SYM_INNER_LABEL(init_el2, SYM_L_LOCAL)
    - mov_q x0, INIT_SCTLR_EL1_MMU_OFF
    - msr sctlr_el1, x0
    -
    mov_q x0, HCR_HOST_NVHE_FLAGS
    msr hcr_el2, x0
    isb
    --
    2.29.2
    \
     
     \ /
      Last update: 2021-02-08 11:11    [W:10.000 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site