Rahul Thakur has submitted this change and it was merged. (
https://gem5-review.googlesource.com/2261 )
Change subject: arm, kvm: enable running 32-bit Guest under ARM KVM64
......................................................................
arm, kvm: enable running 32-bit Guest under ARM KVM64
1) Pass KVM_ARM_VCPU_EL1_32BIT to kvmArmVCpuInit
when running 32-bit OS
2) Correctly map 64-bit registers to banked 32-bit ones
Change-Id: I1dec6427d6f5c3bba599ccdd804f1dfe80d3e670
Reviewed-on: https://gem5-review.googlesource.com/2261
Maintainer: Rahul Thakur <rjtha...@google.com>
Reviewed-by: Andreas Sandberg <andreas.sandb...@arm.com>
---
M src/arch/arm/kvm/armv8_cpu.cc
M src/arch/arm/kvm/base_cpu.cc
2 files changed, 10 insertions(+), 1 deletion(-)
Approvals:
Andreas Sandberg: Looks good to me, approved
Rahul Thakur: Looks good to me, approved
diff --git a/src/arch/arm/kvm/armv8_cpu.cc b/src/arch/arm/kvm/armv8_cpu.cc
index 08b9011..67e2e46 100644
--- a/src/arch/arm/kvm/armv8_cpu.cc
+++ b/src/arch/arm/kvm/armv8_cpu.cc
@@ -268,7 +268,13 @@
for (int i = 0; i < NUM_XREGS; ++i) {
const auto value(getOneRegU64(kvmXReg(i)));
DPRINTF(KvmContext, " X%i := 0x%x\n", i, value);
- tc->setIntReg(INTREG_X0 + i, value);
+ // KVM64 returns registers in 64-bit layout. If we are in aarch32
+ // mode, we need to map these to banked ARM32 registers.
+ if (inAArch64(tc)) {
+ tc->setIntReg(INTREG_X0 + i, value);
+ } else {
+ tc->setIntRegFlat(IntReg64Map[INTREG_X0 + i], value);
+ }
}
for (const auto &ri : intRegMap) {
diff --git a/src/arch/arm/kvm/base_cpu.cc b/src/arch/arm/kvm/base_cpu.cc
index e511fd6..e25112c 100644
--- a/src/arch/arm/kvm/base_cpu.cc
+++ b/src/arch/arm/kvm/base_cpu.cc
@@ -79,6 +79,9 @@
memset(&target_config, 0, sizeof(target_config));
vm.kvmArmPreferredTarget(target_config);
+ if (!((ArmSystem *)system)->highestELIs64()) {
+ target_config.features[0] |= (1 << KVM_ARM_VCPU_EL1_32BIT);
+ }
kvmArmVCpuInit(target_config);
}
--
To view, visit https://gem5-review.googlesource.com/2261
To unsubscribe, visit https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I1dec6427d6f5c3bba599ccdd804f1dfe80d3e670
Gerrit-Change-Number: 2261
Gerrit-PatchSet: 4
Gerrit-Owner: Rahul Thakur <rjtha...@google.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Rahul Thakur <rjtha...@google.com>
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
