[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 23/34] spapr, xics, xive: Move irq claim and free from Spa
From: |
David Gibson |
Subject: |
Re: [PATCH v3 23/34] spapr, xics, xive: Move irq claim and free from SpaprIrq to SpaprInterruptController |
Date: |
Wed, 2 Oct 2019 16:16:36 +1000 |
User-agent: |
Mutt/1.12.1 (2019-06-15) |
On Wed, Oct 02, 2019 at 08:10:33AM +0200, Cédric Le Goater wrote:
> On 02/10/2019 04:51, David Gibson wrote:
> > These methods, like cpu_intc_create, really belong to the interrupt
> > controller, but need to be called on all possible intcs.
> >
> > Like cpu_intc_create, therefore, make them methods on the intc and
> > always call it for all existing intcs.
> >
> > Signed-off-by: David Gibson <address@hidden>
> > ---
> > hw/intc/spapr_xive.c | 71 ++++++++++++-----------
> > hw/intc/xics_spapr.c | 29 ++++++++++
> > hw/ppc/spapr_irq.c | 110 +++++++++++-------------------------
> > include/hw/ppc/spapr_irq.h | 5 +-
> > include/hw/ppc/spapr_xive.h | 2 -
> > 5 files changed, 102 insertions(+), 115 deletions(-)
> >
> > diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c
> > index 9338daba3d..ff1a175b44 100644
> > --- a/hw/intc/spapr_xive.c
> > +++ b/hw/intc/spapr_xive.c
> > @@ -487,6 +487,42 @@ static const VMStateDescription vmstate_spapr_xive = {
> > },
> > };
> >
> > +static int spapr_xive_claim_irq(SpaprInterruptController *intc, int lisn,
> > + bool lsi, Error **errp)
> > +{
> > + SpaprXive *xive = SPAPR_XIVE(intc);
> > + XiveSource *xsrc = &xive->source;
> > +
> > + assert(lisn < xive->nr_irqs);
> > +
> > + if (xive_eas_is_valid(&xive->eat[lisn])) {
> > + error_setg(errp, "IRQ %d is not free", lisn);
> > + return -EBUSY;
> > + }
> > +
> > + /*
> > + * Set default values when allocating an IRQ number
> > + */
> > + xive->eat[lisn].w |= cpu_to_be64(EAS_VALID | EAS_MASKED);
> > + if (lsi) {
> > + xive_source_irq_set_lsi(xsrc, lisn);
> > + }
> > +
> > + if (kvm_irqchip_in_kernel()) {
> > + return kvmppc_xive_source_reset_one(xsrc, lisn, errp);
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static void spapr_xive_free_irq(SpaprInterruptController *intc, int lisn)
> > +{
> > + SpaprXive *xive = SPAPR_XIVE(intc);
> > + assert(lisn < xive->nr_irqs);
> > +
> > + xive->eat[lisn].w &= cpu_to_be64(~EAS_VALID);
> > +}
> > +
> > static Property spapr_xive_properties[] = {
> > DEFINE_PROP_UINT32("nr-irqs", SpaprXive, nr_irqs, 0),
> > DEFINE_PROP_UINT32("nr-ends", SpaprXive, nr_ends, 0),
> > @@ -536,6 +572,8 @@ static void spapr_xive_class_init(ObjectClass *klass,
> > void *data)
> > xrc->get_tctx = spapr_xive_get_tctx;
> >
> > sicc->cpu_intc_create = spapr_xive_cpu_intc_create;
> > + sicc->claim_irq = spapr_xive_claim_irq;
> > + sicc->free_irq = spapr_xive_free_irq;
> > }
> >
> > static const TypeInfo spapr_xive_info = {
> > @@ -557,39 +595,6 @@ static void spapr_xive_register_types(void)
> >
> > type_init(spapr_xive_register_types)
> >
> > -int spapr_xive_irq_claim(SpaprXive *xive, int lisn, bool lsi, Error **errp)
> > -{
> > - XiveSource *xsrc = &xive->source;
> > -
> > - assert(lisn < xive->nr_irqs);
> > -
> > - if (xive_eas_is_valid(&xive->eat[lisn])) {
> > - error_setg(errp, "IRQ %d is not free", lisn);
> > - return -EBUSY;
> > - }
> > -
> > - /*
> > - * Set default values when allocating an IRQ number
> > - */
> > - xive->eat[lisn].w |= cpu_to_be64(EAS_VALID | EAS_MASKED);
> > - if (lsi) {
> > - xive_source_irq_set_lsi(xsrc, lisn);
> > - }
> > -
> > - if (kvm_irqchip_in_kernel()) {
> > - return kvmppc_xive_source_reset_one(xsrc, lisn, errp);
> > - }
> > -
> > - return 0;
> > -}
> > -
> > -void spapr_xive_irq_free(SpaprXive *xive, int lisn)
> > -{
> > - assert(lisn < xive->nr_irqs);
> > -
> > - xive->eat[lisn].w &= cpu_to_be64(~EAS_VALID);
> > -}
> > -
> > /*
> > * XIVE hcalls
> > *
> > diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c
> > index 946311b858..224fe1efcd 100644
> > --- a/hw/intc/xics_spapr.c
> > +++ b/hw/intc/xics_spapr.c
> > @@ -346,6 +346,33 @@ static int
> > xics_spapr_cpu_intc_create(SpaprInterruptController *intc,
> > return 0;
> > }
> >
> > +static int xics_spapr_claim_irq(SpaprInterruptController *intc, int irq,
> > + bool lsi, Error **errp)
> > +{
> > + ICSState *ics = ICS_SPAPR(intc);
> > +
> > + assert(ics);
> > + assert(ics_valid_irq(ics, irq));
> > +
> > + if (!ics_irq_free(ics, irq - ics->offset)) {
> > + error_setg(errp, "IRQ %d is not free", irq);
> > + return -EBUSY;
> > + }
> > +
> > + ics_set_irq_type(ics, irq - ics->offset, lsi);
> > + return 0;
> > +}
> > +
> > +static void xics_spapr_free_irq(SpaprInterruptController *intc, int irq)
> > +{
> > + ICSState *ics = ICS_SPAPR(intc);
> > + uint32_t srcno = irq - ics->offset;
> > +
> > + assert(ics_valid_irq(ics, irq));
> > +
> > + memset(&ics->irqs[srcno], 0, sizeof(ICSIRQState));
> > +}
> > +
> > static void ics_spapr_class_init(ObjectClass *klass, void *data)
> > {
> > DeviceClass *dc = DEVICE_CLASS(klass);
> > @@ -355,6 +382,8 @@ static void ics_spapr_class_init(ObjectClass *klass,
> > void *data)
> > device_class_set_parent_realize(dc, ics_spapr_realize,
> > &isc->parent_realize);
> > sicc->cpu_intc_create = xics_spapr_cpu_intc_create;
> > + sicc->claim_irq = xics_spapr_claim_irq;
> > + sicc->free_irq = xics_spapr_free_irq;
> > }
> >
> > static const TypeInfo ics_spapr_info = {
> > diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> > index 9cb2fc71ca..83882cfad3 100644
> > --- a/hw/ppc/spapr_irq.c
> > +++ b/hw/ppc/spapr_irq.c
> > @@ -98,33 +98,6 @@ static void spapr_irq_init_kvm(SpaprMachineState *spapr,
> > * XICS IRQ backend.
> > */
> >
> > -static int spapr_irq_claim_xics(SpaprMachineState *spapr, int irq, bool
> > lsi,
> > - Error **errp)
> > -{
> > - ICSState *ics = spapr->ics;
> > -
> > - assert(ics);
> > - assert(ics_valid_irq(ics, irq));
> > -
> > - if (!ics_irq_free(ics, irq - ics->offset)) {
> > - error_setg(errp, "IRQ %d is not free", irq);
> > - return -1;
> > - }
> > -
> > - ics_set_irq_type(ics, irq - ics->offset, lsi);
> > - return 0;
> > -}
> > -
> > -static void spapr_irq_free_xics(SpaprMachineState *spapr, int irq)
> > -{
> > - ICSState *ics = spapr->ics;
> > - uint32_t srcno = irq - ics->offset;
> > -
> > - assert(ics_valid_irq(ics, irq));
> > -
> > - memset(&ics->irqs[srcno], 0, sizeof(ICSIRQState));
> > -}
> > -
> > static void spapr_irq_print_info_xics(SpaprMachineState *spapr, Monitor
> > *mon)
> > {
> > CPUState *cs;
> > @@ -182,8 +155,6 @@ SpaprIrq spapr_irq_xics = {
> > .xics = true,
> > .xive = false,
> >
> > - .claim = spapr_irq_claim_xics,
> > - .free = spapr_irq_free_xics,
> > .print_info = spapr_irq_print_info_xics,
> > .dt_populate = spapr_dt_xics,
> > .post_load = spapr_irq_post_load_xics,
> > @@ -196,17 +167,6 @@ SpaprIrq spapr_irq_xics = {
> > * XIVE IRQ backend.
> > */
> >
> > -static int spapr_irq_claim_xive(SpaprMachineState *spapr, int irq, bool
> > lsi,
> > - Error **errp)
> > -{
> > - return spapr_xive_irq_claim(spapr->xive, irq, lsi, errp);
> > -}
> > -
> > -static void spapr_irq_free_xive(SpaprMachineState *spapr, int irq)
> > -{
> > - spapr_xive_irq_free(spapr->xive, irq);
> > -}
> > -
> > static void spapr_irq_print_info_xive(SpaprMachineState *spapr,
> > Monitor *mon)
> > {
> > @@ -272,8 +232,6 @@ SpaprIrq spapr_irq_xive = {
> > .xics = false,
> > .xive = true,
> >
> > - .claim = spapr_irq_claim_xive,
> > - .free = spapr_irq_free_xive,
> > .print_info = spapr_irq_print_info_xive,
> > .dt_populate = spapr_dt_xive,
> > .post_load = spapr_irq_post_load_xive,
> > @@ -301,33 +259,6 @@ static SpaprIrq *spapr_irq_current(SpaprMachineState
> > *spapr)
> > &spapr_irq_xive : &spapr_irq_xics;
> > }
> >
> > -static int spapr_irq_claim_dual(SpaprMachineState *spapr, int irq, bool
> > lsi,
> > - Error **errp)
> > -{
> > - Error *local_err = NULL;
> > - int ret;
> > -
> > - ret = spapr_irq_xics.claim(spapr, irq, lsi, &local_err);
> > - if (local_err) {
> > - error_propagate(errp, local_err);
> > - return ret;
> > - }
> > -
> > - ret = spapr_irq_xive.claim(spapr, irq, lsi, &local_err);
> > - if (local_err) {
> > - error_propagate(errp, local_err);
> > - return ret;
> > - }
> > -
> > - return ret;
> > -}
> > -
> > -static void spapr_irq_free_dual(SpaprMachineState *spapr, int irq)
> > -{
> > - spapr_irq_xics.free(spapr, irq);
> > - spapr_irq_xive.free(spapr, irq);
> > -}
> > -
> > static void spapr_irq_print_info_dual(SpaprMachineState *spapr, Monitor
> > *mon)
> > {
> > spapr_irq_current(spapr)->print_info(spapr, mon);
> > @@ -401,8 +332,6 @@ SpaprIrq spapr_irq_dual = {
> > .xics = true,
> > .xive = true,
> >
> > - .claim = spapr_irq_claim_dual,
> > - .free = spapr_irq_free_dual,
> > .print_info = spapr_irq_print_info_dual,
> > .dt_populate = spapr_irq_dt_populate_dual,
> > .post_load = spapr_irq_post_load_dual,
> > @@ -572,8 +501,11 @@ void spapr_irq_init(SpaprMachineState *spapr, Error
> > **errp)
> >
> > /* Enable the CPU IPIs */
> > for (i = 0; i < nr_servers; ++i) {
> > - if (spapr_xive_irq_claim(spapr->xive, SPAPR_IRQ_IPI + i,
> > - false, errp) < 0) {
> > + SpaprInterruptControllerClass *sicc
> > + = SPAPR_INTC_GET_CLASS(spapr->xive);
> > +
> > + if (sicc->claim_irq(SPAPR_INTC(spapr->xive), SPAPR_IRQ_IPI + i,
> > + false, errp) < 0) {
>
>
> This should be called for Xive only. Why is this using the class
> handler ?
Only to avoid adding another exported function to the headers, when
it's already indirectly exposed via the hook.
--
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
- Re: [PATCH v3 01/34] xics: Minor fixes for XICSFabric interface, (continued)
[PATCH v3 04/34] xics: Eliminate reset hook, David Gibson, 2019/10/01
[PATCH v3 02/34] xics: Eliminate 'reject', 'resend' and 'eoi' class hooks, David Gibson, 2019/10/01
[PATCH v3 07/34] spapr: Fold spapr_phb_lsi_qirq() into its single caller, David Gibson, 2019/10/01
[PATCH v3 06/34] xics: Create sPAPR specific ICS subtype, David Gibson, 2019/10/01
[PATCH v3 21/34] spapr, xics, xive: Introduce SpaprInterruptController QOM interface, David Gibson, 2019/10/01
[PATCH v3 23/34] spapr, xics, xive: Move irq claim and free from SpaprIrq to SpaprInterruptController, David Gibson, 2019/10/01
- Re: [PATCH v3 23/34] spapr, xics, xive: Move irq claim and free from SpaprIrq to SpaprInterruptController, Cédric Le Goater, 2019/10/02
- Re: [PATCH v3 23/34] spapr, xics, xive: Move irq claim and free from SpaprIrq to SpaprInterruptController,
David Gibson <=
- Re: [PATCH v3 23/34] spapr, xics, xive: Move irq claim and free from SpaprIrq to SpaprInterruptController, Greg Kurz, 2019/10/02
- Re: [PATCH v3 23/34] spapr, xics, xive: Move irq claim and free from SpaprIrq to SpaprInterruptController, Cédric Le Goater, 2019/10/02
[PATCH v3 03/34] xics: Rename misleading ics_simple_*() functions, David Gibson, 2019/10/01
[PATCH v3 08/34] spapr: Replace spapr_vio_qirq() helper with spapr_vio_irq_pulse() helper, David Gibson, 2019/10/01
[PATCH v3 11/34] spapr: Fix indexing of XICS irqs, David Gibson, 2019/10/01
[PATCH v3 15/34] spapr: Handle freeing of multiple irqs in frontend only, David Gibson, 2019/10/01
[PATCH v3 05/34] xics: Merge TYPE_ICS_BASE and TYPE_ICS_SIMPLE classes, David Gibson, 2019/10/01