Commit a551e4f7 authored by Eric Miao's avatar Eric Miao
Browse files

ARM: pxa: introduce {icip,ichp}_handle_irq() to prepare MULTI_IRQ_HANDLER 



Thanks Dmitry for providing a fix to the original code.

Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
parent 5d284e35

arch/arm/mach-pxa/include/mach/irqs.h

+3 −0
Original line number Diff line number Diff line
@@ -106,9 +106,12 @@ 


#ifndef __ASSEMBLY__

struct irq_data;

struct pt_regs;



void pxa_mask_irq(struct irq_data *);

void pxa_unmask_irq(struct irq_data *);

void icip_handle_irq(struct pt_regs *);

void ichp_handle_irq(struct pt_regs *);

#endif



#endif /* __ASM_MACH_IRQS_H */

arch/arm/mach-pxa/irq.c

+32 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
#define IPR(i)			(((i) < 32) ? (0x01c + ((i) << 2)) :		\

				((i) < 64) ? (0x0b0 + (((i) - 32) << 2)) :	\

				      (0x144 + (((i) - 64) << 2)))

#define ICHP_VAL_IRQ		(1 << 31)

#define ICHP_IRQ(i)		(((i) >> 16) & 0x7fff)

#define IPR_VALID		(1 << 31)

#define IRQ_BIT(n)		(((n) - PXA_IRQ(0)) & 0x1f)
@@ -127,6 +129,36 @@ static struct irq_chip pxa_low_gpio_chip = { 
	.irq_set_type	= pxa_set_low_gpio_type,

};



asmlinkage void __exception_irq_entry icip_handle_irq(struct pt_regs *regs)

{

	uint32_t icip, icmr, mask;



	do {

		icip = __raw_readl(IRQ_BASE + ICIP);

		icmr = __raw_readl(IRQ_BASE + ICMR);

		mask = icip & icmr;



		if (mask == 0)

			break;



		handle_IRQ(PXA_IRQ(fls(mask) - 1), regs);

	} while (1);

}



asmlinkage void __exception_irq_entry ichp_handle_irq(struct pt_regs *regs)

{

	uint32_t ichp;



	do {

		__asm__ __volatile__("mrc p6, 0, %0, c5, c0, 0\n": "=r"(ichp));



		if ((ichp & ICHP_VAL_IRQ) == 0)

			break;



		handle_IRQ(PXA_IRQ(ICHP_IRQ(ichp)), regs);

	} while (1);

}



static void __init pxa_init_low_gpio_irq(set_wake_t fn)

{

	int irq;