| Message ID | 20190925064534.19155-11-david@gibson.dropbear.id.au |
|---|---|
| State | New |
| Headers | show |
| Series | spapr: IRQ subsystem cleanups | expand |
On 25/09/2019 08:45, David Gibson wrote: > The only reason this parameter was needed was to work around the > inconsistent meaning of nr_irqs between xics and xive. Now that we've > fixed that, we can consistently use the number directly in the SpaprIrq > configuration. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Cédric Le Goater <clg@kaod.org> > --- > hw/ppc/spapr_irq.c | 21 ++++++++++----------- > include/hw/ppc/spapr_irq.h | 2 +- > 2 files changed, 11 insertions(+), 12 deletions(-) > > diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c > index 5190a33e08..300c65be3a 100644 > --- a/hw/ppc/spapr_irq.c > +++ b/hw/ppc/spapr_irq.c > @@ -92,8 +92,7 @@ static void spapr_irq_init_kvm(SpaprMachineState *spapr, > * XICS IRQ backend. > */ > > -static void spapr_irq_init_xics(SpaprMachineState *spapr, int nr_xirqs, > - Error **errp) > +static void spapr_irq_init_xics(SpaprMachineState *spapr, Error **errp) > { > Object *obj; > Error *local_err = NULL; > @@ -102,7 +101,8 @@ static void spapr_irq_init_xics(SpaprMachineState *spapr, int nr_xirqs, > object_property_add_child(OBJECT(spapr), "ics", obj, &error_abort); > object_property_add_const_link(obj, ICS_PROP_XICS, OBJECT(spapr), > &error_fatal); > - object_property_set_int(obj, nr_xirqs, "nr-irqs", &error_fatal); > + object_property_set_int(obj, spapr->irq->nr_xirqs, > + "nr-irqs", &error_fatal); > object_property_set_bool(obj, true, "realized", &local_err); > if (local_err) { > error_propagate(errp, local_err); > @@ -256,15 +256,15 @@ SpaprIrq spapr_irq_xics = { > /* > * XIVE IRQ backend. > */ > -static void spapr_irq_init_xive(SpaprMachineState *spapr, int nr_xirqs, > - Error **errp) > +static void spapr_irq_init_xive(SpaprMachineState *spapr, Error **errp) > { > uint32_t nr_servers = spapr_max_server_number(spapr); > DeviceState *dev; > int i; > > dev = qdev_create(NULL, TYPE_SPAPR_XIVE); > - qdev_prop_set_uint32(dev, "nr-irqs", nr_xirqs + SPAPR_XIRQ_BASE); > + qdev_prop_set_uint32(dev, "nr-irqs", > + spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE); > /* > * 8 XIVE END structures per CPU. One for each available priority > */ > @@ -443,18 +443,17 @@ static SpaprIrq *spapr_irq_current(SpaprMachineState *spapr) > &spapr_irq_xive : &spapr_irq_xics; > } > > -static void spapr_irq_init_dual(SpaprMachineState *spapr, int nr_xirqs, > - Error **errp) > +static void spapr_irq_init_dual(SpaprMachineState *spapr, Error **errp) > { > Error *local_err = NULL; > > - spapr_irq_xics.init(spapr, spapr_irq_xics.nr_xirqs, &local_err); > + spapr_irq_xics.init(spapr, &local_err); > if (local_err) { > error_propagate(errp, local_err); > return; > } > > - spapr_irq_xive.init(spapr, spapr_irq_xive.nr_xirqs, &local_err); > + spapr_irq_xive.init(spapr, &local_err); > if (local_err) { > error_propagate(errp, local_err); > return; > @@ -683,7 +682,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp) > spapr_irq_msi_init(spapr, spapr->irq->nr_msis); > } > > - spapr->irq->init(spapr, spapr->irq->nr_xirqs, errp); > + spapr->irq->init(spapr, errp); > > spapr->qirqs = qemu_allocate_irqs(spapr->irq->set_irq, spapr, > spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE); > diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h > index a8f9a2ab11..7e26288fcd 100644 > --- a/include/hw/ppc/spapr_irq.h > +++ b/include/hw/ppc/spapr_irq.h > @@ -41,7 +41,7 @@ typedef struct SpaprIrq { > uint32_t nr_msis; > uint8_t ov5; > > - void (*init)(SpaprMachineState *spapr, int nr_irqs, Error **errp); > + void (*init)(SpaprMachineState *spapr, Error **errp); > int (*claim)(SpaprMachineState *spapr, int irq, bool lsi, Error **errp); > void (*free)(SpaprMachineState *spapr, int irq, int num); > qemu_irq (*qirq)(SpaprMachineState *spapr, int irq); >
On Wed, 25 Sep 2019 16:45:24 +1000 David Gibson <david@gibson.dropbear.id.au> wrote: > The only reason this parameter was needed was to work around the > inconsistent meaning of nr_irqs between xics and xive. Now that we've > fixed that, we can consistently use the number directly in the SpaprIrq > configuration. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > hw/ppc/spapr_irq.c | 21 ++++++++++----------- > include/hw/ppc/spapr_irq.h | 2 +- > 2 files changed, 11 insertions(+), 12 deletions(-) > > diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c > index 5190a33e08..300c65be3a 100644 > --- a/hw/ppc/spapr_irq.c > +++ b/hw/ppc/spapr_irq.c > @@ -92,8 +92,7 @@ static void spapr_irq_init_kvm(SpaprMachineState *spapr, > * XICS IRQ backend. > */ > > -static void spapr_irq_init_xics(SpaprMachineState *spapr, int nr_xirqs, > - Error **errp) > +static void spapr_irq_init_xics(SpaprMachineState *spapr, Error **errp) > { > Object *obj; > Error *local_err = NULL; > @@ -102,7 +101,8 @@ static void spapr_irq_init_xics(SpaprMachineState *spapr, int nr_xirqs, > object_property_add_child(OBJECT(spapr), "ics", obj, &error_abort); > object_property_add_const_link(obj, ICS_PROP_XICS, OBJECT(spapr), > &error_fatal); > - object_property_set_int(obj, nr_xirqs, "nr-irqs", &error_fatal); > + object_property_set_int(obj, spapr->irq->nr_xirqs, > + "nr-irqs", &error_fatal); > object_property_set_bool(obj, true, "realized", &local_err); > if (local_err) { > error_propagate(errp, local_err); > @@ -256,15 +256,15 @@ SpaprIrq spapr_irq_xics = { > /* > * XIVE IRQ backend. > */ > -static void spapr_irq_init_xive(SpaprMachineState *spapr, int nr_xirqs, > - Error **errp) > +static void spapr_irq_init_xive(SpaprMachineState *spapr, Error **errp) > { > uint32_t nr_servers = spapr_max_server_number(spapr); > DeviceState *dev; > int i; > > dev = qdev_create(NULL, TYPE_SPAPR_XIVE); > - qdev_prop_set_uint32(dev, "nr-irqs", nr_xirqs + SPAPR_XIRQ_BASE); > + qdev_prop_set_uint32(dev, "nr-irqs", > + spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE); > /* > * 8 XIVE END structures per CPU. One for each available priority > */ > @@ -443,18 +443,17 @@ static SpaprIrq *spapr_irq_current(SpaprMachineState *spapr) > &spapr_irq_xive : &spapr_irq_xics; > } > > -static void spapr_irq_init_dual(SpaprMachineState *spapr, int nr_xirqs, > - Error **errp) > +static void spapr_irq_init_dual(SpaprMachineState *spapr, Error **errp) > { > Error *local_err = NULL; > > - spapr_irq_xics.init(spapr, spapr_irq_xics.nr_xirqs, &local_err); > + spapr_irq_xics.init(spapr, &local_err); > if (local_err) { > error_propagate(errp, local_err); > return; > } > > - spapr_irq_xive.init(spapr, spapr_irq_xive.nr_xirqs, &local_err); > + spapr_irq_xive.init(spapr, &local_err); > if (local_err) { > error_propagate(errp, local_err); > return; > @@ -683,7 +682,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp) > spapr_irq_msi_init(spapr, spapr->irq->nr_msis); > } > > - spapr->irq->init(spapr, spapr->irq->nr_xirqs, errp); > + spapr->irq->init(spapr, errp); > > spapr->qirqs = qemu_allocate_irqs(spapr->irq->set_irq, spapr, > spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE); > diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h > index a8f9a2ab11..7e26288fcd 100644 > --- a/include/hw/ppc/spapr_irq.h > +++ b/include/hw/ppc/spapr_irq.h > @@ -41,7 +41,7 @@ typedef struct SpaprIrq { > uint32_t nr_msis; > uint8_t ov5; > > - void (*init)(SpaprMachineState *spapr, int nr_irqs, Error **errp); > + void (*init)(SpaprMachineState *spapr, Error **errp); > int (*claim)(SpaprMachineState *spapr, int irq, bool lsi, Error **errp); > void (*free)(SpaprMachineState *spapr, int irq, int num); > qemu_irq (*qirq)(SpaprMachineState *spapr, int irq);
diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index 5190a33e08..300c65be3a 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -92,8 +92,7 @@ static void spapr_irq_init_kvm(SpaprMachineState *spapr, * XICS IRQ backend. */ -static void spapr_irq_init_xics(SpaprMachineState *spapr, int nr_xirqs, - Error **errp) +static void spapr_irq_init_xics(SpaprMachineState *spapr, Error **errp) { Object *obj; Error *local_err = NULL; @@ -102,7 +101,8 @@ static void spapr_irq_init_xics(SpaprMachineState *spapr, int nr_xirqs, object_property_add_child(OBJECT(spapr), "ics", obj, &error_abort); object_property_add_const_link(obj, ICS_PROP_XICS, OBJECT(spapr), &error_fatal); - object_property_set_int(obj, nr_xirqs, "nr-irqs", &error_fatal); + object_property_set_int(obj, spapr->irq->nr_xirqs, + "nr-irqs", &error_fatal); object_property_set_bool(obj, true, "realized", &local_err); if (local_err) { error_propagate(errp, local_err); @@ -256,15 +256,15 @@ SpaprIrq spapr_irq_xics = { /* * XIVE IRQ backend. */ -static void spapr_irq_init_xive(SpaprMachineState *spapr, int nr_xirqs, - Error **errp) +static void spapr_irq_init_xive(SpaprMachineState *spapr, Error **errp) { uint32_t nr_servers = spapr_max_server_number(spapr); DeviceState *dev; int i; dev = qdev_create(NULL, TYPE_SPAPR_XIVE); - qdev_prop_set_uint32(dev, "nr-irqs", nr_xirqs + SPAPR_XIRQ_BASE); + qdev_prop_set_uint32(dev, "nr-irqs", + spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE); /* * 8 XIVE END structures per CPU. One for each available priority */ @@ -443,18 +443,17 @@ static SpaprIrq *spapr_irq_current(SpaprMachineState *spapr) &spapr_irq_xive : &spapr_irq_xics; } -static void spapr_irq_init_dual(SpaprMachineState *spapr, int nr_xirqs, - Error **errp) +static void spapr_irq_init_dual(SpaprMachineState *spapr, Error **errp) { Error *local_err = NULL; - spapr_irq_xics.init(spapr, spapr_irq_xics.nr_xirqs, &local_err); + spapr_irq_xics.init(spapr, &local_err); if (local_err) { error_propagate(errp, local_err); return; } - spapr_irq_xive.init(spapr, spapr_irq_xive.nr_xirqs, &local_err); + spapr_irq_xive.init(spapr, &local_err); if (local_err) { error_propagate(errp, local_err); return; @@ -683,7 +682,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp) spapr_irq_msi_init(spapr, spapr->irq->nr_msis); } - spapr->irq->init(spapr, spapr->irq->nr_xirqs, errp); + spapr->irq->init(spapr, errp); spapr->qirqs = qemu_allocate_irqs(spapr->irq->set_irq, spapr, spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE); diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h index a8f9a2ab11..7e26288fcd 100644 --- a/include/hw/ppc/spapr_irq.h +++ b/include/hw/ppc/spapr_irq.h @@ -41,7 +41,7 @@ typedef struct SpaprIrq { uint32_t nr_msis; uint8_t ov5; - void (*init)(SpaprMachineState *spapr, int nr_irqs, Error **errp); + void (*init)(SpaprMachineState *spapr, Error **errp); int (*claim)(SpaprMachineState *spapr, int irq, bool lsi, Error **errp); void (*free)(SpaprMachineState *spapr, int irq, int num); qemu_irq (*qirq)(SpaprMachineState *spapr, int irq);
The only reason this parameter was needed was to work around the inconsistent meaning of nr_irqs between xics and xive. Now that we've fixed that, we can consistently use the number directly in the SpaprIrq configuration. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- hw/ppc/spapr_irq.c | 21 ++++++++++----------- include/hw/ppc/spapr_irq.h | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-)