sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

arm, kvm: enable running 32-bit Guest under ARM KVM64

Browse source 
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 <rjthakur@google.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
This commit is contained in:
Rahul Thakur 2017-03-01 10:27:05 -08:00
parent 0fc9dcf46b
commit ceb3bd9733
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/arch/arm/kvm/armv8_cpu.cc
View file

@ -268,7 +268,13 @@ ArmV8KvmCPU::updateThreadContext()
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) {

3
src/arch/arm/kvm/base_cpu.cc
View file

@ -79,6 +79,9 @@ BaseArmKvmCPU::startup()
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);
}