[PATCH] sh: extend INTC with force_disable

[PATCH] sh: extend INTC with force_disable

[Magnus Damm]

From: Magnus Damm <damm@opensource.se>

Extend the shared INTC code with force_disable support to
allow keeping mask bits statically disabled. Needed for
SDHI support to mask out unsupported interrupt sources.

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 drivers/sh/intc.c       |    3 +++
 include/linux/sh_intc.h |    1 +
 2 files changed, 4 insertions(+)

--- 0001/drivers/sh/intc.c
+++ work/drivers/sh/intc.c	2010-02-15 20:03:32.000000000 +0900
@@ -851,6 +851,9 @@ void __init register_intc_controller(str
 		d->chip.mask_ack = intc_mask_ack;
 	}
 
+	/* disable bits matching force_disable before registering irqs */
+	if (desc->force_disable)
+		intc_enable_disable_enum(desc, d, desc->force_disable, 0);
 
 	/* disable bits matching force_enable before registering irqs */
 	if (desc->force_enable)
--- 0001/include/linux/sh_intc.h
+++ work/include/linux/sh_intc.h	2010-02-15 20:03:32.000000000 +0900
@@ -72,6 +72,7 @@ struct intc_hw_desc {
 struct intc_desc {
 	char *name;
 	intc_enum force_enable;
+	intc_enum force_disable;
 	struct intc_hw_desc hw;
 };
 

Re: [PATCH] sh: extend INTC with force_disable

[Paul Mundt]

On Mon, Feb 15, 2010 at 08:40:25PM +0900, Magnus Damm wrote:
> Extend the shared INTC code with force_disable support to
> allow keeping mask bits statically disabled. Needed for
> SDHI support to mask out unsupported interrupt sources.

On Mon, Feb 15, 2010 at 08:53:43PM +0900, Magnus Damm wrote:
> Update the sh7724 INTC tables with force_enable support
> to mask out pending unsupported SDHI interrupt sources.
> 
> Without this patch the kernel locks up due to a pending
> SDHI interrupt that the tmio_mmc driver cannot handle.

Both applied, thanks.