[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 25/33] spapr, xics, xive: Move print_info from SpaprIrq to
From: |
Greg Kurz |
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 |
On Fri, 27 Sep 2019 15:50:20 +1000
David Gibson <address@hidden> 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 <address@hidden>
> ---
Reviewed-by: Greg Kurz <address@hidden>
> 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);
- Re: [PATCH v2 23/33] spapr: Formalize notion of active interrupt controller, (continued)
- [PATCH v2 19/33] spapr: Eliminate SpaprIrq::init hook, David Gibson, 2019/09/27
- [PATCH v2 24/33] spapr, xics, xive: Move set_irq from SpaprIrq to SpaprInterruptController, David Gibson, 2019/09/27
- Re: [PATCH v2 24/33] spapr, xics, xive: Move set_irq from SpaprIrq to SpaprInterruptController, Greg Kurz, 2019/09/27
- Re: [PATCH v2 24/33] spapr, xics, xive: Move set_irq from SpaprIrq to SpaprInterruptController, David Gibson, 2019/09/30
- Re: [PATCH v2 24/33] spapr, xics, xive: Move set_irq from SpaprIrq to SpaprInterruptController, Greg Kurz, 2019/09/30
- Re: [PATCH v2 24/33] spapr, xics, xive: Move set_irq from SpaprIrq to SpaprInterruptController, David Gibson, 2019/09/30
- Re: [PATCH v2 24/33] spapr, xics, xive: Move set_irq from SpaprIrq to SpaprInterruptController, Cédric Le Goater, 2019/09/30
[PATCH v2 25/33] spapr, xics, xive: Move print_info from SpaprIrq to SpaprInterruptController, David Gibson, 2019/09/27
- Re: [PATCH v2 25/33] spapr, xics, xive: Move print_info from SpaprIrq to SpaprInterruptController,
Greg Kurz <=
[PATCH v2 28/33] spapr: Remove SpaprIrq::init_kvm hook, David Gibson, 2019/09/27
[PATCH v2 27/33] spapr, xics, xive: Match signatures for XICS and XIVE KVM connect routines, David Gibson, 2019/09/27
[PATCH v2 29/33] spapr, xics, xive: Move SpaprIrq::reset hook logic into activate/deactivate, David Gibson, 2019/09/27