tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-23 21:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

ArmVirtPkg/ArmPlatformLibQemu: Enable early ID map on EL2+VHE

Browse Source 
When booting at EL2, enable VHE if available so that the early ID map
can be enabled as well. This gets rid of any memory accesses (reads or
writes) before the MMU and caches are enabled.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Ard Biesheuvel 2024-11-14 18:30:27 +01:00 committed by mergify[bot]
parent 793f4d2662
commit 47e28a6d44
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ArmVirtPkg/Library/ArmPlatformLibQemu/AArch64/ArmPlatformHelper.S
View File

@ -40,6 +40,9 @@
.set sctlrval, SCTLR_ELx_M | SCTLR_ELx_C | SCTLR_ELx_SA | SCTLR_EL1_ITD | SCTLR_EL1_SED
.set sctlrval, sctlrval | SCTLR_ELx_I | SCTLR_EL1_SPAN | SCTLR_EL1_RES1
.set ID_AA64MMFR1_VH_MASK, 0xf << 8
.set HCR_EL2_E2H, 0x1 << 34
ASM_FUNC(ArmPlatformPeiBootAction)
#ifdef CAVIUM_ERRATUM_27456
@ -58,8 +61,17 @@ ASM_FUNC(ArmPlatformPeiBootAction)
b.eq 0f
#endif
mrs x0, CurrentEL // check current exception level
tbnz x0, #3, 0f // omit early ID map if above EL1
tbz x0, #3, .Learly_idmap // use early ID map if at EL1
mrs x0, id_aa64mmfr1_el1 // otherwise, check for VHE support
tst x0, #ID_AA64MMFR1_VH_MASK
b.eq 0f
mrs x0, hcr_el2 // Enable VHE support
orr x0, x0, #HCR_EL2_E2H
msr hcr_el2, x0
isb
.Learly_idmap:
mov_i x0, mairval
mov_i x1, tcrval
adrp x2, idmap