On Mon, May 13, 2019 at 10:42:43AM +0200, Cédric Le Goater wrote: > Add a check to make sure that the routine initializing the emulated > IRQ device is called once. We don't have much to test on the XICS > side, so we introduce a 'init' boolean under ICSState. > > Signed-off-by: Cédric Le Goater <c...@kaod.org>
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au> I'm not entirely sure it's the best way to accomplish what we need, but it will do for now. > --- > > Changes since v3: > > - introduced a 'init' boolean under ICSState > > include/hw/ppc/xics.h | 1 + > hw/intc/spapr_xive.c | 9 +++++++++ > hw/intc/xics_spapr.c | 7 +++++++ > 3 files changed, 17 insertions(+) > > diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h > index eb65ad7e43b7..d6f8e4c4c282 100644 > --- a/include/hw/ppc/xics.h > +++ b/include/hw/ppc/xics.h > @@ -119,6 +119,7 @@ struct ICSState { > uint32_t offset; > ICSIRQState *irqs; > XICSFabric *xics; > + bool init; /* sPAPR ICS device initialized */ > }; > > #define ICS_PROP_XICS "xics" > diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c > index 246b21ae7f31..1e649d6cdbe1 100644 > --- a/hw/intc/spapr_xive.c > +++ b/hw/intc/spapr_xive.c > @@ -338,6 +338,15 @@ void spapr_xive_init(SpaprXive *xive, Error **errp) > XiveSource *xsrc = &xive->source; > XiveENDSource *end_xsrc = &xive->end_source; > > + /* > + * The emulated XIVE device can only be initialized once. If the > + * ESB memory region has been already mapped, it means we have been > + * through there. > + */ > + if (memory_region_is_mapped(&xsrc->esb_mmio)) { > + return; > + } > + > /* TIMA initialization */ > memory_region_init_io(&xive->tm_mmio, OBJECT(xive), &xive_tm_ops, xive, > "xive.tima", 4ull << TM_SHIFT); > diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c > index 9d2b8adef7c5..5a1835e8b1ed 100644 > --- a/hw/intc/xics_spapr.c > +++ b/hw/intc/xics_spapr.c > @@ -239,6 +239,13 @@ static void rtas_int_on(PowerPCCPU *cpu, > SpaprMachineState *spapr, > > void xics_spapr_init(SpaprMachineState *spapr) > { > + /* Emulated mode can only be initialized once. */ > + if (spapr->ics->init) { > + return; > + } > + > + spapr->ics->init = true; > + > /* Registration of global state belongs into realize */ > spapr_rtas_register(RTAS_IBM_SET_XIVE, "ibm,set-xive", rtas_set_xive); > spapr_rtas_register(RTAS_IBM_GET_XIVE, "ibm,get-xive", rtas_get_xive); -- 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