From: David Gibson <david@gibson.dropbear.id.au>
To: Greg Kurz <groug@kaod.org>
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 13/20] spapr: Eliminate SpaprIrq:get_nodename method
Date: Thu, 26 Sep 2019 21:36:20 +1000 [thread overview]
Message-ID: <20190926113620.GA17405@umbus> (raw)
In-Reply-To: <20190926094839.33913bdf@bahia.lan>
[-- Attachment #1: Type: text/plain, Size: 7175 bytes --]
On Thu, Sep 26, 2019 at 09:48:39AM +0200, Greg Kurz wrote:
> On Wed, 25 Sep 2019 16:45:27 +1000
> David Gibson <david@gibson.dropbear.id.au> wrote:
>
> > This method is used to determine the name of the irq backend's node in the
> > device tree, so that we can find its phandle (after SLOF may have modified
> > it from the phandle we initially gave it).
> >
> > But, in the two cases the only difference between the node name is the
> > presence of a unit address. Searching for a node name without considering
> > unit address is standard practice for the device tree, and
> > fdt_subnode_offset() will do exactly that.
> >
> > So, the method is unnecessary.
> >
>
> So is the XICS_NODENAME macro which was introduced by the same
> commit 743ed566c1d80, and it seems that "interrupt-controller"
> is a well-known string that is used everywhere:
>
> [greg@bahia qemu-spapr]$ git grep -E \"interrupt-controller\"
> hw/arm/virt.c: qemu_fdt_setprop(vms->fdt, nodename, "interrupt-controller", NULL, 0);
> hw/arm/xlnx-versal-virt.c: qemu_fdt_setprop(s->fdt, nodename, "interrupt-controller", NULL, 0);
> hw/intc/sh_intc.c: "interrupt-controller", 0x100000000ULL);
> hw/intc/spapr_xive.c: _FDT(fdt_setprop(fdt, node, "interrupt-controller", NULL, 0));
> hw/intc/xics_spapr.c: _FDT(fdt_setprop(fdt, node, "interrupt-controller", NULL, 0));
> hw/pci/pci.c: { 0x0800, "Interrupt controller", "interrupt-controller"},
> hw/ppc/e500.c: qemu_fdt_setprop(fdt, mpic, "interrupt-controller", NULL, 0);
> hw/ppc/pnv.c: _FDT((fdt_setprop(fdt, offset, "interrupt-controller", NULL, 0)));
> hw/ppc/spapr_events.c: _FDT((fdt_setprop(fdt, event_sources, "interrupt-controller", NULL, 0)));
> hw/ppc/spapr_irq.c: const char *nodename = "interrupt-controller";
> hw/ppc/spapr_pci.c: { PCI_CLASS_SYSTEM_PIC, "interrupt-controller", pic_iface },
> hw/ppc/spapr_vio.c: _FDT(fdt_setprop(fdt, node, "interrupt-controller", NULL, 0));
> hw/riscv/sifive_u.c: qemu_fdt_setprop(fdt, intc, "interrupt-controller", NULL, 0);
> hw/riscv/sifive_u.c: qemu_fdt_setprop(fdt, nodename, "interrupt-controller", NULL, 0);
> hw/riscv/spike.c: qemu_fdt_setprop(fdt, intc, "interrupt-controller", NULL, 0);
> hw/riscv/virt.c: qemu_fdt_setprop(fdt, intc, "interrupt-controller", NULL, 0);
> hw/riscv/virt.c: qemu_fdt_setprop(fdt, nodename, "interrupt-controller", NULL, 0);
> include/hw/ppc/spapr.h: * "interrupt-controller" node has its "#interrupt-cells" property set to 2 (ie,
> include/hw/ppc/xics_spapr.h:#define XICS_NODENAME "interrupt-controller"
>
> Maybe drop XICS_NODENAME as well while here ?
Fair point, done.
>
> With or without that,
>
> Reviewed-by: Greg Kurz <groug@kaod.org>
>
> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> > ---
> > hw/ppc/spapr_irq.c | 25 +++----------------------
> > include/hw/ppc/spapr_irq.h | 1 -
> > 2 files changed, 3 insertions(+), 23 deletions(-)
> >
> > diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> > index 038bfffff4..79167ccc68 100644
> > --- a/hw/ppc/spapr_irq.c
> > +++ b/hw/ppc/spapr_irq.c
> > @@ -211,11 +211,6 @@ static void spapr_irq_reset_xics(SpaprMachineState *spapr, Error **errp)
> > }
> > }
> >
> > -static const char *spapr_irq_get_nodename_xics(SpaprMachineState *spapr)
> > -{
> > - return XICS_NODENAME;
> > -}
> > -
> > static void spapr_irq_init_kvm_xics(SpaprMachineState *spapr, Error **errp)
> > {
> > if (kvm_enabled()) {
> > @@ -237,7 +232,6 @@ SpaprIrq spapr_irq_xics = {
> > .post_load = spapr_irq_post_load_xics,
> > .reset = spapr_irq_reset_xics,
> > .set_irq = spapr_irq_set_irq_xics,
> > - .get_nodename = spapr_irq_get_nodename_xics,
> > .init_kvm = spapr_irq_init_kvm_xics,
> > };
> >
> > @@ -362,11 +356,6 @@ static void spapr_irq_set_irq_xive(void *opaque, int irq, int val)
> > }
> > }
> >
> > -static const char *spapr_irq_get_nodename_xive(SpaprMachineState *spapr)
> > -{
> > - return spapr->xive->nodename;
> > -}
> > -
> > static void spapr_irq_init_kvm_xive(SpaprMachineState *spapr, Error **errp)
> > {
> > if (kvm_enabled()) {
> > @@ -393,7 +382,6 @@ SpaprIrq spapr_irq_xive = {
> > .post_load = spapr_irq_post_load_xive,
> > .reset = spapr_irq_reset_xive,
> > .set_irq = spapr_irq_set_irq_xive,
> > - .get_nodename = spapr_irq_get_nodename_xive,
> > .init_kvm = spapr_irq_init_kvm_xive,
> > };
> >
> > @@ -538,11 +526,6 @@ static void spapr_irq_set_irq_dual(void *opaque, int irq, int val)
> > spapr_irq_current(spapr)->set_irq(spapr, irq, val);
> > }
> >
> > -static const char *spapr_irq_get_nodename_dual(SpaprMachineState *spapr)
> > -{
> > - return spapr_irq_current(spapr)->get_nodename(spapr);
> > -}
> > -
> > /*
> > * Define values in sync with the XIVE and XICS backend
> > */
> > @@ -560,7 +543,6 @@ SpaprIrq spapr_irq_dual = {
> > .post_load = spapr_irq_post_load_dual,
> > .reset = spapr_irq_reset_dual,
> > .set_irq = spapr_irq_set_irq_dual,
> > - .get_nodename = spapr_irq_get_nodename_dual,
> > .init_kvm = NULL, /* should not be used */
> > };
> >
> > @@ -697,13 +679,13 @@ void spapr_irq_reset(SpaprMachineState *spapr, Error **errp)
> >
> > int spapr_irq_get_phandle(SpaprMachineState *spapr, void *fdt, Error **errp)
> > {
> > - const char *nodename = spapr->irq->get_nodename(spapr);
> > + const char *nodename = "interrupt-controller";
> > int offset, phandle;
> >
> > offset = fdt_subnode_offset(fdt, 0, nodename);
> > if (offset < 0) {
> > - error_setg(errp, "Can't find node \"%s\": %s", nodename,
> > - fdt_strerror(offset));
> > + error_setg(errp, "Can't find node \"%s\": %s",
> > + nodename, fdt_strerror(offset));
> > return -1;
> > }
> >
> > @@ -787,6 +769,5 @@ SpaprIrq spapr_irq_xics_legacy = {
> > .post_load = spapr_irq_post_load_xics,
> > .reset = spapr_irq_reset_xics,
> > .set_irq = spapr_irq_set_irq_xics,
> > - .get_nodename = spapr_irq_get_nodename_xics,
> > .init_kvm = spapr_irq_init_kvm_xics,
> > };
> > diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
> > index a4e790ef60..9b60378e28 100644
> > --- a/include/hw/ppc/spapr_irq.h
> > +++ b/include/hw/ppc/spapr_irq.h
> > @@ -52,7 +52,6 @@ typedef struct SpaprIrq {
> > int (*post_load)(SpaprMachineState *spapr, int version_id);
> > void (*reset)(SpaprMachineState *spapr, Error **errp);
> > void (*set_irq)(void *opaque, int srcno, int val);
> > - const char *(*get_nodename)(SpaprMachineState *spapr);
> > void (*init_kvm)(SpaprMachineState *spapr, Error **errp);
> > } SpaprIrq;
> >
>
--
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-09-26 12:17 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 6:45 [PATCH 00/20] spapr: IRQ subsystem cleanups David Gibson
2019-09-25 6:45 ` [PATCH 01/20] xics: Use incomplete type for XICSFabric David Gibson
2019-09-25 6:55 ` Cédric Le Goater
2019-09-25 7:48 ` Greg Kurz
2019-09-25 7:45 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 02/20] xics: Eliminate 'reject', 'resend' and 'eoi' class hooks David Gibson
2019-09-25 6:45 ` [PATCH 03/20] xics: Rename misleading ics_simple_*() functions David Gibson
2019-09-25 6:45 ` [PATCH 04/20] xics: Eliminate reset hook David Gibson
2019-09-25 7:33 ` Cédric Le Goater
2019-09-25 7:59 ` Greg Kurz
2019-09-26 2:54 ` David Gibson
2019-09-25 6:45 ` [PATCH 05/20] xics: Merge TYPE_ICS_BASE and TYPE_ICS_SIMPLE classes David Gibson
2019-09-25 8:16 ` Greg Kurz
2019-09-25 8:31 ` Greg Kurz
2019-09-26 0:55 ` David Gibson
2019-09-26 0:52 ` David Gibson
2019-09-25 12:47 ` Cédric Le Goater
2019-09-25 6:45 ` [PATCH 06/20] xics: Create sPAPR specific ICS subtype David Gibson
2019-09-25 7:34 ` Cédric Le Goater
2019-09-25 8:40 ` Greg Kurz
2019-09-25 8:55 ` Cédric Le Goater
2019-09-25 9:07 ` Greg Kurz
2019-09-26 0:56 ` David Gibson
2019-09-26 7:09 ` Cédric Le Goater
2019-09-27 16:05 ` Greg Kurz
2019-09-30 8:45 ` David Gibson
2019-09-30 17:00 ` Greg Kurz
2019-10-01 1:45 ` David Gibson
2019-09-25 6:45 ` [PATCH 07/20] spapr: Fold spapr_phb_lsi_qirq() into its single caller David Gibson
2019-09-25 6:58 ` Cédric Le Goater
2019-09-25 8:56 ` Greg Kurz
2019-09-26 7:08 ` Philippe Mathieu-Daudé
2019-09-25 6:45 ` [PATCH 08/20] spapr: Replace spapr_vio_qirq() helper with spapr_vio_irq_pulse() helper David Gibson
2019-09-25 6:58 ` Cédric Le Goater
2019-09-25 8:57 ` Greg Kurz
2019-09-26 7:08 ` Philippe Mathieu-Daudé
2019-09-25 6:45 ` [PATCH 09/20] spapr: Clarify and fix handling of nr_irqs David Gibson
2019-09-25 7:05 ` Cédric Le Goater
2019-09-26 1:03 ` David Gibson
2019-09-26 7:02 ` Cédric Le Goater
2019-09-25 17:13 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 10/20] spapr: Eliminate nr_irqs parameter to SpaprIrq::init David Gibson
2019-09-25 7:06 ` Cédric Le Goater
2019-09-25 17:16 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 11/20] spapr: Fix indexing of XICS irqs David Gibson
2019-09-25 7:11 ` Cédric Le Goater
2019-09-25 20:17 ` Greg Kurz
2019-09-26 1:31 ` David Gibson
2019-09-26 7:21 ` Greg Kurz
2019-09-26 11:32 ` David Gibson
2019-09-26 14:44 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 12/20] spapr: Simplify spapr_qirq() handling David Gibson
2019-09-25 7:16 ` Cédric Le Goater
2019-09-25 20:30 ` Greg Kurz
2019-09-26 7:10 ` Philippe Mathieu-Daudé
2019-09-25 6:45 ` [PATCH 13/20] spapr: Eliminate SpaprIrq:get_nodename method David Gibson
2019-09-25 7:19 ` Cédric Le Goater
2019-09-26 7:11 ` Philippe Mathieu-Daudé
2019-09-26 7:48 ` Greg Kurz
2019-09-26 11:36 ` David Gibson [this message]
2019-09-25 6:45 ` [PATCH 14/20] spapr: Remove unhelpful tracepoints from spapr_irq_free_xics() David Gibson
2019-09-25 7:20 ` Cédric Le Goater
2019-09-26 7:11 ` Philippe Mathieu-Daudé
2019-09-26 7:50 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 15/20] spapr: Handle freeing of multiple irqs in frontend only David Gibson
2019-09-25 7:21 ` Cédric Le Goater
2019-09-26 7:52 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 16/20] spapr, xics, xive: Better use of assert()s on irq claim/free paths David Gibson
2019-09-25 7:22 ` Cédric Le Goater
2019-09-26 8:08 ` Greg Kurz
2019-09-26 11:39 ` David Gibson
2019-09-25 6:45 ` [PATCH 17/20] spapr: Remove unused return value in claim path David Gibson
2019-09-25 7:23 ` Cédric Le Goater
2019-09-26 7:13 ` Philippe Mathieu-Daudé
2019-09-26 8:36 ` Greg Kurz
2019-09-27 1:47 ` David Gibson
2019-09-25 6:45 ` [PATCH 18/20] xive: Improve irq claim/free path David Gibson
2019-09-25 7:25 ` Cédric Le Goater
2019-09-26 1:05 ` David Gibson
2019-09-25 6:45 ` [PATCH 19/20] spapr: Use less cryptic representation of which irq backends are supported David Gibson
2019-09-25 7:28 ` Cédric Le Goater
2019-09-26 9:16 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 20/20] spapr: Eliminate SpaprIrq::init hook David Gibson
2019-09-25 7:31 ` Cédric Le Goater
2019-09-26 1:13 ` David Gibson
2019-09-26 7:05 ` Cédric Le Goater
2019-09-26 11:29 ` David Gibson
2019-09-26 15:35 ` Greg Kurz
2019-09-27 5:51 ` David Gibson
2019-09-27 6:23 ` Greg Kurz
2019-09-26 15:39 ` Greg Kurz
2019-09-27 14:12 ` Greg Kurz
2019-09-29 9:34 ` 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=20190926113620.GA17405@umbus \
--to=david@gibson.dropbear.id.au \
--cc=clg@kaod.org \
--cc=groug@kaod.org \
--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).