[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 15/34] spapr: Handle freeing of multiple irqs in frontend
From: |
Cédric Le Goater |
Subject: |
Re: [PATCH v3 15/34] spapr: Handle freeing of multiple irqs in frontend only |
Date: |
Wed, 2 Oct 2019 07:55:55 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.0 |
On 02/10/2019 04:51, David Gibson wrote:
> spapr_irq_free() can be used to free multiple irqs at once. That's useful
> for its callers, but there's no need to make the individual backend hooks
> handle this. We can loop across the irqs in spapr_irq_free() itself and
> have the hooks just do one at time.
>
> Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Cédric Le Goater <address@hidden>
> ---
> hw/ppc/spapr_irq.c | 27 ++++++++++++---------------
> include/hw/ppc/spapr_irq.h | 2 +-
> 2 files changed, 13 insertions(+), 16 deletions(-)
>
> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> index 9919910a86..d2ac35bbe1 100644
> --- a/hw/ppc/spapr_irq.c
> +++ b/hw/ppc/spapr_irq.c
> @@ -133,16 +133,13 @@ static int spapr_irq_claim_xics(SpaprMachineState
> *spapr, int irq, bool lsi,
> return 0;
> }
>
> -static void spapr_irq_free_xics(SpaprMachineState *spapr, int irq, int num)
> +static void spapr_irq_free_xics(SpaprMachineState *spapr, int irq)
> {
> ICSState *ics = spapr->ics;
> uint32_t srcno = irq - ics->offset;
> - int i;
>
> if (ics_valid_irq(ics, irq)) {
> - for (i = srcno; i < srcno + num; ++i) {
> - memset(&ics->irqs[i], 0, sizeof(ICSIRQState));
> - }
> + memset(&ics->irqs[srcno], 0, sizeof(ICSIRQState));
> }
> }
>
> @@ -269,13 +266,9 @@ static int spapr_irq_claim_xive(SpaprMachineState
> *spapr, int irq, bool lsi,
> return 0;
> }
>
> -static void spapr_irq_free_xive(SpaprMachineState *spapr, int irq, int num)
> +static void spapr_irq_free_xive(SpaprMachineState *spapr, int irq)
> {
> - int i;
> -
> - for (i = irq; i < irq + num; ++i) {
> - spapr_xive_irq_free(spapr->xive, i);
> - }
> + spapr_xive_irq_free(spapr->xive, irq);
> }
>
> static void spapr_irq_print_info_xive(SpaprMachineState *spapr,
> @@ -433,10 +426,10 @@ static int spapr_irq_claim_dual(SpaprMachineState
> *spapr, int irq, bool lsi,
> return ret;
> }
>
> -static void spapr_irq_free_dual(SpaprMachineState *spapr, int irq, int num)
> +static void spapr_irq_free_dual(SpaprMachineState *spapr, int irq)
> {
> - spapr_irq_xics.free(spapr, irq, num);
> - spapr_irq_xive.free(spapr, irq, num);
> + spapr_irq_xics.free(spapr, irq);
> + spapr_irq_xive.free(spapr, irq);
> }
>
> static void spapr_irq_print_info_dual(SpaprMachineState *spapr, Monitor *mon)
> @@ -635,7 +628,11 @@ int spapr_irq_claim(SpaprMachineState *spapr, int irq,
> bool lsi, Error **errp)
>
> void spapr_irq_free(SpaprMachineState *spapr, int irq, int num)
> {
> - spapr->irq->free(spapr, irq, num);
> + int i;
> +
> + for (i = irq; i < (irq + num); i++) {
> + spapr->irq->free(spapr, i);
> + }
> }
>
> qemu_irq spapr_qirq(SpaprMachineState *spapr, int irq)
> diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
> index 9b60378e28..ed88b4599a 100644
> --- a/include/hw/ppc/spapr_irq.h
> +++ b/include/hw/ppc/spapr_irq.h
> @@ -43,7 +43,7 @@ typedef struct SpaprIrq {
>
> void (*init)(SpaprMachineState *spapr, Error **errp);
> int (*claim)(SpaprMachineState *spapr, int irq, bool lsi, Error **errp);
> - void (*free)(SpaprMachineState *spapr, int irq, int num);
> + void (*free)(SpaprMachineState *spapr, int irq);
> void (*print_info)(SpaprMachineState *spapr, Monitor *mon);
> void (*dt_populate)(SpaprMachineState *spapr, uint32_t nr_servers,
> void *fdt, uint32_t phandle);
>
- Re: [PATCH v3 23/34] spapr, xics, xive: Move irq claim and free from SpaprIrq to SpaprInterruptController, (continued)
- Re: [PATCH v3 23/34] spapr, xics, xive: Move irq claim and free from SpaprIrq to SpaprInterruptController, Cédric Le Goater, 2019/10/02
- Re: [PATCH v3 23/34] spapr, xics, xive: Move irq claim and free from SpaprIrq to SpaprInterruptController, Greg Kurz, 2019/10/02
- Re: [PATCH v3 23/34] spapr, xics, xive: Move irq claim and free from SpaprIrq to SpaprInterruptController, Cédric Le Goater, 2019/10/02
- [PATCH v3 03/34] xics: Rename misleading ics_simple_*() functions, David Gibson, 2019/10/01
- [PATCH v3 08/34] spapr: Replace spapr_vio_qirq() helper with spapr_vio_irq_pulse() helper, David Gibson, 2019/10/01
- [PATCH v3 11/34] spapr: Fix indexing of XICS irqs, David Gibson, 2019/10/01
- [PATCH v3 15/34] spapr: Handle freeing of multiple irqs in frontend only, David Gibson, 2019/10/01
- [PATCH v3 05/34] xics: Merge TYPE_ICS_BASE and TYPE_ICS_SIMPLE classes, David Gibson, 2019/10/01
- [PATCH v3 24/34] spapr: Formalize notion of active interrupt controller, David Gibson, 2019/10/01
- [PATCH v3 10/34] spapr: Eliminate nr_irqs parameter to SpaprIrq::init, David Gibson, 2019/10/01
- [PATCH v3 19/34] spapr: Add return value to spapr_irq_check(), David Gibson, 2019/10/01
- [PATCH v3 12/34] spapr: Simplify spapr_qirq() handling, David Gibson, 2019/10/01
- [PATCH v3 16/34] spapr, xics, xive: Better use of assert()s on irq claim/free paths, David Gibson, 2019/10/01
- [PATCH v3 09/34] spapr: Clarify and fix handling of nr_irqs, David Gibson, 2019/10/01