From: Tony Lindgren <tony@atomide.com>
Date: Tue, 21 Oct 2008 22:04:30 +0000 (-0700)
Subject: Revert "OMAP3: ack spurious IRQs in get_irqnr_and_base"
X-Git-Tag: v2.6.27-omap1~6
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=4b20de38df8f58a433dfad5d9589b4f799d972ad

Revert "OMAP3: ack spurious IRQs in get_irqnr_and_base"

This reverts commit 3da0e10243d075b905dfa8f1b4a6cb3694ab2ce0.

The real bug behind this issue is the fact that we're not
masking out the SPURIOUSIRQFLAG bits [31:7] from the active
interrupt number. The following patch will replace this
patch with the fix.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/plat-omap/include/mach/entry-macro.S b/arch/arm/plat-omap/include/mach/entry-macro.S
index c88a4cb52e2..a8fca9d9845 100644
--- a/arch/arm/plat-omap/include/mach/entry-macro.S
+++ b/arch/arm/plat-omap/include/mach/entry-macro.S
@@ -87,26 +87,7 @@
 		ldr	\irqnr, [\base, #0xd8] /* IRQ pending reg 3 */
 		cmp	\irqnr, #0x0
 2222:
-#if defined(CONFIG_ARCH_OMAP34XX)
-		mov	\tmp, \irqnr
-#endif
- 		ldrne	\irqnr, [\base, #INTCPS_SIR_IRQ_OFFSET]
-#if defined(CONFIG_ARCH_OMAP34XX)
-		mov	\irqstat, \irqnr
-		bic	\irqstat, \irqstat, #0x7f /* check for spurious flag */
-		cmp	\irqstat, #0x0
-		beq	2223f
-		mov	\irqstat, #0x1 /* Ack the spurious irq, this lets it
-					* generate a bad irq error message,
-					* but prevents infinitely repeating
-					* irq.
-					*/
-		str	\irqstat, [\base, #0x48] /* INTC_CONTROL register */
-2223:
-		cmp	\tmp, #0x0 /* set conditional back to what it was
-				    * before spurious test
-				    */
-#endif
+		ldrne	\irqnr, [\base, #INTCPS_SIR_IRQ_OFFSET]
 
 		.endm