blackfin: SEC: clean up SEC interrupt initialization

sonicz · aet00 · commit 86794b43569c · 2012-12-14T11:20:22.000+08:00
Append the SEC IRQ after the IVG6, which is consistent to BF5xx SIC.
Exclude SIC irqchip fucntions from SEC code.
Call handle_fasteoi_irq in SEC error and fault handler.

Signed-off-by: Sonic Zhang &lt;sonic.zhang@analog.com&gt;
Signed-off-by: Bob Liu &lt;lliubbo@gmail.com&gt;
diff --git a/arch/blackfin/include/mach-common/irq.h b/arch/blackfin/include/mach-common/irq.h
@@ -40,8 +40,6 @@
 #define IRQ_HWERR		5	/* Hardware Error */
 #define IRQ_CORETMR		6	/* Core timer */
 
-#define BFIN_IRQ(x)		((x) + 7)
-
 #define IVG7			7
 #define IVG8			8
 #define IVG9			9
@@ -52,6 +50,9 @@
 #define IVG14			14
 #define IVG15			15
 
+#define BFIN_IRQ(x)		((x) + IVG7)
+#define BFIN_SYSIRQ(x)		((x) - IVG7)
+
 #define NR_IRQS			(NR_MACH_IRQS + NR_SPARE_IRQS)
 
 #endif
diff --git a/arch/blackfin/mach-bf609/include/mach/irq.h b/arch/blackfin/mach-bf609/include/mach/irq.h
@@ -9,9 +9,6 @@
 
 #include <mach-common/irq.h>
 
-#undef BFIN_IRQ
-#define BFIN_IRQ(x) ((x) + IVG15)
-
 #define NR_PERI_INTS		(5 * 32)
 
 #define IRQ_SEC_ERR		BFIN_IRQ(0)	/* SEC Error */
diff --git a/arch/blackfin/mach-bf609/pm.c b/arch/blackfin/mach-bf609/pm.c
@@ -174,7 +174,6 @@ void bfin_hibernate_syscontrol(void)
 	bfin_write32(DPM0_RESTORE5, bfin_read32(DPM0_RESTORE5) | 4);
 }
 
-#define IRQ_SID(irq)   ((irq) - IVG15)
 asmlinkage void enter_deepsleep(void);
 
 __attribute__((l1_text))
@@ -311,7 +310,7 @@ static irqreturn_t test_isr(int irq, void *dev_id)
 {
 	printk(KERN_DEBUG "gpio irq %d\n", irq);
 	if (irq == 231)
-		bfin_sec_raise_irq(IRQ_SID(IRQ_SOFT1));
+		bfin_sec_raise_irq(BFIN_SYSIRQ(IRQ_SOFT1));
 	return IRQ_HANDLED;
 }
 
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,6 @@ void bfin_hibernate_syscontrol(void)`
`174`	`174`	`bfin_write32(DPM0_RESTORE5, bfin_read32(DPM0_RESTORE5) \| 4);`
`175`	`175`	`}`
`176`	`176`
`177`		`-#define IRQ_SID(irq) ((irq) - IVG15)`
`178`	`177`	`asmlinkage void enter_deepsleep(void);`
`179`	`178`
`180`	`179`	`__attribute__((l1_text))`
`@@ -311,7 +310,7 @@ static irqreturn_t test_isr(int irq, void *dev_id)`
`311`	`310`	`{`
`312`	`311`	`printk(KERN_DEBUG "gpio irq %d\n", irq);`
`313`	`312`	`if (irq == 231)`
`314`		`- bfin_sec_raise_irq(IRQ_SID(IRQ_SOFT1));`
	`313`	`+ bfin_sec_raise_irq(BFIN_SYSIRQ(IRQ_SOFT1));`
`315`	`314`	`return IRQ_HANDLED;`
`316`	`315`	`}`
`317`	`316`