Message ID | 1401787684-31895-6-git-send-email-aik@ozlabs.ru |
---|---|
State | New |
Headers | show |
On 6/3/2014 4:27 AM, Alexey Kardashevskiy wrote: > Since we started adding "POWER" prefix to 64bit PMU SPRs, let's finish > the transition and fix MMCRA and define a hypv version of it. > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> I'm still not a fan of "SPR_POWER_*" since these are now in the ISA (the "_POWER_" seems redundant). Aside from that ... Reviewed-by: Tom Musta <tommusta@gmail.com>
On 06/04/2014 02:35 AM, Tom Musta wrote: > On 6/3/2014 4:27 AM, Alexey Kardashevskiy wrote: >> Since we started adding "POWER" prefix to 64bit PMU SPRs, let's finish >> the transition and fix MMCRA and define a hypv version of it. >> >> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> > > I'm still not a fan of "SPR_POWER_*" since these are now in the ISA (the "_POWER_" seems redundant). And I am still a fan of having specific name in a macro if there is chance that SPR with the same name can have different numbers on different platforms :) Alex, judge please :) > Aside from that ... > > Reviewed-by: Tom Musta <tommusta@gmail.com> Yup, thanks, putting it into my git tree to have them all in v5!
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 781e4fa..21eec1b 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 1192a8f..f7fe549 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7705,7 +7705,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);
Since we started adding "POWER" prefix to 64bit PMU SPRs, let's finish the transition and fix MMCRA and define a hypv version of it. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- target-ppc/cpu.h | 3 ++- target-ppc/translate_init.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)