On Wed, Sep 11, 2019 at 03:39:36PM +0200, Cédric Le Goater wrote: > It will help us to discard interrupt numbers which have not been > claimed in the next patch. > > Signed-off-by: Cédric Le Goater <c...@kaod.org>
Applied to ppc-for-4.2, thanks.
> ---
> include/hw/ppc/xics.h | 5 +++++
> hw/ppc/spapr_irq.c | 9 +++------
> 2 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
> index f2a8d6a4b4f9..64a2c8862a72 100644
> --- a/include/hw/ppc/xics.h
> +++ b/include/hw/ppc/xics.h
> @@ -179,6 +179,11 @@ void ics_simple_write_xive(ICSState *ics, int nr, int
> server,
> uint8_t priority, uint8_t saved_priority);
> void ics_simple_set_irq(void *opaque, int srcno, int val);
>
> +static inline bool ics_irq_free(ICSState *ics, uint32_t srcno)
> +{
> + return !(ics->irqs[srcno].flags & XICS_FLAGS_IRQ_MASK);
> +}
> +
> void ics_set_irq_type(ICSState *ics, int srcno, bool lsi);
> void icp_pic_print_info(ICPState *icp, Monitor *mon);
> void ics_pic_print_info(ICSState *ics, Monitor *mon);
> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> index 06fe2432bae5..d8f46b6797f8 100644
> --- a/hw/ppc/spapr_irq.c
> +++ b/hw/ppc/spapr_irq.c
> @@ -114,9 +114,6 @@ static void spapr_irq_init_xics(SpaprMachineState *spapr,
> int nr_irqs,
> xics_spapr_init(spapr);
> }
>
> -#define ICS_IRQ_FREE(ics, srcno) \
> - (!((ics)->irqs[(srcno)].flags & (XICS_FLAGS_IRQ_MASK)))
> -
> static int spapr_irq_claim_xics(SpaprMachineState *spapr, int irq, bool lsi,
> Error **errp)
> {
> @@ -129,7 +126,7 @@ static int spapr_irq_claim_xics(SpaprMachineState *spapr,
> int irq, bool lsi,
> return -1;
> }
>
> - if (!ICS_IRQ_FREE(ics, irq - ics->offset)) {
> + if (!ics_irq_free(ics, irq - ics->offset)) {
> error_setg(errp, "IRQ %d is not free", irq);
> return -1;
> }
> @@ -147,7 +144,7 @@ static void spapr_irq_free_xics(SpaprMachineState *spapr,
> int irq, int num)
> if (ics_valid_irq(ics, irq)) {
> trace_spapr_irq_free(0, irq, num);
> for (i = srcno; i < srcno + num; ++i) {
> - if (ICS_IRQ_FREE(ics, i)) {
> + if (ics_irq_free(ics, i)) {
> trace_spapr_irq_free_warn(0, i);
> }
> memset(&ics->irqs[i], 0, sizeof(ICSIRQState));
> @@ -767,7 +764,7 @@ static int ics_find_free_block(ICSState *ics, int num,
> int alignnum)
> return -1;
> }
> for (i = first; i < first + num; ++i) {
> - if (!ICS_IRQ_FREE(ics, i)) {
> + if (!ics_irq_free(ics, i)) {
> break;
> }
> }
--
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
signature.asc
Description: PGP signature
