On Mon, Aug 09, 2021 at 03:45:36PM +0200, Cédric Le Goater wrote: > Signed-off-by: Cédric Le Goater Reviewed-by: David Gibson > --- > include/hw/ppc/pnv.h | 10 ++++++ > include/hw/ppc/pnv_homer.h | 3 ++ > include/hw/ppc/pnv_xscom.h | 3 ++ > hw/ppc/pnv.c | 20 ++++++++++++ > hw/ppc/pnv_homer.c | 64 ++++++++++++++++++++++++++++++++++++++ > 5 files changed, 100 insertions(+) > > diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h > index f44b9947d00e..3ea2d798eed1 100644 > --- a/include/hw/ppc/pnv.h > +++ b/include/hw/ppc/pnv.h > @@ -128,6 +128,7 @@ struct Pnv10Chip { > Pnv9Psi psi; > PnvLpcController lpc; > PnvOCC occ; > + PnvHomer homer; > > uint32_t nr_quads; > PnvQuad *quads; > @@ -358,4 +359,13 @@ void pnv_bmc_set_pnor(IPMIBmc *bmc, PnvPnor *pnor); > #define PNV10_XIVE2_END_SIZE 0x0000020000000000ull > #define PNV10_XIVE2_END_BASE(chip) PNV10_CHIP_BASE(chip, 0x0006060000000000ull) > > +#define PNV10_OCC_COMMON_AREA_SIZE 0x0000000000800000ull > +#define PNV10_OCC_COMMON_AREA_BASE 0x300fff800000ull > +#define PNV10_OCC_SENSOR_BASE(chip) (PNV10_OCC_COMMON_AREA_BASE + \ > + PNV_OCC_SENSOR_DATA_BLOCK_BASE((chip)->chip_id)) > + > +#define PNV10_HOMER_SIZE 0x0000000000400000ull > +#define PNV10_HOMER_BASE(chip) \ > + (0x300ffd800000ll + ((uint64_t)(chip)->chip_id) * PNV10_HOMER_SIZE) > + > #endif /* PPC_PNV_H */ > diff --git a/include/hw/ppc/pnv_homer.h b/include/hw/ppc/pnv_homer.h > index 1889e3083c57..07e8b193116e 100644 > --- a/include/hw/ppc/pnv_homer.h > +++ b/include/hw/ppc/pnv_homer.h > @@ -32,6 +32,9 @@ DECLARE_INSTANCE_CHECKER(PnvHomer, PNV8_HOMER, > #define TYPE_PNV9_HOMER TYPE_PNV_HOMER "-POWER9" > DECLARE_INSTANCE_CHECKER(PnvHomer, PNV9_HOMER, > TYPE_PNV9_HOMER) > +#define TYPE_PNV10_HOMER TYPE_PNV_HOMER "-POWER10" > +DECLARE_INSTANCE_CHECKER(PnvHomer, PNV10_HOMER, > + TYPE_PNV10_HOMER) > > struct PnvHomer { > DeviceState parent; > diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h > index 75db33d46af6..7c7440de0c40 100644 > --- a/include/hw/ppc/pnv_xscom.h > +++ b/include/hw/ppc/pnv_xscom.h > @@ -134,6 +134,9 @@ struct PnvXScomInterfaceClass { > #define PNV10_XSCOM_OCC_BASE PNV9_XSCOM_OCC_BASE > #define PNV10_XSCOM_OCC_SIZE PNV9_XSCOM_OCC_SIZE > > +#define PNV10_XSCOM_PBA_BASE 0x01010CDA > +#define PNV10_XSCOM_PBA_SIZE 0x40 > + > #define PNV10_XSCOM_XIVE2_BASE 0x2010800 > #define PNV10_XSCOM_XIVE2_SIZE 0x400 > > diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c > index 125466023148..2d7eade23ccc 100644 > --- a/hw/ppc/pnv.c > +++ b/hw/ppc/pnv.c > @@ -1614,6 +1614,7 @@ static void pnv_chip_power10_instance_init(Object *obj) > object_initialize_child(obj, "psi", &chip10->psi, TYPE_PNV10_PSI); > object_initialize_child(obj, "lpc", &chip10->lpc, TYPE_PNV10_LPC); > object_initialize_child(obj, "occ", &chip10->occ, TYPE_PNV10_OCC); > + object_initialize_child(obj, "homer", &chip10->homer, TYPE_PNV10_HOMER); > > for (i = 0; i < PNV10_CHIP_MAX_PEC; i++) { > object_initialize_child(obj, "pec[*]", &chip10->pecs[i], > @@ -1797,6 +1798,25 @@ static void pnv_chip_power10_realize(DeviceState *dev, Error **errp) > pnv_xscom_add_subregion(chip, PNV10_XSCOM_OCC_BASE, > &chip10->occ.xscom_regs); > > + /* OCC SRAM model */ > + memory_region_add_subregion(get_system_memory(), > + PNV10_OCC_SENSOR_BASE(chip), > + &chip10->occ.sram_regs); > + > + /* HOMER */ > + object_property_set_link(OBJECT(&chip10->homer), "chip", OBJECT(chip), > + &error_abort); > + if (!qdev_realize(DEVICE(&chip10->homer), NULL, errp)) { > + return; > + } > + /* Homer Xscom region */ > + pnv_xscom_add_subregion(chip, PNV10_XSCOM_PBA_BASE, > + &chip10->homer.pba_regs); > + > + /* Homer mmio region */ > + memory_region_add_subregion(get_system_memory(), PNV10_HOMER_BASE(chip), > + &chip10->homer.regs); > + > /* PHBs */ > pnv_chip_power10_phb_realize(chip, &local_err); > if (local_err) { > diff --git a/hw/ppc/pnv_homer.c b/hw/ppc/pnv_homer.c > index 9a262629b73a..ea73919e54ca 100644 > --- a/hw/ppc/pnv_homer.c > +++ b/hw/ppc/pnv_homer.c > @@ -332,6 +332,69 @@ static const TypeInfo pnv_homer_power9_type_info = { > .class_init = pnv_homer_power9_class_init, > }; > > +static uint64_t pnv_homer_power10_pba_read(void *opaque, hwaddr addr, > + unsigned size) > +{ > + PnvHomer *homer = PNV_HOMER(opaque); > + PnvChip *chip = homer->chip; > + uint32_t reg = addr >> 3; > + uint64_t val = 0; > + > + switch (reg) { > + case PBA_BAR0: > + val = PNV10_HOMER_BASE(chip); > + break; > + case PBA_BARMASK0: /* P10 homer region mask */ > + val = (PNV10_HOMER_SIZE - 1) & 0x300000; > + break; > + case PBA_BAR2: /* P10 occ common area */ > + val = PNV10_OCC_COMMON_AREA_BASE; > + break; > + case PBA_BARMASK2: /* P10 occ common area size */ > + val = (PNV10_OCC_COMMON_AREA_SIZE - 1) & 0x700000; > + break; > + default: > + qemu_log_mask(LOG_UNIMP, "PBA: read to unimplemented register: Ox%" > + HWADDR_PRIx "\n", addr >> 3); > + } > + return val; > +} > + > +static void pnv_homer_power10_pba_write(void *opaque, hwaddr addr, > + uint64_t val, unsigned size) > +{ > + qemu_log_mask(LOG_UNIMP, "PBA: write to unimplemented register: Ox%" > + HWADDR_PRIx "\n", addr >> 3); > +} > + > +static const MemoryRegionOps pnv_homer_power10_pba_ops = { > + .read = pnv_homer_power10_pba_read, > + .write = pnv_homer_power10_pba_write, > + .valid.min_access_size = 8, > + .valid.max_access_size = 8, > + .impl.min_access_size = 8, > + .impl.max_access_size = 8, > + .endianness = DEVICE_BIG_ENDIAN, > +}; > + > +static void pnv_homer_power10_class_init(ObjectClass *klass, void *data) > +{ > + PnvHomerClass *homer = PNV_HOMER_CLASS(klass); > + > + homer->pba_size = PNV10_XSCOM_PBA_SIZE; > + homer->pba_ops = &pnv_homer_power10_pba_ops; > + homer->homer_size = PNV10_HOMER_SIZE; > + homer->homer_ops = &pnv_power9_homer_ops; /* TODO */ > + homer->core_max_base = PNV9_CORE_MAX_BASE; > +} > + > +static const TypeInfo pnv_homer_power10_type_info = { > + .name = TYPE_PNV10_HOMER, > + .parent = TYPE_PNV_HOMER, > + .instance_size = sizeof(PnvHomer), > + .class_init = pnv_homer_power10_class_init, > +}; > + > static void pnv_homer_realize(DeviceState *dev, Error **errp) > { > PnvHomer *homer = PNV_HOMER(dev); > @@ -377,6 +440,7 @@ static void pnv_homer_register_types(void) > type_register_static(&pnv_homer_type_info); > type_register_static(&pnv_homer_power8_type_info); > type_register_static(&pnv_homer_power9_type_info); > + type_register_static(&pnv_homer_power10_type_info); > } > > type_init(pnv_homer_register_types); -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson