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 25/33] spapr, xics, xive: Move print_info from SpaprIrq to SpaprInterruptController
Date: Fri, 27 Sep 2019 16:31:16 +0200 [thread overview]
Message-ID: <20190927163116.061b7d9a@bahia.lan> (raw)
In-Reply-To: <20190927055028.11493-26-david@gibson.dropbear.id.au>
On Fri, 27 Sep 2019 15:50:20 +1000
David Gibson <david@gibson.dropbear.id.au> 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>
> hw/intc/spapr_xive.c | 15 +++++++++++++
> hw/intc/xics_spapr.c | 15 +++++++++++++
> hw/ppc/spapr.c | 2 +-
> hw/ppc/spapr_irq.c | 44 +++++++-------------------------------
> include/hw/ppc/spapr_irq.h | 2 +-
> 5 files changed, 40 insertions(+), 38 deletions(-)
>
> diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c
> index 52d5e71793..700ec5c9c1 100644
> --- a/hw/intc/spapr_xive.c
> +++ b/hw/intc/spapr_xive.c
> @@ -564,6 +564,20 @@ static void spapr_xive_set_irq(SpaprInterruptController *intc, int irq, int val)
> }
> }
>
> +static void spapr_xive_print_info(SpaprInterruptController *intc, Monitor *mon)
> +{
> + SpaprXive *xive = SPAPR_XIVE(intc);
> + CPUState *cs;
> +
> + CPU_FOREACH(cs) {
> + PowerPCCPU *cpu = POWERPC_CPU(cs);
> +
> + xive_tctx_pic_print_info(spapr_cpu_state(cpu)->tctx, mon);
> + }
> +
> + spapr_xive_pic_print_info(xive, mon);
> +}
> +
> static void spapr_xive_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> @@ -586,6 +600,7 @@ static void spapr_xive_class_init(ObjectClass *klass, void *data)
> sicc->claim_irq = spapr_xive_claim_irq;
> sicc->free_irq = spapr_xive_free_irq;
> sicc->set_irq = spapr_xive_set_irq;
> + sicc->print_info = spapr_xive_print_info;
> }
>
> static const TypeInfo spapr_xive_info = {
> diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c
> index 02372697f6..415defe394 100644
> --- a/hw/intc/xics_spapr.c
> +++ b/hw/intc/xics_spapr.c
> @@ -381,6 +381,20 @@ static void xics_spapr_set_irq(SpaprInterruptController *intc, int irq, int val)
> ics_set_irq(ics, srcno, val);
> }
>
> +static void xics_spapr_print_info(SpaprInterruptController *intc, Monitor *mon)
> +{
> + ICSState *ics = ICS_SPAPR(intc);
> + CPUState *cs;
> +
> + CPU_FOREACH(cs) {
> + PowerPCCPU *cpu = POWERPC_CPU(cs);
> +
> + icp_pic_print_info(spapr_cpu_state(cpu)->icp, mon);
> + }
> +
> + ics_pic_print_info(ics, mon);
> +}
> +
> static void ics_spapr_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> @@ -393,6 +407,7 @@ static void ics_spapr_class_init(ObjectClass *klass, void *data)
> sicc->claim_irq = xics_spapr_claim_irq;
> sicc->free_irq = xics_spapr_free_irq;
> sicc->set_irq = xics_spapr_set_irq;
> + sicc->print_info = xics_spapr_print_info;
> }
>
> static const TypeInfo ics_spapr_info = {
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 795f6ab505..7e04746db1 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4341,7 +4341,7 @@ static void spapr_pic_print_info(InterruptStatsProvider *obj,
> {
> SpaprMachineState *spapr = SPAPR_MACHINE(obj);
>
> - spapr->irq->print_info(spapr, mon);
> + spapr_irq_print_info(spapr, mon);
> monitor_printf(mon, "irqchip: %s\n",
> kvm_irqchip_in_kernel() ? "in-kernel" : "emulated");
> }
> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> index 4922062908..be20bbf3cf 100644
> --- a/hw/ppc/spapr_irq.c
> +++ b/hw/ppc/spapr_irq.c
> @@ -98,19 +98,6 @@ static void spapr_irq_init_kvm(SpaprMachineState *spapr,
> * XICS IRQ backend.
> */
>
> -static void spapr_irq_print_info_xics(SpaprMachineState *spapr, Monitor *mon)
> -{
> - CPUState *cs;
> -
> - CPU_FOREACH(cs) {
> - PowerPCCPU *cpu = POWERPC_CPU(cs);
> -
> - icp_pic_print_info(spapr_cpu_state(cpu)->icp, mon);
> - }
> -
> - ics_pic_print_info(spapr->ics, mon);
> -}
> -
> static int spapr_irq_post_load_xics(SpaprMachineState *spapr, int version_id)
> {
> if (!kvm_irqchip_in_kernel()) {
> @@ -147,7 +134,6 @@ SpaprIrq spapr_irq_xics = {
> .xics = true,
> .xive = false,
>
> - .print_info = spapr_irq_print_info_xics,
> .dt_populate = spapr_dt_xics,
> .post_load = spapr_irq_post_load_xics,
> .reset = spapr_irq_reset_xics,
> @@ -158,20 +144,6 @@ SpaprIrq spapr_irq_xics = {
> * XIVE IRQ backend.
> */
>
> -static void spapr_irq_print_info_xive(SpaprMachineState *spapr,
> - Monitor *mon)
> -{
> - CPUState *cs;
> -
> - CPU_FOREACH(cs) {
> - PowerPCCPU *cpu = POWERPC_CPU(cs);
> -
> - xive_tctx_pic_print_info(spapr_cpu_state(cpu)->tctx, mon);
> - }
> -
> - spapr_xive_pic_print_info(spapr->xive, mon);
> -}
> -
> static int spapr_irq_post_load_xive(SpaprMachineState *spapr, int version_id)
> {
> return spapr_xive_post_load(spapr->xive, version_id);
> @@ -212,7 +184,6 @@ SpaprIrq spapr_irq_xive = {
> .xics = false,
> .xive = true,
>
> - .print_info = spapr_irq_print_info_xive,
> .dt_populate = spapr_dt_xive,
> .post_load = spapr_irq_post_load_xive,
> .reset = spapr_irq_reset_xive,
> @@ -238,11 +209,6 @@ static SpaprIrq *spapr_irq_current(SpaprMachineState *spapr)
> &spapr_irq_xive : &spapr_irq_xics;
> }
>
> -static void spapr_irq_print_info_dual(SpaprMachineState *spapr, Monitor *mon)
> -{
> - spapr_irq_current(spapr)->print_info(spapr, mon);
> -}
> -
> static void spapr_irq_dt_populate_dual(SpaprMachineState *spapr,
> uint32_t nr_servers, void *fdt,
> uint32_t phandle)
> @@ -304,7 +270,6 @@ SpaprIrq spapr_irq_dual = {
> .xics = true,
> .xive = true,
>
> - .print_info = spapr_irq_print_info_dual,
> .dt_populate = spapr_irq_dt_populate_dual,
> .post_load = spapr_irq_post_load_dual,
> .reset = spapr_irq_reset_dual,
> @@ -402,6 +367,14 @@ static void spapr_set_irq(void *opaque, int irq, int level)
> sicc->set_irq(spapr->active_intc, irq, level);
> }
>
> +void spapr_irq_print_info(SpaprMachineState *spapr, Monitor *mon)
> +{
> + SpaprInterruptControllerClass *sicc
> + = SPAPR_INTC_GET_CLASS(spapr->active_intc);
> +
> + sicc->print_info(spapr->active_intc, mon);
> +}
> +
> void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
> {
> MachineState *machine = MACHINE(spapr);
> @@ -720,7 +693,6 @@ SpaprIrq spapr_irq_xics_legacy = {
> .xics = true,
> .xive = false,
>
> - .print_info = spapr_irq_print_info_xics,
> .dt_populate = spapr_dt_xics,
> .post_load = spapr_irq_post_load_xics,
> .reset = spapr_irq_reset_xics,
> diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
> index 8286a9aa63..2ade580992 100644
> --- a/include/hw/ppc/spapr_irq.h
> +++ b/include/hw/ppc/spapr_irq.h
> @@ -59,6 +59,7 @@ typedef struct SpaprInterruptControllerClass {
>
> /* These methods should only be called on the active intc */
> void (*set_irq)(SpaprInterruptController *intc, int irq, int val);
> + void (*print_info)(SpaprInterruptController *intc, Monitor *mon);
> } SpaprInterruptControllerClass;
>
> void spapr_irq_update_active_intc(SpaprMachineState *spapr);
> @@ -81,7 +82,6 @@ typedef struct SpaprIrq {
> bool xics;
> bool xive;
>
> - void (*print_info)(SpaprMachineState *spapr, Monitor *mon);
> void (*dt_populate)(SpaprMachineState *spapr, uint32_t nr_servers,
> void *fdt, uint32_t phandle);
> int (*post_load)(SpaprMachineState *spapr, int version_id);
next prev parent reply other threads:[~2019-09-27 16:49 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
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 [this message]
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=20190927163116.061b7d9a@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).