| Message ID | 20250325112319.927190-5-adityag@linux.ibm.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Power11 support for QEMU [PowerNV] | expand |
On 3/25/25 12:23, Aditya Gupta wrote: > Power11 core is same as Power10, reuse PNV10_PSI initialisation, by > declaring 'PNV11_PSI' as child class of 'PNV10_PSI' > > Cc: Cédric Le Goater <clg@kaod.org> > Cc: Frédéric Barrat <fbarrat@linux.ibm.com> > Cc: Mahesh J Salgaonkar <mahesh@linux.ibm.com> > Cc: Madhavan Srinivasan <maddy@linux.ibm.com> > Cc: Nicholas Piggin <npiggin@gmail.com> > Reviewed-by: Cédric Le Goater <clg@kaod.org> I am removing this Rb. > Signed-off-by: Aditya Gupta <adityag@linux.ibm.com> > --- > hw/ppc/pnv_psi.c | 24 ++++++++++++++++++++++++ > include/hw/ppc/pnv_psi.h | 2 +- > 2 files changed, 25 insertions(+), 1 deletion(-) > > diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c > index 1fe11dde501b..c568edb80e53 100644 > --- a/hw/ppc/pnv_psi.c > +++ b/hw/ppc/pnv_psi.c > @@ -937,6 +937,29 @@ static const TypeInfo pnv_psi_power10_info = { > .name = TYPE_PNV10_PSI, > .parent = TYPE_PNV9_PSI, > .class_init = pnv_psi_power10_class_init, > + .class_base_init = pnv_psi_power10_class_init, why change class_base_init ? Thanks, C. > +}; > + > +static void pnv_psi_power11_class_init(ObjectClass *klass, void *data) > +{ > + DeviceClass *dc = DEVICE_CLASS(klass); > + PnvPsiClass *ppc = PNV_PSI_CLASS(klass); > + static const char compat[] = "ibm,power11-psihb-x\0ibm,psihb-x"; > + > + dc->desc = "PowerNV PSI Controller (Power11)"; > + > + /* > + * ppc->xscom_pbca and ppc->xscom_size will be set up by > + * pnv_psi_power10_class_init > + */ > + ppc->compat = compat; > + ppc->compat_size = sizeof(compat); > +} > + > +static const TypeInfo pnv_psi_power11_info = { > + .name = TYPE_PNV11_PSI, > + .parent = TYPE_PNV10_PSI, > + .class_init = pnv_psi_power11_class_init, > }; > > static void pnv_psi_class_init(ObjectClass *klass, void *data) > @@ -971,6 +994,7 @@ static void pnv_psi_register_types(void) > type_register_static(&pnv_psi_power8_info); > type_register_static(&pnv_psi_power9_info); > type_register_static(&pnv_psi_power10_info); > + type_register_static(&pnv_psi_power11_info); > } > > type_init(pnv_psi_register_types); > diff --git a/include/hw/ppc/pnv_psi.h b/include/hw/ppc/pnv_psi.h > index cf7f95a6b1f5..1182ed47d280 100644 > --- a/include/hw/ppc/pnv_psi.h > +++ b/include/hw/ppc/pnv_psi.h > @@ -69,7 +69,7 @@ struct Pnv9Psi { > }; > > #define TYPE_PNV10_PSI TYPE_PNV_PSI "-POWER10" > - > +#define TYPE_PNV11_PSI TYPE_PNV_PSI "-POWER11" > > struct PnvPsiClass { > SysBusDeviceClass parent_class;
On 25/03/25 20:08, Cédric Le Goater wrote: > On 3/25/25 12:23, Aditya Gupta wrote: >> Power11 core is same as Power10, reuse PNV10_PSI initialisation, by >> declaring 'PNV11_PSI' as child class of 'PNV10_PSI' >> >> Cc: Cédric Le Goater <clg@kaod.org> >> Cc: Frédéric Barrat <fbarrat@linux.ibm.com> >> Cc: Mahesh J Salgaonkar <mahesh@linux.ibm.com> >> Cc: Madhavan Srinivasan <maddy@linux.ibm.com> >> Cc: Nicholas Piggin <npiggin@gmail.com> >> Reviewed-by: Cédric Le Goater <clg@kaod.org> > > I am removing this Rb. Got it, I will take care in v7. > >> <...snip...> >> >> @@ -937,6 +937,29 @@ static const TypeInfo pnv_psi_power10_info = { >> .name = TYPE_PNV10_PSI, >> .parent = TYPE_PNV9_PSI, >> .class_init = pnv_psi_power10_class_init, >> + .class_base_init = pnv_psi_power10_class_init, > > why change class_base_init ? This was since I was keeping the P10 types as child of P11. And for them to follow the same init, I found the .class_base_init to be a good option. Based on your suggestion on Homer patch, I am thinking to drop these patches and just use p10 models. Thanks, - Aditya Gupta > > Thanks, > > C.
diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c index 1fe11dde501b..c568edb80e53 100644 --- a/hw/ppc/pnv_psi.c +++ b/hw/ppc/pnv_psi.c @@ -937,6 +937,29 @@ static const TypeInfo pnv_psi_power10_info = { .name = TYPE_PNV10_PSI, .parent = TYPE_PNV9_PSI, .class_init = pnv_psi_power10_class_init, + .class_base_init = pnv_psi_power10_class_init, +}; + +static void pnv_psi_power11_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + PnvPsiClass *ppc = PNV_PSI_CLASS(klass); + static const char compat[] = "ibm,power11-psihb-x\0ibm,psihb-x"; + + dc->desc = "PowerNV PSI Controller (Power11)"; + + /* + * ppc->xscom_pbca and ppc->xscom_size will be set up by + * pnv_psi_power10_class_init + */ + ppc->compat = compat; + ppc->compat_size = sizeof(compat); +} + +static const TypeInfo pnv_psi_power11_info = { + .name = TYPE_PNV11_PSI, + .parent = TYPE_PNV10_PSI, + .class_init = pnv_psi_power11_class_init, }; static void pnv_psi_class_init(ObjectClass *klass, void *data) @@ -971,6 +994,7 @@ static void pnv_psi_register_types(void) type_register_static(&pnv_psi_power8_info); type_register_static(&pnv_psi_power9_info); type_register_static(&pnv_psi_power10_info); + type_register_static(&pnv_psi_power11_info); } type_init(pnv_psi_register_types); diff --git a/include/hw/ppc/pnv_psi.h b/include/hw/ppc/pnv_psi.h index cf7f95a6b1f5..1182ed47d280 100644 --- a/include/hw/ppc/pnv_psi.h +++ b/include/hw/ppc/pnv_psi.h @@ -69,7 +69,7 @@ struct Pnv9Psi { }; #define TYPE_PNV10_PSI TYPE_PNV_PSI "-POWER10" - +#define TYPE_PNV11_PSI TYPE_PNV_PSI "-POWER11" struct PnvPsiClass { SysBusDeviceClass parent_class;