lkml.org 
[lkml]   [2021]   [Aug]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/5] arm64: Directly expand __init_el2_nvhe_prepare_eret where needed
    Date
    As we are about to enable taking exceptions extremely early,
    it becomes pointless to pre-populate SPSR_EL2 in init_el2_state.

    We already have the stuck-in-VHE handling code that needs some
    special casing, so let's bite the bullet and get rid of the macros
    by expanding them where needed.

    Signed-off-by: Marc Zyngier <maz@kernel.org>
    ---
    arch/arm64/include/asm/el2_setup.h | 6 ------
    arch/arm64/kernel/head.S | 2 ++
    2 files changed, 2 insertions(+), 6 deletions(-)

    diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el2_setup.h
    index 21fa330f498d..0b5c8033eaf2 100644
    --- a/arch/arm64/include/asm/el2_setup.h
    +++ b/arch/arm64/include/asm/el2_setup.h
    @@ -164,11 +164,6 @@
    .Lskip_fgt_\@:
    .endm

    -.macro __init_el2_nvhe_prepare_eret
    - mov x0, #INIT_PSTATE_EL1
    - msr spsr_el2, x0
    -.endm
    -
    /**
    * Initialize EL2 registers to sane values. This should be called early on all
    * cores that were booted in EL2. Note that everything gets initialised as
    @@ -189,7 +184,6 @@
    __init_el2_nvhe_cptr
    __init_el2_nvhe_sve
    __init_el2_fgt
    - __init_el2_nvhe_prepare_eret
    .endm

    #endif /* __ARM_KVM_INIT_H__ */
    diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
    index c5c994a73a64..9d5aa56a98cc 100644
    --- a/arch/arm64/kernel/head.S
    +++ b/arch/arm64/kernel/head.S
    @@ -547,6 +547,8 @@ SYM_INNER_LABEL(init_el2, SYM_L_LOCAL)
    mov_q x0, INIT_SCTLR_EL1_MMU_OFF
    msr sctlr_el1, x0

    + mov_q x0, INIT_PSTATE_EL1
    + msr spsr_el2, x0
    msr elr_el2, lr
    mov w0, #BOOT_CPU_MODE_EL2
    eret
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-08-12 21:03    [W:8.529 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site