Message ID | 20250325112319.927190-6-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_SBER 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> > Signed-off-by: Aditya Gupta <adityag@linux.ibm.com> > --- > hw/ppc/pnv_sbe.c | 15 +++++++++++++++ > include/hw/ppc/pnv_sbe.h | 2 ++ > 2 files changed, 17 insertions(+) > > diff --git a/hw/ppc/pnv_sbe.c b/hw/ppc/pnv_sbe.c > index 74cee4eea7ad..12e3914fc9c3 100644 > --- a/hw/ppc/pnv_sbe.c > +++ b/hw/ppc/pnv_sbe.c > @@ -366,6 +366,20 @@ static const TypeInfo pnv_sbe_power10_type_info = { > .name = TYPE_PNV10_SBE, > .parent = TYPE_PNV9_SBE, > .class_init = pnv_sbe_power10_class_init, > + .class_base_init = pnv_sbe_power10_class_init, again why change .class_base_init ? C. > +}; > + > +static void pnv_sbe_power11_class_init(ObjectClass *klass, void *data) > +{ > + DeviceClass *dc = DEVICE_CLASS(klass); > + > + dc->desc = "PowerNV SBE Controller (Power11)"; > +} > + > +static const TypeInfo pnv_sbe_power11_type_info = { > + .name = TYPE_PNV11_SBE, > + .parent = TYPE_PNV10_SBE, > + .class_init = pnv_sbe_power11_class_init, > }; > > static void pnv_sbe_realize(DeviceState *dev, Error **errp) > @@ -409,6 +423,7 @@ static void pnv_sbe_register_types(void) > type_register_static(&pnv_sbe_type_info); > type_register_static(&pnv_sbe_power9_type_info); > type_register_static(&pnv_sbe_power10_type_info); > + type_register_static(&pnv_sbe_power11_type_info); > } > > type_init(pnv_sbe_register_types); > diff --git a/include/hw/ppc/pnv_sbe.h b/include/hw/ppc/pnv_sbe.h > index b6b378ad14c7..09073a1256d6 100644 > --- a/include/hw/ppc/pnv_sbe.h > +++ b/include/hw/ppc/pnv_sbe.h > @@ -29,6 +29,8 @@ OBJECT_DECLARE_TYPE(PnvSBE, PnvSBEClass, PNV_SBE) > DECLARE_INSTANCE_CHECKER(PnvSBE, PNV9_SBE, TYPE_PNV9_SBE) > #define TYPE_PNV10_SBE TYPE_PNV_SBE "-POWER10" > DECLARE_INSTANCE_CHECKER(PnvSBE, PNV10_SBE, TYPE_PNV10_SBE) > +#define TYPE_PNV11_SBE TYPE_PNV_SBE "-POWER11" > +DECLARE_INSTANCE_CHECKER(PnvSBE, PNV11_SBE, TYPE_PNV11_SBE) > > struct PnvSBE { > DeviceState xd;
On 25/03/25 20:08, Cédric Le Goater wrote: > On 3/25/25 12:23, Aditya Gupta wrote: >> <...snip...> >> >> --- a/hw/ppc/pnv_sbe.c >> +++ b/hw/ppc/pnv_sbe.c >> @@ -366,6 +366,20 @@ static const TypeInfo pnv_sbe_power10_type_info = { >> .name = TYPE_PNV10_SBE, >> .parent = TYPE_PNV9_SBE, >> .class_init = pnv_sbe_power10_class_init, >> + .class_base_init = pnv_sbe_power10_class_init, > > again why change .class_base_init ? So that the P11 types which declared P10 types as parent, follow this .class_init. Same reason for the other models. Will consider dropping these models, since same as P10s. Thanks, - Aditya Gupta > > C. >
diff --git a/hw/ppc/pnv_sbe.c b/hw/ppc/pnv_sbe.c index 74cee4eea7ad..12e3914fc9c3 100644 --- a/hw/ppc/pnv_sbe.c +++ b/hw/ppc/pnv_sbe.c @@ -366,6 +366,20 @@ static const TypeInfo pnv_sbe_power10_type_info = { .name = TYPE_PNV10_SBE, .parent = TYPE_PNV9_SBE, .class_init = pnv_sbe_power10_class_init, + .class_base_init = pnv_sbe_power10_class_init, +}; + +static void pnv_sbe_power11_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->desc = "PowerNV SBE Controller (Power11)"; +} + +static const TypeInfo pnv_sbe_power11_type_info = { + .name = TYPE_PNV11_SBE, + .parent = TYPE_PNV10_SBE, + .class_init = pnv_sbe_power11_class_init, }; static void pnv_sbe_realize(DeviceState *dev, Error **errp) @@ -409,6 +423,7 @@ static void pnv_sbe_register_types(void) type_register_static(&pnv_sbe_type_info); type_register_static(&pnv_sbe_power9_type_info); type_register_static(&pnv_sbe_power10_type_info); + type_register_static(&pnv_sbe_power11_type_info); } type_init(pnv_sbe_register_types); diff --git a/include/hw/ppc/pnv_sbe.h b/include/hw/ppc/pnv_sbe.h index b6b378ad14c7..09073a1256d6 100644 --- a/include/hw/ppc/pnv_sbe.h +++ b/include/hw/ppc/pnv_sbe.h @@ -29,6 +29,8 @@ OBJECT_DECLARE_TYPE(PnvSBE, PnvSBEClass, PNV_SBE) DECLARE_INSTANCE_CHECKER(PnvSBE, PNV9_SBE, TYPE_PNV9_SBE) #define TYPE_PNV10_SBE TYPE_PNV_SBE "-POWER10" DECLARE_INSTANCE_CHECKER(PnvSBE, PNV10_SBE, TYPE_PNV10_SBE) +#define TYPE_PNV11_SBE TYPE_PNV_SBE "-POWER11" +DECLARE_INSTANCE_CHECKER(PnvSBE, PNV11_SBE, TYPE_PNV11_SBE) struct PnvSBE { DeviceState xd;