[PATCH] sh: intc: Add IRQ trigger bit field check

[PATCH] sh: intc: Add IRQ trigger bit field check

[Magnus Damm]

From: Magnus Damm <damm@opensource.se>

R-Mobile SoCs such as sh73a0 include PINT blocks in INTC
that come with 2-bit IRQ trigger support. Add code to make
sure the bit width is checked so 4-bit only modes like for
instance EDGE_BOTH will fail for PINT.

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

 drivers/sh/intc/chip.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- 0009/drivers/sh/intc/chip.c
+++ work/drivers/sh/intc/chip.c	2011-10-14 11:52:20.000000000 +0900
@@ -202,11 +202,16 @@ static int intc_set_type(struct irq_data
 	if (!value)
 		return -EINVAL;
 
+	value &= ~SENSE_VALID_FLAG;
+
 	ihp = intc_find_irq(d->sense, d->nr_sense, irq);
 	if (ihp) {
+		/* PINT has 2-bit sense registers, should fail on EDGE_BOTH */
+		if (value >= (1 << _INTC_WIDTH(ihp->handle)))
+			return -EINVAL;
+
 		addr = INTC_REG(d, _INTC_ADDR_E(ihp->handle), 0);
-		intc_reg_fns[_INTC_FN(ihp->handle)](addr, ihp->handle,
-						    value & ~SENSE_VALID_FLAG);
+		intc_reg_fns[_INTC_FN(ihp->handle)](addr, ihp->handle, value);
 	}
 
 	return 0;

Re: [PATCH] sh: intc: Add IRQ trigger bit field check

[Paul Mundt]

On Mon, Oct 17, 2011 at 05:59:54PM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
> 
> R-Mobile SoCs such as sh73a0 include PINT blocks in INTC
> that come with 2-bit IRQ trigger support. Add code to make
> sure the bit width is checked so 4-bit only modes like for
> instance EDGE_BOTH will fail for PINT.
> 
> Signed-off-by: Magnus Damm <damm@opensource.se>

Applied, thanks.