On Thu, Dec 19, 2019 at 07:11:49PM +0100, Cédric Le Goater wrote: > From: Greg Kurz <[email protected]> > > In order to get rid of qdev_get_machine(), first add a pointer to the > XIVE fabric under the XIVE router and make it configurable through a > QOM link property. > > Configure it in the spapr and pnv machine. In the case of pnv, the XIVE > routers are under the chip, so this is done with a QOM alias property of > the POWER9 pnv chip. > > Signed-off-by: Greg Kurz <[email protected]> > Signed-off-by: Cédric Le Goater <[email protected]>
LGTM, but will need rebase.
> ---
> include/hw/ppc/xive.h | 5 +++--
> hw/intc/xive.c | 8 ++++++++
> hw/ppc/pnv.c | 6 ++++++
> hw/ppc/spapr_irq.c | 2 ++
> 4 files changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h
> index 1b7b89098f71..1ded82b1cda8 100644
> --- a/include/hw/ppc/xive.h
> +++ b/include/hw/ppc/xive.h
> @@ -324,9 +324,12 @@ typedef struct XiveTCTX {
> /*
> * XIVE Router
> */
> +typedef struct XiveFabric XiveFabric;
>
> typedef struct XiveRouter {
> SysBusDevice parent;
> +
> + XiveFabric *xfb;
> } XiveRouter;
>
> #define TYPE_XIVE_ROUTER "xive-router"
> @@ -402,8 +405,6 @@ int xive_presenter_tctx_match(XivePresenter *xptr,
> XiveTCTX *tctx,
> * XIVE Fabric (Interface between Interrupt Controller and Machine)
> */
>
> -typedef struct XiveFabric XiveFabric;
> -
> #define TYPE_XIVE_FABRIC "xive-fabric"
> #define XIVE_FABRIC(obj) \
> INTERFACE_CHECK(XiveFabric, (obj), TYPE_XIVE_FABRIC)
> diff --git a/hw/intc/xive.c b/hw/intc/xive.c
> index d4c6e21703b3..6df89b06da38 100644
> --- a/hw/intc/xive.c
> +++ b/hw/intc/xive.c
> @@ -1714,12 +1714,19 @@ void xive_router_notify(XiveNotifier *xn, uint32_t
> lisn)
> xive_get_field64(EAS_END_DATA, eas.w));
> }
>
> +static Property xive_router_properties[] = {
> + DEFINE_PROP_LINK("xive-fabric", XiveRouter, xfb,
> + TYPE_XIVE_FABRIC, XiveFabric *),
> + DEFINE_PROP_END_OF_LIST(),
> +};
> +
> static void xive_router_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> XiveNotifierClass *xnc = XIVE_NOTIFIER_CLASS(klass);
>
> dc->desc = "XIVE Router Engine";
> + dc->props = xive_router_properties;
> xnc->notify = xive_router_notify;
> }
>
> @@ -1727,6 +1734,7 @@ static const TypeInfo xive_router_info = {
> .name = TYPE_XIVE_ROUTER,
> .parent = TYPE_SYS_BUS_DEVICE,
> .abstract = true,
> + .instance_size = sizeof(XiveRouter),
> .class_size = sizeof(XiveRouterClass),
> .class_init = xive_router_class_init,
> .interfaces = (InterfaceInfo[]) {
> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> index 2a1b15a69aed..915c80a24b3e 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -804,6 +804,10 @@ static void pnv_init(MachineState *machine)
> if (object_dynamic_cast(OBJECT(pnv), TYPE_XICS_FABRIC)) {
> object_property_set_link(chip, OBJECT(pnv), "xics",
> &error_abort);
> }
> + if (object_dynamic_cast(OBJECT(pnv), TYPE_XIVE_FABRIC)) {
> + object_property_set_link(chip, OBJECT(pnv), "xive-fabric",
> + &error_abort);
> + }
> object_property_set_bool(chip, true, "realized", &error_fatal);
> }
> g_free(chip_typename);
> @@ -1224,6 +1228,8 @@ static void pnv_chip_power9_instance_init(Object *obj)
>
> object_initialize_child(obj, "xive", &chip9->xive, sizeof(chip9->xive),
> TYPE_PNV_XIVE, &error_abort, NULL);
> + object_property_add_alias(obj, "xive-fabric", OBJECT(&chip9->xive),
> + "xive-fabric", &error_abort);
>
> object_initialize_child(obj, "psi", &chip9->psi, sizeof(chip9->psi),
> TYPE_PNV9_PSI, &error_abort, NULL);
> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> index 07e08d6544a0..2b656649ad6a 100644
> --- a/hw/ppc/spapr_irq.c
> +++ b/hw/ppc/spapr_irq.c
> @@ -340,6 +340,8 @@ void spapr_irq_init(SpaprMachineState *spapr, Error
> **errp)
> * priority
> */
> qdev_prop_set_uint32(dev, "nr-ends", nr_servers << 3);
> + object_property_set_link(OBJECT(dev), OBJECT(spapr), "xive-fabric",
> + &error_abort);
> qdev_init_nofail(dev);
>
> spapr->xive = SPAPR_XIVE(dev);
--
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
signature.asc
Description: PGP signature
