On Mon, May 27, 2024 at 05:15:05PM GMT, Cédric Le Goater wrote:
> On 5/27/24 09:10, Aditya Gupta wrote:
> > Power11 core is same as Power10, use the existing functionalities to
> > introduce a Power11 chip and machine, with Power10 chip as parent of
> > Power11 chip, thus going through similar class_init paths
> >
> > Cc: Cédric Le Goater <c...@kaod.org>
> > Cc: Frédéric Barrat <fbar...@linux.ibm.com>
> > Cc: Mahesh J Salgaonkar <mah...@linux.ibm.com>
> > Cc: Madhavan Srinivasan <ma...@linux.ibm.com>
> > Cc: Nicholas Piggin <npig...@gmail.com>
> > Signed-off-by: Aditya Gupta <adit...@linux.ibm.com>
> > ---
> > docs/system/ppc/powernv.rst | 9 +--
> > hw/ppc/pnv.c | 119 ++++++++++++++++++++++++++++++++++--
> > hw/ppc/pnv_core.c | 11 ++++
> > include/hw/ppc/pnv.h | 5 ++
> > include/hw/ppc/pnv_chip.h | 7 +++
> > include/hw/ppc/pnv_core.h | 1 +
> > 6 files changed, 144 insertions(+), 8 deletions(-)
> >
> > diff --git a/docs/system/ppc/powernv.rst b/docs/system/ppc/powernv.rst
> > index 09f39658587d..65606aa767aa 100644
> > --- a/docs/system/ppc/powernv.rst
> > +++ b/docs/system/ppc/powernv.rst
> > @@ -1,5 +1,5 @@
> > -PowerNV family boards (``powernv8``, ``powernv9``, ``powernv10``)
> > -==================================================================
> > +PowerNV family boards (``powernv8``, ``powernv9``, ``powernv10``,
> > ``powernv11``)
> > +================================================================================
> > PowerNV (as Non-Virtualized) is the "bare metal" platform using the
> > OPAL firmware. It runs Linux on IBM and OpenPOWER systems and it can
> > @@ -15,11 +15,12 @@ beyond the scope of what QEMU addresses today.
> > Supported devices
> > -----------------
> > - * Multi processor support for POWER8, POWER8NVL and POWER9.
> > + * Multi processor support for POWER8, POWER8NVL, POWER9, Power10 and
> > Power11.
> > * XSCOM, serial communication sideband bus to configure chiplets.
> > * Simple LPC Controller.
> > * Processor Service Interface (PSI) Controller.
> > - * Interrupt Controller, XICS (POWER8) and XIVE (POWER9) and XIVE2
> > (Power10).
> > + * Interrupt Controller, XICS (POWER8) and XIVE (POWER9) and XIVE2
> > (Power10 &
> > + Power11).
> > * POWER8 PHB3 PCIe Host bridge and POWER9 PHB4 PCIe Host bridge.
> > * Simple OCC is an on-chip micro-controller used for power management
> > tasks.
> > * iBT device to handle BMC communication, with the internal BMC simulator
> > diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> > index 6e3a5ccdec76..939163f91784 100644
> > --- a/hw/ppc/pnv.c
> > +++ b/hw/ppc/pnv.c
> > @@ -456,6 +456,33 @@ static void pnv_chip_power10_dt_populate(PnvChip
> > *chip, void *fdt)
> > pnv_dt_lpc(chip, fdt, 0, PNV10_LPCM_BASE(chip), PNV10_LPCM_SIZE);
> > }
> > +static void pnv_chip_power11_dt_populate(PnvChip *chip, void *fdt)
> > +{
> > + static const char compat[] = "ibm,power11-xscom\0ibm,xscom";
> > + int i;
> > +
> > + pnv_dt_xscom(chip, fdt, 0,
> > + cpu_to_be64(PNV10_XSCOM_BASE(chip)),
> > + cpu_to_be64(PNV10_XSCOM_SIZE),
> > + compat, sizeof(compat));
> > +
> > + for (i = 0; i < chip->nr_cores; i++) {
> > + PnvCore *pnv_core = chip->cores[i];
> > + int offset;
> > +
> > + offset = pnv_dt_core(chip, pnv_core, fdt);
> > +
> > + _FDT((fdt_setprop(fdt, offset, "ibm,pa-features",
> > + pa_features_31, sizeof(pa_features_31))));
> > + }
> > +
> > + if (chip->ram_size) {
> > + pnv_dt_memory(fdt, chip->chip_id, chip->ram_start, chip->ram_size);
> > + }
> > +
> > + pnv_dt_lpc(chip, fdt, 0, PNV10_LPCM_BASE(chip), PNV10_LPCM_SIZE);
> > +}
> > +
> > static void pnv_dt_rtc(ISADevice *d, void *fdt, int lpc_off)
> > {
> > uint32_t io_base = d->ioport_id;
> > @@ -1288,6 +1315,8 @@ static void pnv_chip_power10_intc_print_info(PnvChip
> > *chip, PowerPCCPU *cpu,
> > #define POWER10_CORE_MASK (0xffffffffffffffull)
> > +#define POWER11_CORE_MASK (0xffffffffffffffull)
> > +
> > static void pnv_chip_power8_instance_init(Object *obj)
> > {
> > Pnv8Chip *chip8 = PNV8_CHIP(obj);
> > @@ -1831,7 +1860,8 @@ static void pnv_chip_power10_instance_init(Object
> > *obj)
> > }
> > }
> > -static void pnv_chip_power10_quad_realize(Pnv10Chip *chip10, Error **errp)
> > +static void pnv_chip_power10_quad_realize(Pnv10Chip *chip10, Error **errp,
> > + const char *cpu_model)
> > {
> > PnvChip *chip = PNV_CHIP(chip10);
> > int i;
> > @@ -1843,7 +1873,7 @@ static void pnv_chip_power10_quad_realize(Pnv10Chip
> > *chip10, Error **errp)
> > PnvQuad *eq = &chip10->quads[i];
> > pnv_chip_quad_realize_one(chip, eq, chip->cores[i * 4],
> > - PNV_QUAD_TYPE_NAME("power10"));
> > + PNV_QUAD_TYPE_NAME_DYN(cpu_model));
> > pnv_xscom_add_subregion(chip, PNV10_XSCOM_EQ_BASE(eq->quad_id),
> > &eq->xscom_regs);
> > @@ -1881,7 +1911,8 @@ static void pnv_chip_power10_phb_realize(PnvChip
> > *chip, Error **errp)
> > }
> > }
> > -static void pnv_chip_power10_realize(DeviceState *dev, Error **errp)
> > +static void pnv_chip_power10_common_realize(DeviceState *dev, Error **errp,
> > + const char *cpu_model)
> > {
> > PnvChipClass *pcc = PNV_CHIP_GET_CLASS(dev);
> > PnvChip *chip = PNV_CHIP(dev);
> > @@ -1898,7 +1929,7 @@ static void pnv_chip_power10_realize(DeviceState
> > *dev, Error **errp)
> > return;
> > }
> > - pnv_chip_power10_quad_realize(chip10, &local_err);
> > + pnv_chip_power10_quad_realize(chip10, &local_err, cpu_model);
> > if (local_err) {
> > error_propagate(errp, local_err);
> > return;
> > @@ -2046,6 +2077,16 @@ static void pnv_chip_power10_realize(DeviceState
> > *dev, Error **errp)
> > }
> > +static void pnv_chip_power10_realize(DeviceState *dev, Error **errp)
> > +{
> > + pnv_chip_power10_common_realize(dev, errp, "power10");
> > +}
> > +
> > +static void pnv_chip_power11_realize(DeviceState *dev, Error **errp)
> > +{
> > + pnv_chip_power10_common_realize(dev, errp, "power11");
> > +}
> > +
> > static void pnv_rainier_i2c_init(PnvMachineState *pnv)
> > {
> > int i;
> > @@ -2111,6 +2152,34 @@ static void pnv_chip_power10_class_init(ObjectClass
> > *klass, void *data)
> > &k->parent_realize);
> > }
> > +static void pnv_chip_power11_class_init(ObjectClass *klass, void *data)
> > +{
> > + DeviceClass *dc = DEVICE_CLASS(klass);
> > + PnvChipClass *k = PNV_CHIP_CLASS(klass);
> > +
> > + static const int i2c_ports_per_engine[PNV10_CHIP_MAX_I2C] = {14, 14,
> > 2, 16};
> > +
> > + k->chip_cfam_id = 0x220da04980000000ull; /* P11 DD2.0 (with NX) */
> > + k->cores_mask = POWER11_CORE_MASK;
> > + k->chip_pir = pnv_chip_pir_p10;
> > + k->intc_create = pnv_chip_power10_intc_create;
> > + k->intc_reset = pnv_chip_power10_intc_reset;
> > + k->intc_destroy = pnv_chip_power10_intc_destroy;
> > + k->intc_print_info = pnv_chip_power10_intc_print_info;
> > + k->isa_create = pnv_chip_power10_isa_create;
> > + k->dt_populate = pnv_chip_power11_dt_populate;
> > + k->pic_print_info = pnv_chip_power10_pic_print_info;
> > + k->xscom_core_base = pnv_chip_power10_xscom_core_base;
> > + k->xscom_pcba = pnv_chip_power10_xscom_pcba;
> > + dc->desc = "PowerNV Chip POWER11";
> > + k->num_pecs = PNV10_CHIP_MAX_PEC;
> > + k->i2c_num_engines = PNV10_CHIP_MAX_I2C;
> > + k->i2c_ports_per_engine = i2c_ports_per_engine;
> > +
> > + device_class_set_parent_realize(dc, pnv_chip_power11_realize,
> > + &k->parent_realize);
> > +}
> > +
> > static void pnv_chip_core_sanitize(PnvChip *chip, Error **errp)
> > {
> > PnvChipClass *pcc = PNV_CHIP_GET_CLASS(chip);
> > @@ -2505,6 +2574,22 @@ static void
> > pnv_machine_p10_rainier_class_init(ObjectClass *oc, void *data)
> > pmc->i2c_init = pnv_rainier_i2c_init;
> > }
> > +static void pnv_machine_power11_class_init(ObjectClass *oc, void *data)
> > +{
> > + MachineClass *mc = MACHINE_CLASS(oc);
> > + PnvMachineClass *pmc = PNV_MACHINE_CLASS(oc);
> > + static const char compat[] = "qemu,powernv11\0ibm,powernv";
> > +
> > + /* do power10_class_init as p11 core is same as p10 */
> > + pnv_machine_p10_common_class_init(oc, data);
> > +
> > + mc->desc = "IBM PowerNV (Non-Virtualized) POWER11";
> > + mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power11_v2.0");
> > +
> > + pmc->compat = compat;
> > + pmc->compat_size = sizeof(compat);
> > +}
> > +
> > static bool pnv_machine_get_hb(Object *obj, Error **errp)
> > {
> > PnvMachineState *pnv = PNV_MACHINE(obj);
> > @@ -2608,7 +2693,23 @@ static void pnv_machine_class_init(ObjectClass *oc,
> > void *data)
> > .parent = TYPE_PNV10_CHIP, \
> > }
> > +#define DEFINE_PNV11_CHIP_TYPE(type, class_initfn) \
> > + { \
> > + .name = type, \
> > + .class_init = class_initfn, \
> > + .parent = TYPE_PNV11_CHIP, \
> > + }
> > +
> > static const TypeInfo types[] = {
> > + {
> > + .name = MACHINE_TYPE_NAME("powernv11"),
> > + .parent = TYPE_PNV_MACHINE,
> > + .class_init = pnv_machine_power11_class_init,
> > + .interfaces = (InterfaceInfo[]) {
> > + { TYPE_XIVE_FABRIC },
> > + { },
> > + },
> > + },
> > {
> > .name = MACHINE_TYPE_NAME("powernv10-rainier"),
> > .parent = MACHINE_TYPE_NAME("powernv10"),
> > @@ -2663,6 +2764,16 @@ static const TypeInfo types[] = {
> > .abstract = true,
> > },
> > + /*
> > + * P11 chip and variants
> > + */
> > + {
> > + .name = TYPE_PNV11_CHIP,
> > + .parent = TYPE_PNV10_CHIP,
> > + .instance_size = sizeof(Pnv11Chip),
> > + },
> > + DEFINE_PNV11_CHIP_TYPE(TYPE_PNV_CHIP_POWER11,
> > pnv_chip_power11_class_init),
> > +
> > /*
> > * P10 chip and variants
> > */
> > diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c
> > index f40ab721d6fc..87c2e7ce2084 100644
> > --- a/hw/ppc/pnv_core.c
> > +++ b/hw/ppc/pnv_core.c
> > @@ -372,6 +372,11 @@ static void pnv_core_power10_class_init(ObjectClass
> > *oc, void *data)
> > pcc->xscom_size = PNV10_XSCOM_EC_SIZE;
> > }
> > +static void pnv_core_power11_class_init(ObjectClass *oc, void *data)
> > +{
> > + pnv_core_power10_class_init(oc, data);
> > +}
> > +
> > static void pnv_core_class_init(ObjectClass *oc, void *data)
> > {
> > DeviceClass *dc = DEVICE_CLASS(oc);
> > @@ -403,6 +408,7 @@ static const TypeInfo pnv_core_infos[] = {
> > DEFINE_PNV_CORE_TYPE(power8, "power8nvl_v1.0"),
> > DEFINE_PNV_CORE_TYPE(power9, "power9_v2.2"),
> > DEFINE_PNV_CORE_TYPE(power10, "power10_v2.0"),
> > + DEFINE_PNV_CORE_TYPE(power11, "power11_v2.0"),
> > };
> > DEFINE_TYPES(pnv_core_infos)
> > @@ -634,6 +640,11 @@ static const TypeInfo pnv_quad_infos[] = {
> > .name = PNV_QUAD_TYPE_NAME("power10"),
> > .class_init = pnv_quad_power10_class_init,
> > },
> > + {
> > + .parent = PNV_QUAD_TYPE_NAME("power10"),
> > + .name = PNV_QUAD_TYPE_NAME("power11"),
> > + .class_init = pnv_quad_power10_class_init,
> > + },
> > };
> > DEFINE_TYPES(pnv_quad_infos);
> > diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h
> > index 476b13614640..386aab0478d3 100644
> > --- a/include/hw/ppc/pnv.h
> > +++ b/include/hw/ppc/pnv.h
> > @@ -33,6 +33,7 @@ typedef struct PnvChip PnvChip;
> > typedef struct Pnv8Chip Pnv8Chip;
> > typedef struct Pnv9Chip Pnv9Chip;
> > typedef struct Pnv10Chip Pnv10Chip;
> > +typedef struct Pnv10Chip Pnv11Chip;
> > #define PNV_CHIP_TYPE_SUFFIX "-" TYPE_PNV_CHIP
> > #define PNV_CHIP_TYPE_NAME(cpu_model) cpu_model PNV_CHIP_TYPE_SUFFIX
> > @@ -57,6 +58,10 @@ DECLARE_INSTANCE_CHECKER(PnvChip, PNV_CHIP_POWER9,
> > DECLARE_INSTANCE_CHECKER(PnvChip, PNV_CHIP_POWER10,
> > TYPE_PNV_CHIP_POWER10)
> > +#define TYPE_PNV_CHIP_POWER11 PNV_CHIP_TYPE_NAME("power11_v2.0")
> > +DECLARE_INSTANCE_CHECKER(PnvChip, PNV_CHIP_POWER11,
> > + TYPE_PNV_CHIP_POWER11)
> > +
> > PnvCore *pnv_chip_find_core(PnvChip *chip, uint32_t core_id);
> > PowerPCCPU *pnv_chip_find_cpu(PnvChip *chip, uint32_t pir);
> > diff --git a/include/hw/ppc/pnv_chip.h b/include/hw/ppc/pnv_chip.h
> > index 8589f3291ed3..3aefef051995 100644
> > --- a/include/hw/ppc/pnv_chip.h
> > +++ b/include/hw/ppc/pnv_chip.h
> > @@ -132,6 +132,13 @@ struct Pnv10Chip {
> > #define PNV10_PIR2FUSEDCORE(pir) (((pir) >> 3) & 0xf)
> > #define PNV10_PIR2CHIP(pir) (((pir) >> 8) & 0x7f)
> > +#define TYPE_PNV11_CHIP "pnv11-chip"
> > +DECLARE_INSTANCE_CHECKER(Pnv11Chip, PNV11_CHIP,
> > + TYPE_PNV11_CHIP)
> > +
> > +/* Power11 core is same as Power10 */
> > +typedef struct Pnv10Chip Pnv11Chip;
> > +
> > struct PnvChipClass {
> > /*< private >*/
> > SysBusDeviceClass parent_class;
> > diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h
> > index c6d62fd14593..9e9a305061d0 100644
> > --- a/include/hw/ppc/pnv_core.h
> > +++ b/include/hw/ppc/pnv_core.h
> > @@ -76,6 +76,7 @@ struct PnvQuadClass {
> > #define PNV_QUAD_TYPE_SUFFIX "-" TYPE_PNV_QUAD
> > #define PNV_QUAD_TYPE_NAME(cpu_model) cpu_model PNV_QUAD_TYPE_SUFFIX
> > +#define PNV_QUAD_TYPE_NAME_DYN(cpu) g_strconcat(cpu, PNV_QUAD_TYPE_SUFFIX,
> > NULL)
>
> This is a leak. Please fix in pnv_chip_power10_quad_realize() using a
> g_autofree variable maybe.
Sure, thanks Cedric.
Will post a v4 soon with this fixed.
Thanks,
Aditya Gupta
>
> The rest looks good.
>
>
> Thanks,
>
> C.
>
> > OBJECT_DECLARE_TYPE(PnvQuad, PnvQuadClass, PNV_QUAD)
>
>
