Re: [PATCH 2/4] ppc/pnv: Subclass quad xscom callbacks

[Cédric Le Goater]

On 6/30/23 05:55, Joel Stanley wrote:
> Make the existing pnv_quad_xscom_read/write be P9 specific, in
> preparation for a different P10 callback.
>
> Signed-off-by: Joel Stanley <joel@jms.id.au>


Reviewed-by: Cédric Le Goater <clg@kaod.org>

Thanks,

C.

> ---
>   include/hw/ppc/pnv_core.h | 12 +++++++++++-
>   hw/ppc/pnv.c              | 11 +++++++----
>   hw/ppc/pnv_core.c         | 36 ++++++++++++++++++++++++------------
>   3 files changed, 42 insertions(+), 17 deletions(-)
>
> diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h
> index 3d75706e95da..ab3f6d6c2843 100644
> --- a/include/hw/ppc/pnv_core.h
> +++ b/include/hw/ppc/pnv_core.h
> @@ -60,8 +60,18 @@ static inline PnvCPUState *pnv_cpu_state(PowerPCCPU *cpu)
>       return (PnvCPUState *)cpu->machine_data;
>   }
>   
> +struct PnvQuadClass {
> +    DeviceClass parent_class;
> +
> +    const MemoryRegionOps *xscom_ops;
> +};
> +
>   #define TYPE_PNV_QUAD "powernv-cpu-quad"
> -OBJECT_DECLARE_SIMPLE_TYPE(PnvQuad, PNV_QUAD)
> +
> +#define PNV_QUAD_TYPE_SUFFIX "-" TYPE_PNV_QUAD
> +#define PNV_QUAD_TYPE_NAME(cpu_model) cpu_model PNV_QUAD_TYPE_SUFFIX
> +
> +OBJECT_DECLARE_TYPE(PnvQuad, PnvQuadClass, PNV_QUAD)
>   
>   struct PnvQuad {
>       DeviceState parent_obj;
> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> index fc083173f346..c77fdb6747a4 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -1429,14 +1429,15 @@ static void pnv_chip_power9_instance_init(Object *obj)
>   }
>   
>   static void pnv_chip_quad_realize_one(PnvChip *chip, PnvQuad *eq,
> -                                      PnvCore *pnv_core)
> +                                      PnvCore *pnv_core,
> +                                      const char *type)
>   {
>       char eq_name[32];
>       int core_id = CPU_CORE(pnv_core)->core_id;
>   
>       snprintf(eq_name, sizeof(eq_name), "eq[%d]", core_id);
>       object_initialize_child_with_props(OBJECT(chip), eq_name, eq,
> -                                       sizeof(*eq), TYPE_PNV_QUAD,
> +                                       sizeof(*eq), type,
>                                          &error_fatal, NULL);
>   
>       object_property_set_int(OBJECT(eq), "quad-id", core_id, &error_fatal);
> @@ -1454,7 +1455,8 @@ static void pnv_chip_quad_realize(Pnv9Chip *chip9, Error 
> **errp)
>       for (i = 0; i < chip9->nr_quads; i++) {
>           PnvQuad *eq = &chip9->quads[i];
>   
> -        pnv_chip_quad_realize_one(chip, eq, chip->cores[i * 4]);
> +        pnv_chip_quad_realize_one(chip, eq, chip->cores[i * 4],
> +                                  PNV_QUAD_TYPE_NAME("power9"));
>   
>           pnv_xscom_add_subregion(chip, PNV9_XSCOM_EQ_BASE(eq->quad_id),
>                                   &eq->xscom_regs);
> @@ -1666,7 +1668,8 @@ static void pnv_chip_power10_quad_realize(Pnv10Chip 
> *chip10, Error **errp)
>       for (i = 0; i < chip10->nr_quads; i++) {
>           PnvQuad *eq = &chip10->quads[i];
>   
> -        pnv_chip_quad_realize_one(chip, eq, chip->cores[i * 4]);
> +        pnv_chip_quad_realize_one(chip, eq, chip->cores[i * 4],
> +                                  PNV_QUAD_TYPE_NAME("power9"));
>   
>           pnv_xscom_add_subregion(chip, PNV10_XSCOM_EQ_BASE(eq->quad_id),
>                                   &eq->xscom_regs);
> diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c
> index 0b1c3cccfebc..b9a57463aec4 100644
> --- a/hw/ppc/pnv_core.c
> +++ b/hw/ppc/pnv_core.c
> @@ -407,11 +407,12 @@ static const MemoryRegionOps pnv_quad_power9_xscom_ops = {
>   static void pnv_quad_realize(DeviceState *dev, Error **errp)
>   {
>       PnvQuad *eq = PNV_QUAD(dev);
> +    PnvQuadClass *pqc = PNV_QUAD_GET_CLASS(eq);
>       char name[32];
>   
>       snprintf(name, sizeof(name), "xscom-quad.%d", eq->quad_id);
>       pnv_xscom_region_init(&eq->xscom_regs, OBJECT(dev),
> -                          &pnv_quad_power9_xscom_ops,
> +                          pqc->xscom_ops,
>                             eq, name, PNV9_XSCOM_EQ_SIZE);
>   }
>   
> @@ -420,6 +421,13 @@ static Property pnv_quad_properties[] = {
>       DEFINE_PROP_END_OF_LIST(),
>   };
>   
> +static void pnv_quad_power9_class_init(ObjectClass *oc, void *data)
> +{
> +    PnvQuadClass *pqc = PNV_QUAD_CLASS(oc);
> +
> +    pqc->xscom_ops = &pnv_quad_power9_xscom_ops;
> +}
> +
>   static void pnv_quad_class_init(ObjectClass *oc, void *data)
>   {
>       DeviceClass *dc = DEVICE_CLASS(oc);
> @@ -429,16 +437,20 @@ static void pnv_quad_class_init(ObjectClass *oc, void 
> *data)
>       dc->user_creatable = false;
>   }
>   
> -static const TypeInfo pnv_quad_info = {
> -    .name          = TYPE_PNV_QUAD,
> -    .parent        = TYPE_DEVICE,
> -    .instance_size = sizeof(PnvQuad),
> -    .class_init    = pnv_quad_class_init,
> +static const TypeInfo pnv_quad_infos[] = {
> +    {
> +        .name          = TYPE_PNV_QUAD,
> +        .parent        = TYPE_DEVICE,
> +        .instance_size = sizeof(PnvQuad),
> +        .class_size    = sizeof(PnvQuadClass),
> +        .class_init    = pnv_quad_class_init,
> +        .abstract      = true,
> +    },
> +    {
> +        .parent = TYPE_PNV_QUAD,
> +        .name = PNV_QUAD_TYPE_NAME("power9"),
> +        .class_init = pnv_quad_power9_class_init,
> +    },
>   };
>   
> -static void pnv_core_register_types(void)
> -{
> -    type_register_static(&pnv_quad_info);
> -}
> -
> -type_init(pnv_core_register_types)
> +DEFINE_TYPES(pnv_quad_infos);