diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-02-08 09:57:17 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-02-09 13:47:11 +0000 |
| commit | e2df464173f0b585adb958a09536eae2cd1dbefd (patch) | |
| tree | 270c0e0c220d7eaa0a0f31a1092caa934e87affb /arch/arm64/kvm/hyp/nvhe/hyp-init.S | |
| parent | 19e87e131915a2389a08874092a82fe5aa0f8952 (diff) | |
| download | linux-stable-e2df464173f0b585adb958a09536eae2cd1dbefd.tar.gz linux-stable-e2df464173f0b585adb958a09536eae2cd1dbefd.tar.bz2 linux-stable-e2df464173f0b585adb958a09536eae2cd1dbefd.zip | |
arm64: Simplify init_el2_state to be non-VHE only
As init_el2_state is now nVHE only, let's simplify it and drop
the VHE setup.
Signed-off-by: Marc Zyngier <maz@kernel.org>
Acked-by: David Brazdil <dbrazdil@google.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20210208095732.3267263-9-maz@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/hyp/nvhe/hyp-init.S')
| -rw-r--r-- | arch/arm64/kvm/hyp/nvhe/hyp-init.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-init.S b/arch/arm64/kvm/hyp/nvhe/hyp-init.S index 31b060a44045..222cfc3e7190 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-init.S +++ b/arch/arm64/kvm/hyp/nvhe/hyp-init.S @@ -189,7 +189,7 @@ SYM_CODE_START_LOCAL(__kvm_hyp_init_cpu) 2: msr SPsel, #1 // We want to use SP_EL{1,2} /* Initialize EL2 CPU state to sane values. */ - init_el2_state nvhe // Clobbers x0..x2 + init_el2_state // Clobbers x0..x2 /* Enable MMU, set vectors and stack. */ mov x0, x28 |