| Message ID | 20220215214148.1848266-13-farosas@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/ppc: SPR registration cleanups | expand |
On Tue, Feb 15, 2022 at 06:41:33PM -0300, Fabiano Rosas wrote: > Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > target/ppc/cpu_init.c | 17 +++++++---------- > 1 file changed, 7 insertions(+), 10 deletions(-) > > diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c > index cae4ab69fe..c54f10cb48 100644 > --- a/target/ppc/cpu_init.c > +++ b/target/ppc/cpu_init.c > @@ -694,6 +694,12 @@ static void register_604_sprs(CPUPPCState *env) > SPR_NOACCESS, SPR_NOACCESS, > &spr_read_generic, &spr_write_generic, > 0x00000000); > + > + /* Hardware implementation registers */ > + spr_register(env, SPR_HID0, "HID0", > + SPR_NOACCESS, SPR_NOACCESS, > + &spr_read_generic, &spr_write_generic, > + 0x00000000); > } > > /* SPR specific to PowerPC 603 implementation */ > @@ -3811,11 +3817,7 @@ static void init_proc_604(CPUPPCState *env) > register_ne_601_sprs(env); > register_sdr1_sprs(env); > register_604_sprs(env); > - /* Hardware implementation registers */ > - spr_register(env, SPR_HID0, "HID0", > - SPR_NOACCESS, SPR_NOACCESS, > - &spr_read_generic, &spr_write_generic, > - 0x00000000); > + > /* Memory management */ > register_low_BATs(env); > init_excp_604(env); > @@ -3885,11 +3887,6 @@ static void init_proc_604E(CPUPPCState *env) > &spr_read_generic, &spr_write_generic, > 0x00000000); > /* Hardware implementation registers */ > - spr_register(env, SPR_HID0, "HID0", > - SPR_NOACCESS, SPR_NOACCESS, > - &spr_read_generic, &spr_write_generic, > - 0x00000000); > - > spr_register(env, SPR_HID1, "HID1", > SPR_NOACCESS, SPR_NOACCESS, > &spr_read_generic, &spr_write_generic,
diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index cae4ab69fe..c54f10cb48 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -694,6 +694,12 @@ static void register_604_sprs(CPUPPCState *env) SPR_NOACCESS, SPR_NOACCESS, &spr_read_generic, &spr_write_generic, 0x00000000); + + /* Hardware implementation registers */ + spr_register(env, SPR_HID0, "HID0", + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, &spr_write_generic, + 0x00000000); } /* SPR specific to PowerPC 603 implementation */ @@ -3811,11 +3817,7 @@ static void init_proc_604(CPUPPCState *env) register_ne_601_sprs(env); register_sdr1_sprs(env); register_604_sprs(env); - /* Hardware implementation registers */ - spr_register(env, SPR_HID0, "HID0", - SPR_NOACCESS, SPR_NOACCESS, - &spr_read_generic, &spr_write_generic, - 0x00000000); + /* Memory management */ register_low_BATs(env); init_excp_604(env); @@ -3885,11 +3887,6 @@ static void init_proc_604E(CPUPPCState *env) &spr_read_generic, &spr_write_generic, 0x00000000); /* Hardware implementation registers */ - spr_register(env, SPR_HID0, "HID0", - SPR_NOACCESS, SPR_NOACCESS, - &spr_read_generic, &spr_write_generic, - 0x00000000); - spr_register(env, SPR_HID1, "HID1", SPR_NOACCESS, SPR_NOACCESS, &spr_read_generic, &spr_write_generic,
Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> --- target/ppc/cpu_init.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)