| Message ID | 1401787684-31895-13-git-send-email-aik@ozlabs.ru |
|---|---|
| State | New |
| Headers | show |
On 6/3/2014 4:27 AM, Alexey Kardashevskiy wrote: > This moves PIR/PURR/SPURR SPRs to helpers. Later these helpers will be > called from generalized init_proc_book3s_64(). > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- > target-ppc/translate_init.c | 40 ++++++++++++++++++++++++++-------------- > 1 file changed, 26 insertions(+), 14 deletions(-) > > diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c > index 3445b17..aa88727 100644 > --- a/target-ppc/translate_init.c > +++ b/target-ppc/translate_init.c > @@ -7499,6 +7499,30 @@ static void gen_spr_power5p_lpar(CPUPPCState *env) > KVM_REG_PPC_LPCR, 0x00000000); > } > > +static void gen_spr_book3s_ids(CPUPPCState *env) > +{ > + /* Processor identification */ > + spr_register(env, SPR_PIR, "PIR", > + SPR_NOACCESS, SPR_NOACCESS, > + &spr_read_generic, &spr_write_pir, > + 0x00000000); > +} > + > +static void gen_spr_book3s_purr(CPUPPCState *env) > +{ > +#if !defined(CONFIG_USER_ONLY) > + /* PURR & SPURR: Hack - treat these as aliases for the TB for now */ > + spr_register_kvm(env, SPR_PURR, "PURR", > + &spr_read_purr, SPR_NOACCESS, > + &spr_read_purr, SPR_NOACCESS, > + KVM_REG_PPC_PURR, 0x00000000); > + spr_register_kvm(env, SPR_SPURR, "SPURR", > + &spr_read_purr, SPR_NOACCESS, > + &spr_read_purr, SPR_NOACCESS, > + KVM_REG_PPC_SPURR, 0x00000000); > +#endif > +} > + > static void init_proc_book3s_64(CPUPPCState *env, int version) > { > gen_spr_ne_601(env); > @@ -7712,21 +7736,7 @@ static void init_proc_POWER7 (CPUPPCState *env) > gen_spr_7xx(env); > /* Time base */ > gen_tbl(env); > - /* Processor identification */ > - spr_register(env, SPR_PIR, "PIR", > - SPR_NOACCESS, SPR_NOACCESS, > - &spr_read_generic, &spr_write_pir, > - 0x00000000); > #if !defined(CONFIG_USER_ONLY) > - /* PURR & SPURR: Hack - treat these as aliases for the TB for now */ > - spr_register_kvm(env, SPR_PURR, "PURR", > - &spr_read_purr, SPR_NOACCESS, > - &spr_read_purr, SPR_NOACCESS, > - KVM_REG_PPC_PURR, 0x00000000); > - spr_register_kvm(env, SPR_SPURR, "SPURR", > - &spr_read_purr, SPR_NOACCESS, > - &spr_read_purr, SPR_NOACCESS, > - KVM_REG_PPC_SPURR, 0x00000000); > spr_register(env, SPR_CFAR, "SPR_CFAR", > SPR_NOACCESS, SPR_NOACCESS, > &spr_read_cfar, &spr_write_cfar, > @@ -7748,6 +7758,8 @@ static void init_proc_POWER7 (CPUPPCState *env) > &spr_read_generic, &spr_write_generic, > KVM_REG_PPC_PMC6, 0x00000000); > #endif /* !CONFIG_USER_ONLY */ > + gen_spr_book3s_ids(env); > + gen_spr_book3s_purr(env); > gen_spr_amr(env); > /* XXX : not implemented */ > spr_register(env, SPR_CTRL, "SPR_CTRLT", > Reviewed-by: Tom Musta <tommusta@gmail.com>
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 3445b17..aa88727 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7499,6 +7499,30 @@ static void gen_spr_power5p_lpar(CPUPPCState *env) KVM_REG_PPC_LPCR, 0x00000000); } +static void gen_spr_book3s_ids(CPUPPCState *env) +{ + /* Processor identification */ + spr_register(env, SPR_PIR, "PIR", + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, &spr_write_pir, + 0x00000000); +} + +static void gen_spr_book3s_purr(CPUPPCState *env) +{ +#if !defined(CONFIG_USER_ONLY) + /* PURR & SPURR: Hack - treat these as aliases for the TB for now */ + spr_register_kvm(env, SPR_PURR, "PURR", + &spr_read_purr, SPR_NOACCESS, + &spr_read_purr, SPR_NOACCESS, + KVM_REG_PPC_PURR, 0x00000000); + spr_register_kvm(env, SPR_SPURR, "SPURR", + &spr_read_purr, SPR_NOACCESS, + &spr_read_purr, SPR_NOACCESS, + KVM_REG_PPC_SPURR, 0x00000000); +#endif +} + static void init_proc_book3s_64(CPUPPCState *env, int version) { gen_spr_ne_601(env); @@ -7712,21 +7736,7 @@ static void init_proc_POWER7 (CPUPPCState *env) gen_spr_7xx(env); /* Time base */ gen_tbl(env); - /* Processor identification */ - spr_register(env, SPR_PIR, "PIR", - SPR_NOACCESS, SPR_NOACCESS, - &spr_read_generic, &spr_write_pir, - 0x00000000); #if !defined(CONFIG_USER_ONLY) - /* PURR & SPURR: Hack - treat these as aliases for the TB for now */ - spr_register_kvm(env, SPR_PURR, "PURR", - &spr_read_purr, SPR_NOACCESS, - &spr_read_purr, SPR_NOACCESS, - KVM_REG_PPC_PURR, 0x00000000); - spr_register_kvm(env, SPR_SPURR, "SPURR", - &spr_read_purr, SPR_NOACCESS, - &spr_read_purr, SPR_NOACCESS, - KVM_REG_PPC_SPURR, 0x00000000); spr_register(env, SPR_CFAR, "SPR_CFAR", SPR_NOACCESS, SPR_NOACCESS, &spr_read_cfar, &spr_write_cfar, @@ -7748,6 +7758,8 @@ static void init_proc_POWER7 (CPUPPCState *env) &spr_read_generic, &spr_write_generic, KVM_REG_PPC_PMC6, 0x00000000); #endif /* !CONFIG_USER_ONLY */ + gen_spr_book3s_ids(env); + gen_spr_book3s_purr(env); gen_spr_amr(env); /* XXX : not implemented */ spr_register(env, SPR_CTRL, "SPR_CTRLT",
This moves PIR/PURR/SPURR SPRs to helpers. Later these helpers will be called from generalized init_proc_book3s_64(). Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- target-ppc/translate_init.c | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-)