Skip to content

Commit 5159d98

Browse files
legoatermpe
authored andcommitted
powerpc/xive: Simplify xive_core_debug_show()
Now that the IPI interrupt has its own domain, the checks on the HW interrupt number XIVE_IPI_HW_IRQ and on the chip can be replaced by a check on the domain. Signed-off-by: Cédric Le Goater <[email protected]> Reviewed-by: Greg Kurz <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 1835e72 commit 5159d98

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

arch/powerpc/sysdev/xive/common.c

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1604,17 +1604,14 @@ static void xive_debug_show_cpu(struct seq_file *m, int cpu)
16041604
seq_puts(m, "\n");
16051605
}
16061606

1607-
static void xive_debug_show_irq(struct seq_file *m, u32 hw_irq, struct irq_data *d)
1607+
static void xive_debug_show_irq(struct seq_file *m, struct irq_data *d)
16081608
{
1609-
struct irq_chip *chip = irq_data_get_irq_chip(d);
1609+
unsigned int hw_irq = (unsigned int)irqd_to_hwirq(d);
16101610
int rc;
16111611
u32 target;
16121612
u8 prio;
16131613
u32 lirq;
16141614

1615-
if (!is_xive_irq(chip))
1616-
return;
1617-
16181615
rc = xive_ops->get_irq_config(hw_irq, &target, &prio, &lirq);
16191616
if (rc) {
16201617
seq_printf(m, "IRQ 0x%08x : no config rc=%d\n", hw_irq, rc);
@@ -1652,16 +1649,9 @@ static int xive_core_debug_show(struct seq_file *m, void *private)
16521649

16531650
for_each_irq_desc(i, desc) {
16541651
struct irq_data *d = irq_desc_get_irq_data(desc);
1655-
unsigned int hw_irq;
1656-
1657-
if (!d)
1658-
continue;
1659-
1660-
hw_irq = (unsigned int)irqd_to_hwirq(d);
16611652

1662-
/* IPIs are special (HW number 0) */
1663-
if (hw_irq != XIVE_IPI_HW_IRQ)
1664-
xive_debug_show_irq(m, hw_irq, d);
1653+
if (d->domain == xive_irq_domain)
1654+
xive_debug_show_irq(m, d);
16651655
}
16661656
return 0;
16671657
}

0 commit comments

Comments
 (0)