| Message ID | 20220215214148.1848266-23-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:43PM -0300, Fabiano Rosas wrote: > The important part of this function is that it applies to non-embedded > CPUs, not that it also applies to the 601. We removed support for the > 601 anyway, so rename this function. > > Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Although, I wonder if "books_common" or something might be a better name, though. Admittedly, I don't think the "BookS" terminology existed at the time of most of these earlier CPUs. However, these days the majority of 7xx chips are probably in embedded applications, even if they weren't designed for an embedded chip line. > --- > target/ppc/cpu_init.c | 41 ++++++++++++++++++++--------------------- > 1 file changed, 20 insertions(+), 21 deletions(-) > > diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c > index 3e687d0301..621812d079 100644 > --- a/target/ppc/cpu_init.c > +++ b/target/ppc/cpu_init.c > @@ -241,8 +241,7 @@ static void register_generic_sprs(PowerPCCPU *cpu) > 0x00000000); > } > > -/* SPR common to all non-embedded PowerPC, including 601 */ > -static void register_ne_601_sprs(CPUPPCState *env) > +static void register_non_embedded_sprs(CPUPPCState *env) > { > /* Exception processing */ > spr_register_kvm(env, SPR_DSISR, "DSISR", > @@ -3022,7 +3021,7 @@ POWERPC_FAMILY(MPC8xx)(ObjectClass *oc, void *data) > > static void init_proc_G2(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_G2_sprs(env); > > @@ -3732,7 +3731,7 @@ POWERPC_FAMILY(e6500)(ObjectClass *oc, void *data) > /* Non-embedded PowerPC */ > static void init_proc_603(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_603_sprs(env); > > @@ -3872,7 +3871,7 @@ POWERPC_FAMILY(e300)(ObjectClass *oc, void *data) > > static void init_proc_604(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_604_sprs(env); > > @@ -3971,7 +3970,7 @@ POWERPC_FAMILY(604E)(ObjectClass *oc, void *data) > > static void init_proc_740(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_7xx_sprs(env); > /* Thermal management */ > @@ -4027,7 +4026,7 @@ POWERPC_FAMILY(740)(ObjectClass *oc, void *data) > > static void init_proc_750(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_7xx_sprs(env); > > @@ -4092,7 +4091,7 @@ POWERPC_FAMILY(750)(ObjectClass *oc, void *data) > > static void init_proc_750cl(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_7xx_sprs(env); > > @@ -4277,7 +4276,7 @@ POWERPC_FAMILY(750cl)(ObjectClass *oc, void *data) > > static void init_proc_750cx(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_7xx_sprs(env); > > @@ -4345,7 +4344,7 @@ POWERPC_FAMILY(750cx)(ObjectClass *oc, void *data) > > static void init_proc_750fx(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_7xx_sprs(env); > > @@ -4417,7 +4416,7 @@ POWERPC_FAMILY(750fx)(ObjectClass *oc, void *data) > > static void init_proc_750gx(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_7xx_sprs(env); > > @@ -4489,7 +4488,7 @@ POWERPC_FAMILY(750gx)(ObjectClass *oc, void *data) > > static void init_proc_745(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_7xx_sprs(env); > register_755_sprs(env); > @@ -4593,7 +4592,7 @@ POWERPC_FAMILY(755)(ObjectClass *oc, void *data) > > static void init_proc_7400(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_74xx_sprs(env); > vscr_init(env, 0x00010000); > @@ -4665,7 +4664,7 @@ POWERPC_FAMILY(7400)(ObjectClass *oc, void *data) > > static void init_proc_7410(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_74xx_sprs(env); > vscr_init(env, 0x00010000); > @@ -4744,7 +4743,7 @@ POWERPC_FAMILY(7410)(ObjectClass *oc, void *data) > > static void init_proc_7440(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_74xx_sprs(env); > vscr_init(env, 0x00010000); > @@ -4844,7 +4843,7 @@ POWERPC_FAMILY(7440)(ObjectClass *oc, void *data) > > static void init_proc_7450(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_74xx_sprs(env); > vscr_init(env, 0x00010000); > @@ -4966,7 +4965,7 @@ POWERPC_FAMILY(7450)(ObjectClass *oc, void *data) > > static void init_proc_7445(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_74xx_sprs(env); > vscr_init(env, 0x00010000); > @@ -5095,7 +5094,7 @@ POWERPC_FAMILY(7445)(ObjectClass *oc, void *data) > > static void init_proc_7455(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_74xx_sprs(env); > vscr_init(env, 0x00010000); > @@ -5226,7 +5225,7 @@ POWERPC_FAMILY(7455)(ObjectClass *oc, void *data) > > static void init_proc_7457(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_74xx_sprs(env); > vscr_init(env, 0x00010000); > @@ -5377,7 +5376,7 @@ POWERPC_FAMILY(7457)(ObjectClass *oc, void *data) > > static void init_proc_e600(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_sdr1_sprs(env); > register_74xx_sprs(env); > vscr_init(env, 0x00010000); > @@ -6200,7 +6199,7 @@ static void init_tcg_pmu_power8(CPUPPCState *env) > > static void init_proc_book3s_common(CPUPPCState *env) > { > - register_ne_601_sprs(env); > + register_non_embedded_sprs(env); > register_usprg3_sprs(env); > register_book3s_altivec_sprs(env); > register_book3s_pmu_sup_sprs(env);
David Gibson <david@gibson.dropbear.id.au> writes: > On Tue, Feb 15, 2022 at 06:41:43PM -0300, Fabiano Rosas wrote: >> The important part of this function is that it applies to non-embedded >> CPUs, not that it also applies to the 601. We removed support for the >> 601 anyway, so rename this function. >> >> Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> > > Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > > Although, I wonder if "books_common" or something might be a better > name, though. Admittedly, I don't think the "BookS" terminology > existed at the time of most of these earlier CPUs. However, these > days the majority of 7xx chips are probably in embedded applications, > even if they weren't designed for an embedded chip line. The 'ne' in the original name was probably meant to signify not-BookE. So non_booke perhaps would work? The thing with calling it books_common is that we're using BookS only for the 970 and upwards and this function applies to 6xx, 7xx, 74xx as well.
On Wed, Feb 16, 2022 at 10:19:40AM -0300, Fabiano Rosas wrote: > David Gibson <david@gibson.dropbear.id.au> writes: > > > On Tue, Feb 15, 2022 at 06:41:43PM -0300, Fabiano Rosas wrote: > >> The important part of this function is that it applies to non-embedded > >> CPUs, not that it also applies to the 601. We removed support for the > >> 601 anyway, so rename this function. > >> > >> Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> > > > > Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > > > > Although, I wonder if "books_common" or something might be a better > > name, though. Admittedly, I don't think the "BookS" terminology > > existed at the time of most of these earlier CPUs. However, these > > days the majority of 7xx chips are probably in embedded applications, > > even if they weren't designed for an embedded chip line. > > The 'ne' in the original name was probably meant to signify > not-BookE. So non_booke perhaps would work? The thing with calling it > books_common is that we're using BookS only for the 970 and upwards and > this function applies to 6xx, 7xx, 74xx as well. So, an informal server / embedded split is older than the "Book S" vs. "Book E" terminology, so it's a question of whether we want to apply the newer terminology to the older systems. As you say, that's arguably problematic for BookS, but it's equally troublesome for "not BookE": 40x and possibly 44x as well also predate the "Book E" terminology (and certainly don't meet even the earliest version of the Book E spec). However they are from the "embedded" branch of cpu models, and do not have the registers that the ne_601 function creates. Naming things is hard :/.
diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 3e687d0301..621812d079 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -241,8 +241,7 @@ static void register_generic_sprs(PowerPCCPU *cpu) 0x00000000); } -/* SPR common to all non-embedded PowerPC, including 601 */ -static void register_ne_601_sprs(CPUPPCState *env) +static void register_non_embedded_sprs(CPUPPCState *env) { /* Exception processing */ spr_register_kvm(env, SPR_DSISR, "DSISR", @@ -3022,7 +3021,7 @@ POWERPC_FAMILY(MPC8xx)(ObjectClass *oc, void *data) static void init_proc_G2(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_G2_sprs(env); @@ -3732,7 +3731,7 @@ POWERPC_FAMILY(e6500)(ObjectClass *oc, void *data) /* Non-embedded PowerPC */ static void init_proc_603(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_603_sprs(env); @@ -3872,7 +3871,7 @@ POWERPC_FAMILY(e300)(ObjectClass *oc, void *data) static void init_proc_604(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_604_sprs(env); @@ -3971,7 +3970,7 @@ POWERPC_FAMILY(604E)(ObjectClass *oc, void *data) static void init_proc_740(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_7xx_sprs(env); /* Thermal management */ @@ -4027,7 +4026,7 @@ POWERPC_FAMILY(740)(ObjectClass *oc, void *data) static void init_proc_750(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_7xx_sprs(env); @@ -4092,7 +4091,7 @@ POWERPC_FAMILY(750)(ObjectClass *oc, void *data) static void init_proc_750cl(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_7xx_sprs(env); @@ -4277,7 +4276,7 @@ POWERPC_FAMILY(750cl)(ObjectClass *oc, void *data) static void init_proc_750cx(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_7xx_sprs(env); @@ -4345,7 +4344,7 @@ POWERPC_FAMILY(750cx)(ObjectClass *oc, void *data) static void init_proc_750fx(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_7xx_sprs(env); @@ -4417,7 +4416,7 @@ POWERPC_FAMILY(750fx)(ObjectClass *oc, void *data) static void init_proc_750gx(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_7xx_sprs(env); @@ -4489,7 +4488,7 @@ POWERPC_FAMILY(750gx)(ObjectClass *oc, void *data) static void init_proc_745(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_7xx_sprs(env); register_755_sprs(env); @@ -4593,7 +4592,7 @@ POWERPC_FAMILY(755)(ObjectClass *oc, void *data) static void init_proc_7400(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_74xx_sprs(env); vscr_init(env, 0x00010000); @@ -4665,7 +4664,7 @@ POWERPC_FAMILY(7400)(ObjectClass *oc, void *data) static void init_proc_7410(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_74xx_sprs(env); vscr_init(env, 0x00010000); @@ -4744,7 +4743,7 @@ POWERPC_FAMILY(7410)(ObjectClass *oc, void *data) static void init_proc_7440(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_74xx_sprs(env); vscr_init(env, 0x00010000); @@ -4844,7 +4843,7 @@ POWERPC_FAMILY(7440)(ObjectClass *oc, void *data) static void init_proc_7450(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_74xx_sprs(env); vscr_init(env, 0x00010000); @@ -4966,7 +4965,7 @@ POWERPC_FAMILY(7450)(ObjectClass *oc, void *data) static void init_proc_7445(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_74xx_sprs(env); vscr_init(env, 0x00010000); @@ -5095,7 +5094,7 @@ POWERPC_FAMILY(7445)(ObjectClass *oc, void *data) static void init_proc_7455(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_74xx_sprs(env); vscr_init(env, 0x00010000); @@ -5226,7 +5225,7 @@ POWERPC_FAMILY(7455)(ObjectClass *oc, void *data) static void init_proc_7457(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_74xx_sprs(env); vscr_init(env, 0x00010000); @@ -5377,7 +5376,7 @@ POWERPC_FAMILY(7457)(ObjectClass *oc, void *data) static void init_proc_e600(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_sdr1_sprs(env); register_74xx_sprs(env); vscr_init(env, 0x00010000); @@ -6200,7 +6199,7 @@ static void init_tcg_pmu_power8(CPUPPCState *env) static void init_proc_book3s_common(CPUPPCState *env) { - register_ne_601_sprs(env); + register_non_embedded_sprs(env); register_usprg3_sprs(env); register_book3s_altivec_sprs(env); register_book3s_pmu_sup_sprs(env);
The important part of this function is that it applies to non-embedded CPUs, not that it also applies to the 601. We removed support for the 601 anyway, so rename this function. Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> --- target/ppc/cpu_init.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-)