Since we started adding "POWER" prefix to 64bit PMU SPRs, let's finish the transition and fix MMCRA and define a supermode version of it.
Signed-off-by: Alexey Kardashevskiy <a...@ozlabs.ru> Reviewed-by: Tom Musta <tommu...@gmail.com> --- target-ppc/cpu.h | 3 ++- target-ppc/translate_init.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 8e01db4..0cbae7c 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -1466,7 +1466,7 @@ static inline int cpu_mmu_index (CPUPPCState *env) #define SPR_PERF2 (0x302) #define SPR_RCPU_MI_RBA2 (0x302) #define SPR_MPC_MI_AP (0x302) -#define SPR_MMCRA (0x302) +#define SPR_POWER_UMMCRA (0x302) #define SPR_PERF3 (0x303) #define SPR_RCPU_MI_RBA3 (0x303) #define SPR_MPC_MI_EPN (0x303) @@ -1509,6 +1509,7 @@ static inline int cpu_mmu_index (CPUPPCState *env) #define SPR_UPERF0 (0x310) #define SPR_UPERF1 (0x311) #define SPR_UPERF2 (0x312) +#define SPR_POWER_MMCRA (0X312) #define SPR_UPERF3 (0x313) #define SPR_POWER_PMC1 (0X313) #define SPR_UPERF4 (0x314) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index def4074..11db6e7 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7712,7 +7712,7 @@ static void init_proc_POWER7 (CPUPPCState *env) SPR_NOACCESS, SPR_NOACCESS, &spr_read_generic, &spr_write_generic, KVM_REG_PPC_DSCR, 0x00000000); - spr_register_kvm(env, SPR_MMCRA, "SPR_MMCRA", + spr_register_kvm(env, SPR_POWER_MMCRA, "SPR_MMCRA", SPR_NOACCESS, SPR_NOACCESS, &spr_read_generic, &spr_write_generic, KVM_REG_PPC_MMCRA, 0x00000000); -- 2.0.0