From: "Cédric Le Goater" <clg@kaod.org>
To: David Gibson <david@gibson.dropbear.id.au>,
qemu-devel@nongnu.org, qemu-ppc@nongnu.org
Cc: "Jason Wang" <jasowang@redhat.com>,
"Riku Voipio" <riku.voipio@iki.fi>,
groug@kaod.org, "Laurent Vivier" <laurent@vivier.eu>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
philmd@redhat.com
Subject: Re: [PATCH v4 08/19] spapr, xics, xive: Move set_irq from SpaprIrq to SpaprInterruptController
Date: Wed, 9 Oct 2019 11:18:50 +0200 [thread overview]
Message-ID: <557433c3-8239-85b5-dc7e-4ffc8be18dd4@kaod.org> (raw)
In-Reply-To: <20191009060818.29719-9-david@gibson.dropbear.id.au>
On 09/10/2019 08:08, David Gibson wrote:
> This method depends only on the active irq controller. Now that we've
> formalized the notion of active controller we can dispatch directly through
> that, rather than dispatching via SpaprIrq with the dual version having
> to do a second conditional dispatch.
>
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
> ---
> hw/intc/spapr_xive.c | 12 +++++++++++
> hw/intc/xics_spapr.c | 9 +++++++++
> hw/ppc/spapr_irq.c | 41 ++++++++++----------------------------
> include/hw/ppc/spapr_irq.h | 4 +++-
> 4 files changed, 34 insertions(+), 32 deletions(-)
>
> diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c
> index ff1a175b44..52d5e71793 100644
> --- a/hw/intc/spapr_xive.c
> +++ b/hw/intc/spapr_xive.c
> @@ -553,6 +553,17 @@ static int spapr_xive_cpu_intc_create(SpaprInterruptController *intc,
> return 0;
> }
>
> +static void spapr_xive_set_irq(SpaprInterruptController *intc, int irq, int val)
> +{
> + SpaprXive *xive = SPAPR_XIVE(intc);
> +
> + if (kvm_irqchip_in_kernel()) {
> + kvmppc_xive_source_set_irq(&xive->source, irq, val);
> + } else {
> + xive_source_set_irq(&xive->source, irq, val);
> + }
> +}
> +
> static void spapr_xive_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> @@ -574,6 +585,7 @@ static void spapr_xive_class_init(ObjectClass *klass, void *data)
> sicc->cpu_intc_create = spapr_xive_cpu_intc_create;
> sicc->claim_irq = spapr_xive_claim_irq;
> sicc->free_irq = spapr_xive_free_irq;
> + sicc->set_irq = spapr_xive_set_irq;
> }
>
> static const TypeInfo spapr_xive_info = {
> diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c
> index 224fe1efcd..02372697f6 100644
> --- a/hw/intc/xics_spapr.c
> +++ b/hw/intc/xics_spapr.c
> @@ -373,6 +373,14 @@ static void xics_spapr_free_irq(SpaprInterruptController *intc, int irq)
> memset(&ics->irqs[srcno], 0, sizeof(ICSIRQState));
> }
>
> +static void xics_spapr_set_irq(SpaprInterruptController *intc, int irq, int val)
> +{
> + ICSState *ics = ICS_SPAPR(intc);
> + uint32_t srcno = irq - ics->offset;
> +
> + ics_set_irq(ics, srcno, val);
> +}
> +
> static void ics_spapr_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> @@ -384,6 +392,7 @@ static void ics_spapr_class_init(ObjectClass *klass, void *data)
> sicc->cpu_intc_create = xics_spapr_cpu_intc_create;
> sicc->claim_irq = xics_spapr_claim_irq;
> sicc->free_irq = xics_spapr_free_irq;
> + sicc->set_irq = xics_spapr_set_irq;
> }
>
> static const TypeInfo ics_spapr_info = {
> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> index 249a2688ac..bfccb815ed 100644
> --- a/hw/ppc/spapr_irq.c
> +++ b/hw/ppc/spapr_irq.c
> @@ -123,14 +123,6 @@ static int spapr_irq_post_load_xics(SpaprMachineState *spapr, int version_id)
> return 0;
> }
>
> -static void spapr_irq_set_irq_xics(void *opaque, int irq, int val)
> -{
> - SpaprMachineState *spapr = opaque;
> - uint32_t srcno = irq - spapr->ics->offset;
> -
> - ics_set_irq(spapr->ics, srcno, val);
> -}
> -
> static void spapr_irq_reset_xics(SpaprMachineState *spapr, Error **errp)
> {
> Error *local_err = NULL;
> @@ -159,7 +151,6 @@ SpaprIrq spapr_irq_xics = {
> .dt_populate = spapr_dt_xics,
> .post_load = spapr_irq_post_load_xics,
> .reset = spapr_irq_reset_xics,
> - .set_irq = spapr_irq_set_irq_xics,
> .init_kvm = spapr_irq_init_kvm_xics,
> };
>
> @@ -208,17 +199,6 @@ static void spapr_irq_reset_xive(SpaprMachineState *spapr, Error **errp)
> spapr_xive_mmio_set_enabled(spapr->xive, true);
> }
>
> -static void spapr_irq_set_irq_xive(void *opaque, int irq, int val)
> -{
> - SpaprMachineState *spapr = opaque;
> -
> - if (kvm_irqchip_in_kernel()) {
> - kvmppc_xive_source_set_irq(&spapr->xive->source, irq, val);
> - } else {
> - xive_source_set_irq(&spapr->xive->source, irq, val);
> - }
> -}
> -
> static void spapr_irq_init_kvm_xive(SpaprMachineState *spapr, Error **errp)
> {
> if (kvm_enabled()) {
> @@ -236,7 +216,6 @@ SpaprIrq spapr_irq_xive = {
> .dt_populate = spapr_dt_xive,
> .post_load = spapr_irq_post_load_xive,
> .reset = spapr_irq_reset_xive,
> - .set_irq = spapr_irq_set_irq_xive,
> .init_kvm = spapr_irq_init_kvm_xive,
> };
>
> @@ -316,13 +295,6 @@ static void spapr_irq_reset_dual(SpaprMachineState *spapr, Error **errp)
> spapr_irq_current(spapr)->reset(spapr, errp);
> }
>
> -static void spapr_irq_set_irq_dual(void *opaque, int irq, int val)
> -{
> - SpaprMachineState *spapr = opaque;
> -
> - spapr_irq_current(spapr)->set_irq(spapr, irq, val);
> -}
> -
> /*
> * Define values in sync with the XIVE and XICS backend
> */
> @@ -336,7 +308,6 @@ SpaprIrq spapr_irq_dual = {
> .dt_populate = spapr_irq_dt_populate_dual,
> .post_load = spapr_irq_post_load_dual,
> .reset = spapr_irq_reset_dual,
> - .set_irq = spapr_irq_set_irq_dual,
> .init_kvm = NULL, /* should not be used */
> };
>
> @@ -424,6 +395,15 @@ int spapr_irq_cpu_intc_create(SpaprMachineState *spapr,
> return 0;
> }
>
> +static void spapr_set_irq(void *opaque, int irq, int level)
> +{
> + SpaprMachineState *spapr = SPAPR_MACHINE(opaque);
> + SpaprInterruptControllerClass *sicc
> + = SPAPR_INTC_GET_CLASS(spapr->active_intc);
> +
> + sicc->set_irq(spapr->active_intc, irq, level);
> +}
> +
> void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
> {
> MachineState *machine = MACHINE(spapr);
> @@ -513,7 +493,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
> spapr_xive_hcall_init(spapr);
> }
>
> - spapr->qirqs = qemu_allocate_irqs(spapr->irq->set_irq, spapr,
> + spapr->qirqs = qemu_allocate_irqs(spapr_set_irq, spapr,
> spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE);
> }
>
> @@ -737,7 +717,6 @@ SpaprIrq spapr_irq_xics_legacy = {
> .dt_populate = spapr_dt_xics,
> .post_load = spapr_irq_post_load_xics,
> .reset = spapr_irq_reset_xics,
> - .set_irq = spapr_irq_set_irq_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 593059eff5..ece8d2ea48 100644
> --- a/include/hw/ppc/spapr_irq.h
> +++ b/include/hw/ppc/spapr_irq.h
> @@ -56,6 +56,9 @@ typedef struct SpaprInterruptControllerClass {
> int (*claim_irq)(SpaprInterruptController *intc, int irq, bool lsi,
> Error **errp);
> void (*free_irq)(SpaprInterruptController *intc, int irq);
> +
> + /* These methods should only be called on the active intc */
> + void (*set_irq)(SpaprInterruptController *intc, int irq, int val);
> } SpaprInterruptControllerClass;
>
> void spapr_irq_update_active_intc(SpaprMachineState *spapr);
> @@ -80,7 +83,6 @@ typedef struct SpaprIrq {
> void *fdt, uint32_t phandle);
> int (*post_load)(SpaprMachineState *spapr, int version_id);
> void (*reset)(SpaprMachineState *spapr, Error **errp);
> - void (*set_irq)(void *opaque, int srcno, int val);
> void (*init_kvm)(SpaprMachineState *spapr, Error **errp);
> } SpaprIrq;
>
>
next prev parent reply other threads:[~2019-10-09 17:29 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 6:07 [PATCH v4 00/19] spapr: IRQ subsystem cleanup David Gibson
2019-10-09 6:08 ` [PATCH v4 01/19] xive: Make some device types not user creatable David Gibson
2019-10-09 6:08 ` [PATCH v4 02/19] xics: " David Gibson
2019-10-09 6:08 ` [PATCH v4 03/19] target/ppc: Fix for optimized vsl/vsr instructions David Gibson
2019-10-09 6:08 ` [PATCH v4 04/19] spapr, xics, xive: Introduce SpaprInterruptController QOM interface David Gibson
2019-10-09 6:08 ` [PATCH v4 05/19] spapr, xics, xive: Move cpu_intc_create from SpaprIrq to SpaprInterruptController David Gibson
2019-10-09 6:08 ` [PATCH v4 06/19] spapr, xics, xive: Move irq claim and free " David Gibson
2019-10-09 6:08 ` [PATCH v4 07/19] spapr: Formalize notion of active interrupt controller David Gibson
2019-10-09 9:16 ` Cédric Le Goater
2019-10-09 9:19 ` Cédric Le Goater
2019-10-09 11:38 ` David Gibson
2019-10-09 6:08 ` [PATCH v4 08/19] spapr, xics, xive: Move set_irq from SpaprIrq to SpaprInterruptController David Gibson
2019-10-09 9:18 ` Cédric Le Goater [this message]
2019-10-09 6:08 ` [PATCH v4 09/19] spapr, xics, xive: Move print_info " David Gibson
2019-10-09 9:19 ` Cédric Le Goater
2019-10-09 6:08 ` [PATCH v4 10/19] spapr, xics, xive: Move dt_populate " David Gibson
2019-10-09 9:20 ` Cédric Le Goater
2019-10-09 6:08 ` [PATCH v4 11/19] spapr, xics, xive: Match signatures for XICS and XIVE KVM connect routines David Gibson
2019-10-09 6:08 ` [PATCH v4 12/19] spapr: Remove SpaprIrq::init_kvm hook David Gibson
2019-10-09 6:08 ` [PATCH v4 13/19] spapr, xics, xive: Move SpaprIrq::reset hook logic into activate/deactivate David Gibson
2019-10-09 14:25 ` Greg Kurz
2019-10-09 15:56 ` Cédric Le Goater
2019-10-09 15:56 ` Cédric Le Goater
2019-10-09 6:08 ` [PATCH v4 14/19] spapr, xics, xive: Move SpaprIrq::post_load hook to backends David Gibson
2019-10-09 15:57 ` Cédric Le Goater
2019-10-09 6:08 ` [PATCH v4 15/19] spapr: Remove SpaprIrq::nr_msis David Gibson
2019-10-09 15:59 ` Cédric Le Goater
2019-10-10 1:56 ` David Gibson
2019-10-09 6:08 ` [PATCH v4 16/19] spapr: Move SpaprIrq::nr_xirqs to SpaprMachineClass David Gibson
2019-10-09 16:01 ` Cédric Le Goater
2019-10-09 6:08 ` [PATCH v4 17/19] spapr: Remove last pieces of SpaprIrq David Gibson
2019-10-09 16:44 ` Cédric Le Goater
2019-10-10 1:59 ` David Gibson
2019-10-09 17:02 ` Greg Kurz
2019-10-10 2:02 ` David Gibson
2019-10-10 6:29 ` Greg Kurz
2019-10-10 20:33 ` Greg Kurz
2019-10-11 5:07 ` David Gibson
2019-10-11 6:13 ` Greg Kurz
2019-10-11 8:33 ` Greg Kurz
2019-10-12 0:00 ` David Gibson
2019-10-14 9:15 ` Greg Kurz
2019-11-20 5:38 ` David Gibson
2019-11-20 8:36 ` Greg Kurz
2019-10-09 6:08 ` [PATCH v4 18/19] spapr: Handle irq backend changes with VFIO PCI devices David Gibson
2019-10-09 8:57 ` David Gibson
2019-10-09 6:08 ` [PATCH v4 19/19] spapr: Work around spurious warnings from vfio INTx initialization David Gibson
2019-10-09 8:37 ` Greg Kurz
2019-10-09 8:52 ` David Gibson
2019-10-09 17:16 ` Greg Kurz
2019-10-10 2:02 ` David Gibson
2019-10-09 9:02 ` [PATCH v4 00/19] spapr: IRQ subsystem cleanup David Gibson
2019-10-16 16:04 ` Greg Kurz
2019-10-17 0:26 ` 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=557433c3-8239-85b5-dc7e-4ffc8be18dd4@kaod.org \
--to=clg@kaod.org \
--cc=david@gibson.dropbear.id.au \
--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).