[PATCH 2/2] rb532: check irq number when handling GPIO interrupts

[PATCH 2/2] rb532: check irq number when handling GPIO interrupts

[Florian Fainelli]

This patch makes sure that we are not going to clear
or change the interrupt status of a GPIO interrupt
superior to 13 as this is the maximum number of GPIO
interrupt source (p.232 of the RC32434 reference manual).

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
diff --git a/arch/mips/rb532/irq.c b/arch/mips/rb532/irq.c
index 53eeb5e..afdcafc 100644
--- a/arch/mips/rb532/irq.c
+++ b/arch/mips/rb532/irq.c
@@ -151,7 +151,8 @@ static void rb532_disable_irq(unsigned int irq_nr)
 		mask |= intr_bit;
 		WRITE_MASK(addr, mask);
 
-		if (group == GPIO_MAPPED_IRQ_GROUP)
+		/* There is a maximum of 13 GPIO interrupts */
+		if (group == GPIO_MAPPED_IRQ_GROUP && irq_nr <= (GROUP4_IRQ_BASE + 13))
 			rb532_gpio_set_istat(0, irq_nr - GPIO_MAPPED_IRQ_BASE);
 
 		/*
@@ -174,7 +175,7 @@ static int rb532_set_type(unsigned int irq_nr, unsigned type)
 	int gpio = irq_nr - GPIO_MAPPED_IRQ_BASE;
 	int group = irq_to_group(irq_nr);
 
-	if (group != GPIO_MAPPED_IRQ_GROUP)
+	if (group != GPIO_MAPPED_IRQ_GROUP || irq_nr > (GROUP4_IRQ_BASE + 13))
 		return (type == IRQ_TYPE_LEVEL_HIGH) ? 0 : -EINVAL;
 
 	switch (type) {

Re: [PATCH 2/2] rb532: check irq number when handling GPIO interrupts

[Sergei Shtylyov]

Hello.

Florian Fainelli wrote:

> This patch makes sure that we are not going to clear
> or change the interrupt status of a GPIO interrupt
> superior to 13 as this is the maximum number of GPIO
> interrupt source (p.232 of the RC32434 reference manual).

> Signed-off-by: Florian Fainelli <florian@openwrt.org>
> ---
> diff --git a/arch/mips/rb532/irq.c b/arch/mips/rb532/irq.c
> index 53eeb5e..afdcafc 100644
> --- a/arch/mips/rb532/irq.c
> +++ b/arch/mips/rb532/irq.c
> @@ -151,7 +151,8 @@ static void rb532_disable_irq(unsigned int irq_nr)
>  		mask |= intr_bit;
>  		WRITE_MASK(addr, mask);
>  
> -		if (group == GPIO_MAPPED_IRQ_GROUP)
> +		/* There is a maximum of 13 GPIO interrupts */
> +		if (group == GPIO_MAPPED_IRQ_GROUP && irq_nr <= (GROUP4_IRQ_BASE + 13))

    So, 13 or 14? The code seem to allow 14. Probably it should be <, not <= 
here...

>  			rb532_gpio_set_istat(0, irq_nr - GPIO_MAPPED_IRQ_BASE);
>  
>  		/*
> @@ -174,7 +175,7 @@ static int rb532_set_type(unsigned int irq_nr, unsigned type)
>  	int gpio = irq_nr - GPIO_MAPPED_IRQ_BASE;
>  	int group = irq_to_group(irq_nr);
>  
> -	if (group != GPIO_MAPPED_IRQ_GROUP)
> +	if (group != GPIO_MAPPED_IRQ_GROUP || irq_nr > (GROUP4_IRQ_BASE + 13))

    ... and >= here.

>  		return (type == IRQ_TYPE_LEVEL_HIGH) ? 0 : -EINVAL;
>  
>  	switch (type) {

WBR, Sergei

Re: [PATCH 2/2] rb532: check irq number when handling GPIO interrupts

[Florian Fainelli]

Le Thursday 21 May 2009 20:52:13 Sergei Shtylyov, vous avez écrit :
> Hello.
>
> Florian Fainelli wrote:
> > This patch makes sure that we are not going to clear
> > or change the interrupt status of a GPIO interrupt
> > superior to 13 as this is the maximum number of GPIO
> > interrupt source (p.232 of the RC32434 reference manual).
> >
> > Signed-off-by: Florian Fainelli <florian@openwrt.org>
> > ---
> > diff --git a/arch/mips/rb532/irq.c b/arch/mips/rb532/irq.c
> > index 53eeb5e..afdcafc 100644
> > --- a/arch/mips/rb532/irq.c
> > +++ b/arch/mips/rb532/irq.c
> > @@ -151,7 +151,8 @@ static void rb532_disable_irq(unsigned int irq_nr)
> >  		mask |= intr_bit;
> >  		WRITE_MASK(addr, mask);
> >
> > -		if (group == GPIO_MAPPED_IRQ_GROUP)
> > +		/* There is a maximum of 13 GPIO interrupts */
> > +		if (group == GPIO_MAPPED_IRQ_GROUP && irq_nr <= (GROUP4_IRQ_BASE +
> > 13))
>
>     So, 13 or 14? The code seem to allow 14. Probably it should be <, not
> <= here...

That's actually 14, numbering starting from 0, I should learn how to count. 
Ralf, do you want me to resubmit that one with the proper message / 
descriptions ?

>
> >  			rb532_gpio_set_istat(0, irq_nr - GPIO_MAPPED_IRQ_BASE);
> >
> >  		/*
> > @@ -174,7 +175,7 @@ static int rb532_set_type(unsigned int irq_nr,
> > unsigned type) int gpio = irq_nr - GPIO_MAPPED_IRQ_BASE;
> >  	int group = irq_to_group(irq_nr);
> >
> > -	if (group != GPIO_MAPPED_IRQ_GROUP)
> > +	if (group != GPIO_MAPPED_IRQ_GROUP || irq_nr > (GROUP4_IRQ_BASE + 13))
>
>     ... and >= here.
>
> >  		return (type == IRQ_TYPE_LEVEL_HIGH) ? 0 : -EINVAL;
> >
> >  	switch (type) {
>
> WBR, Sergei



-- 
Best regards, Florian Fainelli
Email : florian@openwrt.org
http://openwrt.org
-------------------------------

Re: [PATCH 2/2] rb532: check irq number when handling GPIO interrupts

[Ralf Baechle]

On Fri, May 22, 2009 at 07:03:28AM +0200, Florian Fainelli wrote:

> That's actually 14, numbering starting from 0, I should learn how to count. 
> Ralf, do you want me to resubmit that one with the proper message / 
> descriptions ?
> 
> >
> > >  			rb532_gpio_set_istat(0, irq_nr - GPIO_MAPPED_IRQ_BASE);
> > >
> > >  		/*
> > > @@ -174,7 +175,7 @@ static int rb532_set_type(unsigned int irq_nr,
> > > unsigned type) int gpio = irq_nr - GPIO_MAPPED_IRQ_BASE;
> > >  	int group = irq_to_group(irq_nr);
> > >
> > > -	if (group != GPIO_MAPPED_IRQ_GROUP)
> > > +	if (group != GPIO_MAPPED_IRQ_GROUP || irq_nr > (GROUP4_IRQ_BASE + 13))
> >
> >     ... and >= here.
> >
> > >  		return (type == IRQ_TYPE_LEVEL_HIGH) ? 0 : -EINVAL;
> > >
> > >  	switch (type) {

Queued for 2.6.31 with the comment fix and the change from > to >=.

Thanks,

  Ralf