Message ID | 20191219073001.26790-5-clg@kaod.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | ppc/pnv: remove the use of qdev_get_machine() and get_system_memory() | expand |
On Thu, 19 Dec 2019 08:29:55 +0100 Cédric Le Goater <clg@kaod.org> wrote: > POWER8 is the only chip using the XICS interface. Add a "xics" link > and a XICSFabric attribute under this chip to remove the use of > qdev_get_machine() > > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > include/hw/ppc/pnv.h | 2 ++ > hw/ppc/pnv.c | 26 ++++++++++++++++++++------ > 2 files changed, 22 insertions(+), 6 deletions(-) > > diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h > index f31180618672..8b957dfb5736 100644 > --- a/include/hw/ppc/pnv.h > +++ b/include/hw/ppc/pnv.h > @@ -74,6 +74,8 @@ typedef struct Pnv8Chip { > Pnv8Psi psi; > PnvOCC occ; > PnvHomer homer; > + > + XICSFabric *xics; > } Pnv8Chip; > > #define TYPE_PNV9_CHIP "pnv9-chip" > diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c > index d6fe5ba13535..6500efba1317 100644 > --- a/hw/ppc/pnv.c > +++ b/hw/ppc/pnv.c > @@ -797,6 +797,13 @@ static void pnv_init(MachineState *machine) > */ > object_property_set_link(chip, OBJECT(sysmem), "system-memory", > &error_abort); > + /* > + * The POWER8 machine use the XICS interrupt interface. > + * Propagate the XICS fabric to the chip and its controllers. > + */ > + if (object_dynamic_cast(OBJECT(pnv), TYPE_XICS_FABRIC)) { > + object_property_set_link(chip, OBJECT(pnv), "xics", &error_abort); > + } > object_property_set_bool(chip, true, "realized", &error_fatal); > } > g_free(chip_typename); > @@ -838,12 +845,12 @@ static uint32_t pnv_chip_core_pir_p8(PnvChip *chip, uint32_t core_id) > static void pnv_chip_power8_intc_create(PnvChip *chip, PowerPCCPU *cpu, > Error **errp) > { > + Pnv8Chip *chip8 = PNV8_CHIP(chip); > Error *local_err = NULL; > Object *obj; > PnvCPUState *pnv_cpu = pnv_cpu_state(cpu); > > - obj = icp_create(OBJECT(cpu), TYPE_PNV_ICP, XICS_FABRIC(qdev_get_machine()), > - &local_err); > + obj = icp_create(OBJECT(cpu), TYPE_PNV_ICP, chip8->xics, &local_err); > if (local_err) { > error_propagate(errp, local_err); > return; > @@ -997,6 +1004,12 @@ static void pnv_chip_power8_instance_init(Object *obj) > { > Pnv8Chip *chip8 = PNV8_CHIP(obj); > > + object_property_add_link(obj, "xics", TYPE_XICS_FABRIC, > + (Object **)&chip8->xics, > + object_property_allow_set_link, > + OBJ_PROP_LINK_STRONG, > + &error_abort); > + > object_initialize_child(obj, "psi", &chip8->psi, sizeof(chip8->psi), > TYPE_PNV8_PSI, &error_abort, NULL); > > @@ -1016,7 +1029,6 @@ static void pnv_chip_icp_realize(Pnv8Chip *chip8, Error **errp) > PnvChipClass *pcc = PNV_CHIP_GET_CLASS(chip); > int i, j; > char *name; > - XICSFabric *xi = XICS_FABRIC(qdev_get_machine()); > > name = g_strdup_printf("icp-%x", chip->chip_id); > memory_region_init(&chip8->icp_mmio, OBJECT(chip), name, PNV_ICP_SIZE); > @@ -1032,7 +1044,7 @@ static void pnv_chip_icp_realize(Pnv8Chip *chip8, Error **errp) > > for (j = 0; j < CPU_CORE(pnv_core)->nr_threads; j++) { > uint32_t pir = pcc->core_pir(chip, core_hwid) + j; > - PnvICPState *icp = PNV_ICP(xics_icp_get(xi, pir)); > + PnvICPState *icp = PNV_ICP(xics_icp_get(chip8->xics, pir)); > > memory_region_add_subregion(&chip8->icp_mmio, pir << 12, > &icp->mmio); > @@ -1048,6 +1060,8 @@ static void pnv_chip_power8_realize(DeviceState *dev, Error **errp) > Pnv8Psi *psi8 = &chip8->psi; > Error *local_err = NULL; > > + assert(chip8->xics); > + > /* XSCOM bridge is first */ > pnv_xscom_realize(chip, PNV_XSCOM_SIZE, &local_err); > if (local_err) { > @@ -1067,8 +1081,8 @@ static void pnv_chip_power8_realize(DeviceState *dev, Error **errp) > "bar", &error_fatal); > object_property_set_link(OBJECT(&chip8->psi), OBJECT(chip->system_memory), > "system-memory", &error_abort); > - object_property_set_link(OBJECT(&chip8->psi), OBJECT(qdev_get_machine()), > - ICS_PROP_XICS, &error_abort); > + object_property_set_link(OBJECT(&chip8->psi), OBJECT(chip8->xics), > + ICS_PROP_XICS, &error_abort); > object_property_set_bool(OBJECT(&chip8->psi), true, "realized", &local_err); > if (local_err) { > error_propagate(errp, local_err);
diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h index f31180618672..8b957dfb5736 100644 --- a/include/hw/ppc/pnv.h +++ b/include/hw/ppc/pnv.h @@ -74,6 +74,8 @@ typedef struct Pnv8Chip { Pnv8Psi psi; PnvOCC occ; PnvHomer homer; + + XICSFabric *xics; } Pnv8Chip; #define TYPE_PNV9_CHIP "pnv9-chip" diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index d6fe5ba13535..6500efba1317 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -797,6 +797,13 @@ static void pnv_init(MachineState *machine) */ object_property_set_link(chip, OBJECT(sysmem), "system-memory", &error_abort); + /* + * The POWER8 machine use the XICS interrupt interface. + * Propagate the XICS fabric to the chip and its controllers. + */ + if (object_dynamic_cast(OBJECT(pnv), TYPE_XICS_FABRIC)) { + object_property_set_link(chip, OBJECT(pnv), "xics", &error_abort); + } object_property_set_bool(chip, true, "realized", &error_fatal); } g_free(chip_typename); @@ -838,12 +845,12 @@ static uint32_t pnv_chip_core_pir_p8(PnvChip *chip, uint32_t core_id) static void pnv_chip_power8_intc_create(PnvChip *chip, PowerPCCPU *cpu, Error **errp) { + Pnv8Chip *chip8 = PNV8_CHIP(chip); Error *local_err = NULL; Object *obj; PnvCPUState *pnv_cpu = pnv_cpu_state(cpu); - obj = icp_create(OBJECT(cpu), TYPE_PNV_ICP, XICS_FABRIC(qdev_get_machine()), - &local_err); + obj = icp_create(OBJECT(cpu), TYPE_PNV_ICP, chip8->xics, &local_err); if (local_err) { error_propagate(errp, local_err); return; @@ -997,6 +1004,12 @@ static void pnv_chip_power8_instance_init(Object *obj) { Pnv8Chip *chip8 = PNV8_CHIP(obj); + object_property_add_link(obj, "xics", TYPE_XICS_FABRIC, + (Object **)&chip8->xics, + object_property_allow_set_link, + OBJ_PROP_LINK_STRONG, + &error_abort); + object_initialize_child(obj, "psi", &chip8->psi, sizeof(chip8->psi), TYPE_PNV8_PSI, &error_abort, NULL); @@ -1016,7 +1029,6 @@ static void pnv_chip_icp_realize(Pnv8Chip *chip8, Error **errp) PnvChipClass *pcc = PNV_CHIP_GET_CLASS(chip); int i, j; char *name; - XICSFabric *xi = XICS_FABRIC(qdev_get_machine()); name = g_strdup_printf("icp-%x", chip->chip_id); memory_region_init(&chip8->icp_mmio, OBJECT(chip), name, PNV_ICP_SIZE); @@ -1032,7 +1044,7 @@ static void pnv_chip_icp_realize(Pnv8Chip *chip8, Error **errp) for (j = 0; j < CPU_CORE(pnv_core)->nr_threads; j++) { uint32_t pir = pcc->core_pir(chip, core_hwid) + j; - PnvICPState *icp = PNV_ICP(xics_icp_get(xi, pir)); + PnvICPState *icp = PNV_ICP(xics_icp_get(chip8->xics, pir)); memory_region_add_subregion(&chip8->icp_mmio, pir << 12, &icp->mmio); @@ -1048,6 +1060,8 @@ static void pnv_chip_power8_realize(DeviceState *dev, Error **errp) Pnv8Psi *psi8 = &chip8->psi; Error *local_err = NULL; + assert(chip8->xics); + /* XSCOM bridge is first */ pnv_xscom_realize(chip, PNV_XSCOM_SIZE, &local_err); if (local_err) { @@ -1067,8 +1081,8 @@ static void pnv_chip_power8_realize(DeviceState *dev, Error **errp) "bar", &error_fatal); object_property_set_link(OBJECT(&chip8->psi), OBJECT(chip->system_memory), "system-memory", &error_abort); - object_property_set_link(OBJECT(&chip8->psi), OBJECT(qdev_get_machine()), - ICS_PROP_XICS, &error_abort); + object_property_set_link(OBJECT(&chip8->psi), OBJECT(chip8->xics), + ICS_PROP_XICS, &error_abort); object_property_set_bool(OBJECT(&chip8->psi), true, "realized", &local_err); if (local_err) { error_propagate(errp, local_err);
POWER8 is the only chip using the XICS interface. Add a "xics" link and a XICSFabric attribute under this chip to remove the use of qdev_get_machine() Signed-off-by: Cédric Le Goater <clg@kaod.org> --- include/hw/ppc/pnv.h | 2 ++ hw/ppc/pnv.c | 26 ++++++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-)