From: Greg Kurz <groug@kaod.org>
To: David Gibson <david@gibson.dropbear.id.au>
Cc: "Jason Wang" <jasowang@redhat.com>,
"Riku Voipio" <riku.voipio@iki.fi>,
qemu-devel@nongnu.org, "Laurent Vivier" <laurent@vivier.eu>,
qemu-ppc@nongnu.org, clg@kaod.org,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
philmd@redhat.com
Subject: Re: [PATCH v2 10/33] spapr: Eliminate nr_irqs parameter to SpaprIrq::init
Date: Fri, 27 Sep 2019 09:57:14 +0200 [thread overview]
Message-ID: <20190927095714.2b7b8dea@bahia.lan> (raw)
In-Reply-To: <20190927055028.11493-11-david@gibson.dropbear.id.au>
On Fri, 27 Sep 2019 15:50:05 +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: Cédric Le Goater <clg@kaod.org>
> ---
Again ;)
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 3207b6bd01..cded3a0154 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
> */
> @@ -438,18 +438,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;
> @@ -678,7 +677,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);
next prev parent reply other threads:[~2019-09-27 7:59 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-27 5:49 [PATCH v2 00/33] spapr: IRQ subsystem cleanup David Gibson
2019-09-27 5:49 ` [PATCH v2 01/33] xics: Minor fixes for XICSFabric interface David Gibson
2019-09-27 7:17 ` Greg Kurz
2019-09-27 5:49 ` [PATCH v2 02/33] xics: Eliminate 'reject', 'resend' and 'eoi' class hooks David Gibson
2019-09-27 5:49 ` [PATCH v2 03/33] xics: Rename misleading ics_simple_*() functions David Gibson
2019-09-27 5:49 ` [PATCH v2 04/33] xics: Eliminate reset hook David Gibson
2019-09-27 7:19 ` Greg Kurz
2019-09-27 5:50 ` [PATCH v2 05/33] xics: Merge TYPE_ICS_BASE and TYPE_ICS_SIMPLE classes David Gibson
2019-09-27 5:50 ` [PATCH v2 06/33] xics: Create sPAPR specific ICS subtype David Gibson
2019-09-27 7:22 ` Greg Kurz
2019-09-27 5:50 ` [PATCH v2 07/33] spapr: Fold spapr_phb_lsi_qirq() into its single caller David Gibson
2019-09-27 5:50 ` [PATCH v2 08/33] spapr: Replace spapr_vio_qirq() helper with spapr_vio_irq_pulse() helper David Gibson
2019-09-27 5:50 ` [PATCH v2 09/33] spapr: Clarify and fix handling of nr_irqs David Gibson
2019-09-27 7:53 ` Greg Kurz
2019-09-27 7:58 ` David Gibson
2019-09-27 5:50 ` [PATCH v2 10/33] spapr: Eliminate nr_irqs parameter to SpaprIrq::init David Gibson
2019-09-27 7:57 ` Greg Kurz [this message]
2019-09-27 5:50 ` [PATCH v2 11/33] spapr: Fix indexing of XICS irqs David Gibson
2019-09-27 5:50 ` [PATCH v2 12/33] spapr: Simplify spapr_qirq() handling David Gibson
2019-09-27 5:50 ` [PATCH v2 13/33] spapr: Eliminate SpaprIrq:get_nodename method David Gibson
2019-09-27 5:50 ` [PATCH v2 14/33] spapr: Remove unhelpful tracepoints from spapr_irq_free_xics() David Gibson
2019-09-27 5:50 ` [PATCH v2 15/33] spapr: Handle freeing of multiple irqs in frontend only David Gibson
2019-09-27 5:50 ` [PATCH v2 16/33] spapr, xics, xive: Better use of assert()s on irq claim/free paths David Gibson
2019-09-27 5:50 ` [PATCH v2 17/33] xive: Improve irq claim/free path David Gibson
2019-09-27 8:40 ` Greg Kurz
2019-09-30 1:39 ` David Gibson
2019-09-27 5:50 ` [PATCH v2 18/33] spapr: Use less cryptic representation of which irq backends are supported David Gibson
2019-09-27 5:50 ` [PATCH v2 19/33] spapr: Eliminate SpaprIrq::init hook David Gibson
2019-09-27 5:50 ` [PATCH v2 20/33] spapr, xics, xive: Introduce SpaprInterruptController QOM interface David Gibson
2019-09-27 9:52 ` Greg Kurz
2019-09-30 5:24 ` Cédric Le Goater
2019-09-27 5:50 ` [PATCH v2 21/33] spapr, xics, xive: Move cpu_intc_create from SpaprIrq to SpaprInterruptController David Gibson
2019-09-27 10:16 ` Greg Kurz
2019-09-30 1:49 ` David Gibson
2019-09-30 5:28 ` Cédric Le Goater
2019-09-30 6:14 ` David Gibson
2019-09-30 10:13 ` Cédric Le Goater
2019-10-01 2:31 ` David Gibson
2019-10-01 5:43 ` Cédric Le Goater
2019-10-01 6:47 ` David Gibson
2019-10-01 7:41 ` Cédric Le Goater
2019-10-01 8:11 ` David Gibson
2019-10-01 11:43 ` Cédric Le Goater
2019-10-02 1:11 ` David Gibson
2019-09-30 2:37 ` David Gibson
2019-09-30 5:30 ` Cédric Le Goater
2019-09-27 5:50 ` [PATCH v2 22/33] spapr, xics, xive: Move irq claim and free " David Gibson
2019-09-27 12:16 ` Greg Kurz
2019-09-30 2:39 ` David Gibson
2019-09-30 5:36 ` Cédric Le Goater
2019-09-30 5:33 ` Cédric Le Goater
2019-09-27 5:50 ` [PATCH v2 23/33] spapr: Formalize notion of active interrupt controller David Gibson
2019-09-27 14:16 ` Greg Kurz
2019-09-30 5:39 ` Cédric Le Goater
2019-09-27 5:50 ` [PATCH v2 24/33] spapr, xics, xive: Move set_irq from SpaprIrq to SpaprInterruptController David Gibson
2019-09-27 14:27 ` Greg Kurz
2019-09-30 2:41 ` David Gibson
2019-09-30 7:22 ` Greg Kurz
2019-09-30 8:28 ` David Gibson
2019-09-30 5:48 ` Cédric Le Goater
2019-09-27 5:50 ` [PATCH v2 25/33] spapr, xics, xive: Move print_info " David Gibson
2019-09-27 14:31 ` Greg Kurz
2019-09-27 5:50 ` [PATCH v2 26/33] spapr, xics, xive: Move dt_populate " David Gibson
2019-09-27 14:38 ` Greg Kurz
2019-09-30 5:51 ` Cédric Le Goater
2019-09-27 5:50 ` [PATCH v2 27/33] spapr, xics, xive: Match signatures for XICS and XIVE KVM connect routines David Gibson
2019-09-27 14:49 ` Greg Kurz
2019-09-30 5:52 ` Cédric Le Goater
2019-09-27 5:50 ` [PATCH v2 28/33] spapr: Remove SpaprIrq::init_kvm hook David Gibson
2019-09-27 15:04 ` Greg Kurz
2019-09-30 5:55 ` Cédric Le Goater
2019-09-27 5:50 ` [PATCH v2 29/33] spapr, xics, xive: Move SpaprIrq::reset hook logic into activate/deactivate David Gibson
2019-09-30 6:11 ` Cédric Le Goater
2019-09-30 8:25 ` David Gibson
2019-09-30 19:29 ` Cédric Le Goater
2019-10-01 3:07 ` David Gibson
2019-09-27 5:50 ` [PATCH v2 30/33] spapr, xics, xive: Move SpaprIrq::post_load hook to backends David Gibson
2019-09-27 5:50 ` [PATCH v2 31/33] spapr: Remove SpaprIrq::nr_msis David Gibson
2019-09-27 15:17 ` Greg Kurz
2019-09-27 5:50 ` [PATCH v2 32/33] spapr: Move SpaprIrq::nr_xirqs to SpaprMachineClass David Gibson
2019-09-27 15:22 ` Greg Kurz
2019-09-30 2:44 ` David Gibson
2019-09-27 5:50 ` [PATCH v2 33/33] spapr: Remove last pieces of SpaprIrq David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190927095714.2b7b8dea@bahia.lan \
--to=groug@kaod.org \
--cc=clg@kaod.org \
--cc=david@gibson.dropbear.id.au \
--cc=jasowang@redhat.com \
--cc=laurent@vivier.eu \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=riku.voipio@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).