diff options
| author | Lennert Buytenhek | 2008-08-26 16:04:05 +0200 |
|---|---|---|
| committer | Nicolas Pitre | 2008-09-25 22:26:44 +0200 |
| commit | 1f8081f539a80c3d36a17ecd094d104eae60c01c (patch) | |
| tree | 506a9455a96a7932ee01a7c4ea1432668e50eed3 /arch/arm/mach-mv78xx0/include/mach/entry-macro.S | |
| parent | [ARM] Kirkwood: wire up ethernet error interrupt (diff) | |
| download | kernel-qcow2-linux-1f8081f539a80c3d36a17ecd094d104eae60c01c.tar.gz kernel-qcow2-linux-1f8081f539a80c3d36a17ecd094d104eae60c01c.tar.xz kernel-qcow2-linux-1f8081f539a80c3d36a17ecd094d104eae60c01c.zip | |
[ARM] mv78xx0: wire up ethernet error interrupt
Wire up the ethernet port's error interrupt so that the
mv643xx_eth driver can sleep for SMI event completion instead of
having to busy-wait for it.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'arch/arm/mach-mv78xx0/include/mach/entry-macro.S')
| -rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/entry-macro.S | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/arch/arm/mach-mv78xx0/include/mach/entry-macro.S b/arch/arm/mach-mv78xx0/include/mach/entry-macro.S index ed4a46bcd3b0..fbfb2693ce6c 100644 --- a/arch/arm/mach-mv78xx0/include/mach/entry-macro.S +++ b/arch/arm/mach-mv78xx0/include/mach/entry-macro.S @@ -26,14 +26,22 @@ ldr \tmp, [\base, #IRQ_MASK_LOW_OFF] mov \irqnr, #31 ands \irqstat, \irqstat, \tmp + bne 1001f @ if no low interrupts set, check high interrupts - ldreq \irqstat, [\base, #IRQ_CAUSE_HIGH_OFF] - ldreq \tmp, [\base, #IRQ_MASK_HIGH_OFF] - moveq \irqnr, #63 - andeqs \irqstat, \irqstat, \tmp + ldr \irqstat, [\base, #IRQ_CAUSE_HIGH_OFF] + ldr \tmp, [\base, #IRQ_MASK_HIGH_OFF] + mov \irqnr, #63 + ands \irqstat, \irqstat, \tmp + bne 1001f + + @ if no high interrupts set, check error interrupts + ldr \irqstat, [\base, #IRQ_CAUSE_ERR_OFF] + ldr \tmp, [\base, #IRQ_MASK_ERR_OFF] + mov \irqnr, #95 + ands \irqstat, \irqstat, \tmp @ find first active interrupt source - clzne \irqstat, \irqstat +1001: clzne \irqstat, \irqstat subne \irqnr, \irqnr, \irqstat .endm |