[PATCH v2 6/8] powerpc/xive: Simplify the dump of XIVE interrupts under xmon

[Greg Kurz]

On Wed, 3 Mar 2021 18:48:55 +0100
Cédric Le Goater <clg at kaod.org> wrote:

> Move the xmon routine under XIVE subsystem and rework the loop on the
> interrupts taking into account the xive_irq_domain to filter out IPIs.
> 
> Signed-off-by: Cédric Le Goater <clg at kaod.org>
> ---

Nice again ! :)

Reviewed-by: Greg Kurz <groug at kaod.org>

>  arch/powerpc/include/asm/xive.h   |  1 +
>  arch/powerpc/sysdev/xive/common.c | 14 ++++++++++++++
>  arch/powerpc/xmon/xmon.c          | 28 ++--------------------------
>  3 files changed, 17 insertions(+), 26 deletions(-)
> 
> diff --git a/arch/powerpc/include/asm/xive.h b/arch/powerpc/include/asm/xive.h
> index 9a312b975ca8..aa094a8655b0 100644
> --- a/arch/powerpc/include/asm/xive.h
> +++ b/arch/powerpc/include/asm/xive.h
> @@ -102,6 +102,7 @@ void xive_flush_interrupt(void);
>  /* xmon hook */
>  void xmon_xive_do_dump(int cpu);
>  int xmon_xive_get_irq_config(u32 hw_irq, struct irq_data *d);
> +void xmon_xive_get_irq_all(void);
>  
>  /* APIs used by KVM */
>  u32 xive_native_default_eq_shift(void);
> diff --git a/arch/powerpc/sysdev/xive/common.c b/arch/powerpc/sysdev/xive/common.c
> index 60ebd6f4b31d..f6b7b15bbb3a 100644
> --- a/arch/powerpc/sysdev/xive/common.c
> +++ b/arch/powerpc/sysdev/xive/common.c
> @@ -291,6 +291,20 @@ int xmon_xive_get_irq_config(u32 hw_irq, struct irq_data *d)
>  	return 0;
>  }
>  
> +void xmon_xive_get_irq_all(void)
> +{
> +	unsigned int i;
> +	struct irq_desc *desc;
> +
> +	for_each_irq_desc(i, desc) {
> +		struct irq_data *d = irq_desc_get_irq_data(desc);
> +		unsigned int hwirq = (unsigned int)irqd_to_hwirq(d);
> +
> +		if (d->domain == xive_irq_domain)
> +			xmon_xive_get_irq_config(hwirq, d);
> +	}
> +}
> +
>  #endif /* CONFIG_XMON */
>  
>  static unsigned int xive_get_irq(void)
> diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
> index 3fe37495f63d..80fbf8968f77 100644
> --- a/arch/powerpc/xmon/xmon.c
> +++ b/arch/powerpc/xmon/xmon.c
> @@ -2727,30 +2727,6 @@ static void dump_all_xives(void)
>  		dump_one_xive(cpu);
>  }
>  
> -static void dump_one_xive_irq(u32 num, struct irq_data *d)
> -{
> -	xmon_xive_get_irq_config(num, d);
> -}
> -
> -static void dump_all_xive_irq(void)
> -{
> -	unsigned int i;
> -	struct irq_desc *desc;
> -
> -	for_each_irq_desc(i, desc) {
> -		struct irq_data *d = irq_desc_get_irq_data(desc);
> -		unsigned int hwirq;
> -
> -		if (!d)
> -			continue;
> -
> -		hwirq = (unsigned int)irqd_to_hwirq(d);
> -		/* IPIs are special (HW number 0) */
> -		if (hwirq)
> -			dump_one_xive_irq(hwirq, d);
> -	}
> -}
> -
>  static void dump_xives(void)
>  {
>  	unsigned long num;
> @@ -2767,9 +2743,9 @@ static void dump_xives(void)
>  		return;
>  	} else if (c == 'i') {
>  		if (scanhex(&num))
> -			dump_one_xive_irq(num, NULL);
> +			xmon_xive_get_irq_config(num, NULL);
>  		else
> -			dump_all_xive_irq();
> +			xmon_xive_get_irq_all();
>  		return;
>  	}
>