diff options
| -rw-r--r-- | src/arch/arm/kvm/armv8_cpu.cc | 24 | ||||
| -rw-r--r-- | src/arch/arm/kvm/armv8_cpu.hh | 6 |
2 files changed, 28 insertions, 2 deletions
diff --git a/src/arch/arm/kvm/armv8_cpu.cc b/src/arch/arm/kvm/armv8_cpu.cc index 67e2e465e..48bcc5fe9 100644 --- a/src/arch/arm/kvm/armv8_cpu.cc +++ b/src/arch/arm/kvm/armv8_cpu.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 ARM Limited + * Copyright (c) 2015, 2017 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -65,6 +65,8 @@ static_assert(NUM_QREGS == 32, "Unexpected number of aarch64 vector regs."); #define INT_REG(name) CORE_REG(name, U64) #define SIMD_REG(name) CORE_REG(name, U128) +#define SYS_MPIDR_EL1 ARM64_SYS_REG(0b11, 0b000, 0b0000, 0b0000, 0b101) + constexpr uint64_t kvmXReg(const int num) { @@ -112,6 +114,10 @@ const std::vector<ArmV8KvmCPU::MiscRegInfo> ArmV8KvmCPU::miscRegMap = { MiscRegInfo(INT_REG(fp_regs.fpcr), MISCREG_FPCR, "FPCR"), }; +const std::vector<ArmV8KvmCPU::MiscRegInfo> ArmV8KvmCPU::miscRegIdMap = { + MiscRegInfo(SYS_MPIDR_EL1, MISCREG_MPIDR_EL1, "MPIDR(EL1)"), +}; + ArmV8KvmCPU::ArmV8KvmCPU(ArmV8KvmCPUParams *params) : BaseArmKvmCPU(params) { @@ -122,6 +128,19 @@ ArmV8KvmCPU::~ArmV8KvmCPU() } void +ArmV8KvmCPU::startup() +{ + BaseArmKvmCPU::startup(); + + // Override ID registers that KVM should "inherit" from gem5. + for (const auto &ri : miscRegIdMap) { + const uint64_t value(tc->readMiscReg(ri.idx)); + DPRINTF(KvmContext, " %s := 0x%x\n", ri.name, value); + setOneReg(ri.kvm, value); + } +} + +void ArmV8KvmCPU::dump() const { inform("Integer registers:\n"); @@ -140,6 +159,9 @@ ArmV8KvmCPU::dump() const for (const auto &ri : miscRegMap) inform(" %s: %s\n", ri.name, getAndFormatOneReg(ri.kvm)); + for (const auto &ri : miscRegIdMap) + inform(" %s: %s\n", ri.name, getAndFormatOneReg(ri.kvm)); + for (const auto ® : getRegList()) { const uint64_t arch(reg & KVM_REG_ARCH_MASK); if (arch != KVM_REG_ARM64) { diff --git a/src/arch/arm/kvm/armv8_cpu.hh b/src/arch/arm/kvm/armv8_cpu.hh index d3e390b4f..63e03908f 100644 --- a/src/arch/arm/kvm/armv8_cpu.hh +++ b/src/arch/arm/kvm/armv8_cpu.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 ARM Limited + * Copyright (c) 2015, 2017 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -83,6 +83,8 @@ class ArmV8KvmCPU : public BaseArmKvmCPU ArmV8KvmCPU(ArmV8KvmCPUParams *params); virtual ~ArmV8KvmCPU(); + void startup() override; + void dump() const override; protected: @@ -132,6 +134,8 @@ class ArmV8KvmCPU : public BaseArmKvmCPU static const std::vector<ArmV8KvmCPU::IntRegInfo> intRegMap; /** Mapping between gem5 misc registers registers and registers in kvm */ static const std::vector<ArmV8KvmCPU::MiscRegInfo> miscRegMap; + /** Mapping between gem5 ID misc registers registers and registers in kvm */ + static const std::vector<ArmV8KvmCPU::MiscRegInfo> miscRegIdMap; /** Cached mapping between system registers in kvm and misc regs in gem5 */ mutable std::vector<ArmV8KvmCPU::MiscRegInfo> sysRegMap; |