Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b8cf779 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Jason Cooper
Browse files

irqchip: armada-370-xp: Add helper for the MSI IRQ handling 



Introduce a helper function to handle the MSI interrupts. This makes
the code more readable. In addition, this will allow to introduce a
chained IRQ handler mechanism, which is needed in situations where the
MPIC is used as a slave to another interrupt controller.

Reviewed-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 3efca1d1

drivers/irqchip/irq-armada-370-xp.c

+30 −24
Original line number Diff line number Diff line
@@ -352,29 +352,9 @@ static struct irq_domain_ops armada_370_xp_mpic_irq_ops = { 
	.xlate = irq_domain_xlate_onecell,

};



static asmlinkage void __exception_irq_entry

armada_370_xp_handle_irq(struct pt_regs *regs)

{

	u32 irqstat, irqnr;



	do {

		irqstat = readl_relaxed(per_cpu_int_base +

					ARMADA_370_XP_CPU_INTACK_OFFS);

		irqnr = irqstat & 0x3FF;



		if (irqnr > 1022)

			break;



		if (irqnr > 1) {

			irqnr =	irq_find_mapping(armada_370_xp_mpic_domain,

					irqnr);

			handle_IRQ(irqnr, regs);

			continue;

		}



#ifdef CONFIG_PCI_MSI

		/* MSI handling */

		if (irqnr == 1) {

static void armada_370_xp_handle_msi_irq(struct pt_regs *regs)

{

	u32 msimask, msinr;



	msimask = readl_relaxed(per_cpu_int_base +
@@ -396,8 +376,34 @@ armada_370_xp_handle_irq(struct pt_regs *regs) 
		handle_IRQ(irq, regs);

	}

}

#else

static void armada_370_xp_handle_msi_irq(struct pt_regs *r) {}

#endif



static asmlinkage void __exception_irq_entry

armada_370_xp_handle_irq(struct pt_regs *regs)

{

	u32 irqstat, irqnr;



	do {

		irqstat = readl_relaxed(per_cpu_int_base +

					ARMADA_370_XP_CPU_INTACK_OFFS);

		irqnr = irqstat & 0x3FF;



		if (irqnr > 1022)

			break;



		if (irqnr > 1) {

			irqnr =	irq_find_mapping(armada_370_xp_mpic_domain,

					irqnr);

			handle_IRQ(irqnr, regs);

			continue;

		}



		/* MSI handling */

		if (irqnr == 1)

			armada_370_xp_handle_msi_irq(regs);



#ifdef CONFIG_SMP

		/* IPI Handling */

		if (irqnr == 0) {