From db598aa4cfc2d1eaaf834e244947af587ebba605 Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Sun, 21 May 2023 12:28:43 +0900 Subject: [PATCH] m1n1.hv: Fix register names Signed-off-by: Hector Martin --- proxyclient/m1n1/hv/__init__.py | 4 ++-- proxyclient/m1n1/sysreg.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proxyclient/m1n1/hv/__init__.py b/proxyclient/m1n1/hv/__init__.py index 5c127be3..4f884d13 100644 --- a/proxyclient/m1n1/hv/__init__.py +++ b/proxyclient/m1n1/hv/__init__.py @@ -1429,9 +1429,9 @@ class HV(Reloadable): self.u.msr(MDSCR_EL1, MDSCR(MDE=1).value) # Enable AMX - amx_ctl = AMX_CTL(self.u.mrs(AMX_CTL_EL1)) + amx_ctl = AMX_CONFIG(self.u.mrs(AMX_CONFIG_EL1)) amx_ctl.EN_EL1 = 1 - self.u.msr(AMX_CTL_EL1, amx_ctl.value) + self.u.msr(AMX_CONFIG_EL1, amx_ctl.value) # Set guest AP keys self.u.msr(VMKEYLO_EL2, 0x4E7672476F6E6147) diff --git a/proxyclient/m1n1/sysreg.py b/proxyclient/m1n1/sysreg.py index 3c082382..fd4a3078 100644 --- a/proxyclient/m1n1/sysreg.py +++ b/proxyclient/m1n1/sysreg.py @@ -291,7 +291,7 @@ class HACR(Register64): TRAP_UPM = 58 TRAP_s3_1z7_c15_cx_3 = 59 -class AMX_CTL(Register64): +class AMX_CONFIG(Register64): EN = 63 EN_EL1 = 62