powerpc/xmon: Improve output of XIVE commands
cover powerpc/xmon: Improve output of XIVE commands
Hello,
This series extend the interrupt command output with the PQ bit value and reworks the CPU command output to check that a CPU is started.
Thanks,
C.
Cédric Le Goater (2):
powerpc/xmon: Improve output of XIVE interrupts
powerpc/xmon: Fix output of XIVE IPI
arch/powerpc/include/asm/xive.h | 3 +- arch/powerpc/sysdev/xive/common.c | 56 +++++++++++++++++++++++-------- arch/powerpc/xmon/xmon.c | 15 +++------ 3 files changed, 47 insertions(+), 27 deletions(-)
Signature · 1 line
2.21.0
PATCH 1/2 powerpc/xmon: Improve output of XIVE interrupts
When looping on the list of interrupts, add the current value of the PQ bits with a load on the ESB page. This has the side effect of faulting the ESB page of all interrupts.
--- arch/powerpc/include/asm/xive.h | 3 +-- arch/powerpc/sysdev/xive/common.c | 29 ++++++++++++++++++++++++++--- arch/powerpc/xmon/xmon.c | 15 ++++----------- 3 files changed, 31 insertions(+), 16 deletions(-)
arch/powerpc/include/asm/xive.h +1 -2
@@ -99,8 +99,7 @@ extern void xive_flush_interrupt(void);/* xmon hook */ extern void xmon_xive_do_dump (int cpu); -extern int xmon_xive_get_irq_config (u32 irq,u32 *target,u8 *prio, -u32 *sw_irq); +extern int xmon_xive_get_irq_config (u32 hw_irq,struct irq_data *d);/* APIs used by KVM */ extern u32 xive_native_default_eq_shift (void );
arch/powerpc/sysdev/xive/common.c +26 -3
@@ -258,10 +258,33 @@ notrace void xmon_xive_do_dump(int cpu)#endif } -int xmon_xive_get_irq_config (u32 irq,u32 *target,u8 *prio, -u32 *sw_irq) +int xmon_xive_get_irq_config (u32 hw_irq,struct irq_data *d) { -return xive_ops->get_irq_config (irq, target, prio, sw_irq); +int rc; +u32 target; +u8 prio; +u32 lirq; + + rc = xive_ops->get_irq_config (hw_irq, &target, &prio, &lirq); +if (rc) { +xmon_printf ("IRQ 0x%08x : no config rc=%d\n" , hw_irq, rc); +return rc; + } + +xmon_printf ("IRQ 0x%08x : target=0x%x prio=%02x lirq=0x%x " , + hw_irq, target, prio, lirq); + +if (d) { +struct xive_irq_data *xd =irq_data_get_irq_handler_data (d); +u64 val =xive_esb_read (xd,XIVE_ESB_GET ); + +xmon_printf ("PQ=%c%c" , + val &XIVE_ESB_VAL_P ?'P' :'-' , + val &XIVE_ESB_VAL_Q ?'Q' :'-' ); + } + +xmon_printf ("\n" ); +return 0 ; }#endif /* CONFIG_XMON */
arch/powerpc/xmon/xmon.c +4 -11
@@ -2572,16 +2572,9 @@ static void dump_all_xives(void)dump_one_xive (cpu); } -static void dump_one_xive_irq (u32 num) +static void dump_one_xive_irq (u32 num,struct irq_data *d) { -int rc; -u32 target; -u8 prio; -u32 lirq; - - rc =xmon_xive_get_irq_config (num, &target, &prio, &lirq); -xmon_printf ("IRQ 0x%08x : target=0x%x prio=%d lirq=0x%x (rc=%d)\n" , - num, target, prio, lirq, rc); +xmon_xive_get_irq_config (num, d); }static void dump_all_xive_irq (void )
@@ -2599,7 +2592,7 @@ static void dump_all_xive_irq(void) hwirq = (unsigned int )irqd_to_hwirq (d);/* IPIs are special (HW number 0) */ if (hwirq) -dump_one_xive_irq (hwirq); +dump_one_xive_irq (hwirq, d); } }
@@ -2619,7 +2612,7 @@ static void dump_xives(void)return ; }else if (c =='i' ) {if (scanhex (&num)) -dump_one_xive_irq (num); +dump_one_xive_irq (num,NULL );else dump_all_xive_irq ();return ;
Signature · 1 line
2.21.0
Re: [PATCH 1/2] powerpc/xmon: Improve output of XIVE interrupts
Quoted 5 lines · On Tue, 2019-09-10 at 08:18:49 UTC, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= wrote:
When looping on the list of interrupts, add the current value of the PQ bits with a load on the ESB page. This has the side effect of faulting the ESB page of all interrupts.
Signed-off-by Cédric Le Goater <[email protected]>
Series applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/5896163f7f91c0560cc41908c808661eee4c4121
cheers
PATCH 2/2 powerpc/xmon: Fix output of XIVE IPI
In reply to Cédric Le GoaterWhen dumping the XIVE state of an CPU IPI, xmon does not check if the CPU is started or not which can cause an error. Add a check for that and change the output to be on one line just as the XIVE interrupts of the machine.
--- arch/powerpc/sysdev/xive/common.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-)
arch/powerpc/sysdev/xive/common.c +16 -11
@@ -237,25 +237,30 @@ static notrace void xive_dump_eq(const char *name, struct xive_q *q) i0 =be32_to_cpup (q->qpage + idx); idx = (idx +1 ) & q->msk; i1 =be32_to_cpup (q->qpage + idx); -xmon_printf (" %s Q T=%d %08x %08x ...\n" , name, - q->toggle, i0, i1); +xmon_printf ("%s idx=%d T=%d %08x %08x ..." , name, + q->idx, q->toggle, i0, i1); } notrace void xmon_xive_do_dump(int cpu) {struct xive_cpu *xc =per_cpu (xive_cpu, cpu); -xmon_printf ("XIVE state for CPU %d:\n" , cpu); -xmon_printf (" pp=%02x cppr=%02x\n" , xc->pending_prio, xc->cppr); -xive_dump_eq ("IRQ" , &xc->queue[xive_irq_priority]); +xmon_printf ("CPU %d:" , cpu); +if (xc) { +xmon_printf ("pp=%02x CPPR=%02x " , xc->pending_prio, xc->cppr); +#ifdef CONFIG_SMP - { -u64 val =xive_esb_read (&xc->ipi_data,XIVE_ESB_GET ); -xmon_printf (" IPI state: %x:%c%c\n" , xc->hw_ipi, - val &XIVE_ESB_VAL_P ?'P' :'p' , - val &XIVE_ESB_VAL_Q ?'Q' :'q' ); - } + { +u64 val =xive_esb_read (&xc->ipi_data,XIVE_ESB_GET ); + +xmon_printf ("IPI=0x%08x PQ=%c%c " , xc->hw_ipi, + val &XIVE_ESB_VAL_P ?'P' :'-' , + val &XIVE_ESB_VAL_Q ?'Q' :'-' ); + }#endif +xive_dump_eq ("EQ" , &xc->queue[xive_irq_priority]); + } +xmon_printf ("\n" ); }int xmon_xive_get_irq_config (u32 hw_irq,struct irq_data *d)
Signature · 1 line
2.21.0