Given that CPACR_EL1 is aliased to CPTR_EL2 when running at EL2 with VHE enabled, we can just fall back to SetupExceptionLevel1() instead of fiddling with the init values for CPTR_EL2. While at it, use the existing define to refer to the E2H bit in HCR_EL2. Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
37 lines
1.3 KiB
ArmAsm
37 lines
1.3 KiB
ArmAsm
#========================================================================================
|
|
# Copyright (c) 2011-2017, ARM Limited. All rights reserved.
|
|
#
|
|
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
#
|
|
#=======================================================================================
|
|
|
|
#include <AsmMacroLib.h>
|
|
#include <AArch64/AArch64.h>
|
|
|
|
// Setup EL1 while in EL1
|
|
ASM_FUNC(SetupExceptionLevel1)
|
|
mov x0, #CPACR_DEFAULT
|
|
b ASM_PFX(ArmWriteCpacr) // Tail call
|
|
|
|
// Setup EL2 while in EL2
|
|
ASM_FUNC(SetupExceptionLevel2)
|
|
msr sctlr_el2, xzr
|
|
mrs x0, hcr_el2 // Read EL2 Hypervisor configuration Register
|
|
|
|
// Send all interrupts to their respective Exception levels for EL2
|
|
orr x0, x0, #(1 << 3) // Enable EL2 FIQ
|
|
orr x0, x0, #(1 << 4) // Enable EL2 IRQ
|
|
orr x0, x0, #(1 << 5) // Enable EL2 SError and Abort
|
|
msr hcr_el2, x0 // Write back our settings
|
|
|
|
// Check whether we have been entered with HCR_EL2.E2H set, which is
|
|
// permitted to be RES1. In this case, CPACR_EL1 is aliased to CPTR_EL2.
|
|
tst x0, #ARM_HCR_E2H
|
|
b.ne SetupExceptionLevel1
|
|
|
|
mov x0, #AARCH64_CPTR_DEFAULT
|
|
msr cptr_el2, x0 // Enable architectural features
|
|
ret
|
|
|
|
ASM_FUNCTION_REMOVE_IF_UNREFERENCED
|