Mirrors/m1n1
2
0
Fork 0
mirror of https://github.com/AsahiLinux/m1n1 synced 2024-11-27 00:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

hv.py: Support pointer auth correctly

Browse source 
Signed-off-by: Hector Martin <marcan@marcan.st>
This commit is contained in:
Hector Martin 2021-05-13 21:28:52 +09:00
parent 248011f7a1
commit 7358e79d74
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
proxyclient/hv.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
import sys, traceback, struct, array, bisect import sys, traceback, struct, array, bisect, os
from asm import ARMAsm from asm import ARMAsm
from tgtypes import * from tgtypes import *
@ -47,6 +47,7 @@ class HV:
SPRR_UNK1_EL1: SPRR_UNK1_EL12, SPRR_UNK1_EL1: SPRR_UNK1_EL12,
SPRR_UNK2_EL1: SPRR_UNK2_EL12, SPRR_UNK2_EL1: SPRR_UNK2_EL12,
APCTL_EL1: APCTL_EL12, APCTL_EL1: APCTL_EL12,
APSTS_EL1: APSTS_EL12,
KERNELKEYLO_EL12: KERNELKEYLO_EL12, KERNELKEYLO_EL12: KERNELKEYLO_EL12,
KERNELKEYHI_EL12: KERNELKEYHI_EL12, KERNELKEYHI_EL12: KERNELKEYHI_EL12,
} }
@ -421,8 +422,9 @@ class HV:
hcr.IMO = 0 hcr.IMO = 0
self.u.msr(HCR_EL2, hcr.value) self.u.msr(HCR_EL2, hcr.value)
# Trap dangerous things
hacr = HACR(0) hacr = HACR(0)
hacr.TRAP_CPU_EXT = 1 #hacr.TRAP_CPU_EXT = 1
#hacr.TRAP_SPRR = 1 #hacr.TRAP_SPRR = 1
#hacr.TRAP_GXF = 1 #hacr.TRAP_GXF = 1
hacr.TRAP_CTRR = 1 hacr.TRAP_CTRR = 1
@ -431,10 +433,16 @@ class HV:
hacr.TRAP_ACC = 1 hacr.TRAP_ACC = 1
self.u.msr(HACR_EL2, hacr.value) self.u.msr(HACR_EL2, hacr.value)
# Enable AMX
amx_ctl = AMX_CTL(self.u.mrs(AMX_CTL_EL1)) amx_ctl = AMX_CTL(self.u.mrs(AMX_CTL_EL1))
amx_ctl.EN_EL1 = 1 amx_ctl.EN_EL1 = 1
self.u.msr(AMX_CTL_EL1, amx_ctl.value) self.u.msr(AMX_CTL_EL1, amx_ctl.value)
# Set guest AP keys
self.u.msr(APVMKEYLO_EL2, 0x4E7672476F6E6147)
self.u.msr(APVMKEYHI_EL2, 0x697665596F755570)
self.u.msr(APSTS_EL12, 1)
#self.p.hv_map_vuart(0x2_35200000) #self.p.hv_map_vuart(0x2_35200000)
actlr = ACTLR(self.u.mrs(ACTLR_EL12)) actlr = ACTLR(self.u.mrs(ACTLR_EL12))