[PATCH] fix build failures on msp_irq_slp.c

[PATCH] fix build failures on msp_irq_slp.c

[Florian Fainelli]

[-- Attachment #1: Type: text/plain, Size: 1097 bytes --]

Trying to build MSP4200 VoIP defconfig also fails on msp_irq_slp.c
with a non-existing reference to mask_slp_irq, which is in turn
mask_msp_slp_irq. Passed that, we will also miss a comma when
calling set_irq_chip_and_handler. This patch fixes both issues.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c b/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
index f5f1b8d..66f6f85 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
@@ -45,7 +45,7 @@ static inline void mask_msp_slp_irq(unsigned int irq)
  */
 static inline void ack_msp_slp_irq(unsigned int irq)
 {
-	mask_slp_irq(irq);
+	mask_msp_slp_irq(irq);
 
 	/*
 	 * only really necessary for 18, 16-14 and sometimes 3:0 (since
@@ -79,7 +79,7 @@ void __init msp_slp_irq_init(void)
 
 	/* initialize all the IRQ descriptors */
 	for (i = MSP_SLP_INTBASE; i < MSP_PER_INTBASE + 32; i++)
-		set_irq_chip_and_handler(i, &msp_slp_irq_controller
+		set_irq_chip_and_handler(i, &msp_slp_irq_controller,
 					 handle_level_irq);
 }
 

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0049-fix-build-failures-on-msp_irq_slp.c.patch --]
[-- Type: text/x-patch; name="0049-fix-build-failures-on-msp_irq_slp.c.patch", Size: 781 bytes --]

diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c b/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
index f5f1b8d..66f6f85 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
@@ -45,7 +45,7 @@ static inline void mask_msp_slp_irq(unsigned int irq)
  */
 static inline void ack_msp_slp_irq(unsigned int irq)
 {
-	mask_slp_irq(irq);
+	mask_msp_slp_irq(irq);
 
 	/*
 	 * only really necessary for 18, 16-14 and sometimes 3:0 (since
@@ -79,7 +79,7 @@ void __init msp_slp_irq_init(void)
 
 	/* initialize all the IRQ descriptors */
 	for (i = MSP_SLP_INTBASE; i < MSP_PER_INTBASE + 32; i++)
-		set_irq_chip_and_handler(i, &msp_slp_irq_controller
+		set_irq_chip_and_handler(i, &msp_slp_irq_controller,
 					 handle_level_irq);
 }
 

Re: [PATCH] fix build failures on msp_irq_slp.c

[Ralf Baechle]

On Mon, Apr 27, 2009 at 04:59:48PM +0200, Florian Fainelli wrote:

> Trying to build MSP4200 VoIP defconfig also fails on msp_irq_slp.c
> with a non-existing reference to mask_slp_irq, which is in turn
> mask_msp_slp_irq. Passed that, we will also miss a comma when
> calling set_irq_chip_and_handler. This patch fixes both issues.
> 
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
> ---
> diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c b/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
> index f5f1b8d..66f6f85 100644
> --- a/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
> +++ b/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
> @@ -45,7 +45,7 @@ static inline void mask_msp_slp_irq(unsigned int irq)
>   */
>  static inline void ack_msp_slp_irq(unsigned int irq)
>  {
> -	mask_slp_irq(irq);
> +	mask_msp_slp_irq(irq);
>  
>  	/*
>  	 * only really necessary for 18, 16-14 and sometimes 3:0 (since

The whole irq chip thing in this file is looking suspect as it treats
acknowledging and mask an interrupt as the same thing.  Sure that is the
right thing?

> @@ -79,7 +79,7 @@ void __init msp_slp_irq_init(void)
>  
>  	/* initialize all the IRQ descriptors */
>  	for (i = MSP_SLP_INTBASE; i < MSP_PER_INTBASE + 32; i++)
> -		set_irq_chip_and_handler(i, &msp_slp_irq_controller
> +		set_irq_chip_and_handler(i, &msp_slp_irq_controller,
>  					 handle_level_irq);
>  }
>  

> diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c b/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
> index f5f1b8d..66f6f85 100644

Please don't send the patch twice in one email ...

  Ralf

Re: [PATCH] fix build failures on msp_irq_slp.c

[Florian Fainelli]

Hi Ralf, Shane,

Le Wednesday 29 April 2009 13:58:59 Ralf Baechle, vous avez écrit :
> On Mon, Apr 27, 2009 at 04:59:48PM +0200, Florian Fainelli wrote:
> > Trying to build MSP4200 VoIP defconfig also fails on msp_irq_slp.c
> > with a non-existing reference to mask_slp_irq, which is in turn
> > mask_msp_slp_irq. Passed that, we will also miss a comma when
> > calling set_irq_chip_and_handler. This patch fixes both issues.
> >
> > Signed-off-by: Florian Fainelli <florian@openwrt.org>
> > ---
> > diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
> > b/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c index f5f1b8d..66f6f85
> > 100644
> > --- a/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
> > +++ b/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
> > @@ -45,7 +45,7 @@ static inline void mask_msp_slp_irq(unsigned int irq)
> >   */
> >  static inline void ack_msp_slp_irq(unsigned int irq)
> >  {
> > -	mask_slp_irq(irq);
> > +	mask_msp_slp_irq(irq);
> >
> >  	/*
> >  	 * only really necessary for 18, 16-14 and sometimes 3:0 (since
>
> The whole irq chip thing in this file is looking suspect as it treats
> acknowledging and mask an interrupt as the same thing.  Sure that is the
> right thing?

That is a quick and dirty fix which compiles, I assumed that the function 
meant to be called is mask_msp_slp_irq, Shane probably knows more about how 
this should be fixed.

>
> > @@ -79,7 +79,7 @@ void __init msp_slp_irq_init(void)
> >
> >  	/* initialize all the IRQ descriptors */
> >  	for (i = MSP_SLP_INTBASE; i < MSP_PER_INTBASE + 32; i++)
> > -		set_irq_chip_and_handler(i, &msp_slp_irq_controller
> > +		set_irq_chip_and_handler(i, &msp_slp_irq_controller,
> >  					 handle_level_irq);
> >  }
> >
> >
> > diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
> > b/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c index f5f1b8d..66f6f85
> > 100644
>
> Please don't send the patch twice in one email ...

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

Re: [PATCH] fix build failures on msp_irq_slp.c

[Shane McDonald]

[-- Attachment #1: Type: text/plain, Size: 691 bytes --]

Hello:

On Wed, Apr 29, 2009 at 7:12 AM, Florian Fainelli <florian@openwrt.org>wrote:

> Hi Ralf, Shane,
>
> Le Wednesday 29 April 2009 13:58:59 Ralf Baechle, vous avez écrit :
> > The whole irq chip thing in this file is looking suspect as it treats
> > acknowledging and mask an interrupt as the same thing.  Sure that is the
> > right thing?
> That is a quick and dirty fix which compiles, I assumed that the function
> meant to be called is mask_msp_slp_irq, Shane probably knows more about how
> this should be fixed.


It's been quite a while since I messed around with the 4200.  I'll do some
digging and ask some questions of guys who probably know better.

Shane

[-- Attachment #2: Type: text/html, Size: 1013 bytes --]

Re: [PATCH] fix build failures on msp_irq_slp.c

[Florian Fainelli]

Hi Shane,

Le Wednesday 29 April 2009 16:18:11 Shane McDonald, vous avez écrit :
> Hello:
>
> On Wed, Apr 29, 2009 at 7:12 AM, Florian Fainelli 
<florian@openwrt.org>wrote:
> > Hi Ralf, Shane,
> >
> > Le Wednesday 29 April 2009 13:58:59 Ralf Baechle, vous avez écrit :
> > > The whole irq chip thing in this file is looking suspect as it treats
> > > acknowledging and mask an interrupt as the same thing.  Sure that is
> > > the right thing?
> >
> > That is a quick and dirty fix which compiles, I assumed that the function
> > meant to be called is mask_msp_slp_irq, Shane probably knows more about
> > how this should be fixed.
>
> It's been quite a while since I messed around with the 4200.  I'll do some
> digging and ask some questions of guys who probably know better.

Any updates on that patch ? Thank you very much.
-- 
Best regards, Florian Fainelli
Email : florian@openwrt.org
http://openwrt.org
-------------------------------

Re: [PATCH] fix build failures on msp_irq_slp.c

[Shane McDonald]

[-- Attachment #1: Type: text/plain, Size: 1707 bytes --]

Hi Florian:

  My apologies for the delay in replying to your latest prompt -- I've been
on vacation with little internet access.

  Your patch looks correct to me, but as Ralf says, the existing code is a
little suspect.  In my poking around, I've come across three different
versions of this file: the in-tree version, the latest out-of-tree patch
from PMC-Sierra, and an unreleased version from a colleague.  None appear to
be quite correct.  I think I've got enough info, though, to come up with a
good version.

  I'll cook something up this weekend and get it posted.

Shane

On Sat, Jun 27, 2009 at 11:01 PM, Florian Fainelli <florian@openwrt.org>wrote:

> Hi Shane,
>
> Le Wednesday 29 April 2009 16:18:11 Shane McDonald, vous avez écrit :
> > Hello:
> >
> > On Wed, Apr 29, 2009 at 7:12 AM, Florian Fainelli
> <florian@openwrt.org>wrote:
> > > Hi Ralf, Shane,
> > >
> > > Le Wednesday 29 April 2009 13:58:59 Ralf Baechle, vous avez écrit :
> > > > The whole irq chip thing in this file is looking suspect as it treats
> > > > acknowledging and mask an interrupt as the same thing.  Sure that is
> > > > the right thing?
> > >
> > > That is a quick and dirty fix which compiles, I assumed that the
> function
> > > meant to be called is mask_msp_slp_irq, Shane probably knows more about
> > > how this should be fixed.
> >
> > It's been quite a while since I messed around with the 4200.  I'll do
> some
> > digging and ask some questions of guys who probably know better.
>
> Any updates on that patch ? Thank you very much.
> --
> Best regards, Florian Fainelli
> Email : florian@openwrt.org
> http://openwrt.org
> -------------------------------
>

[-- Attachment #2: Type: text/html, Size: 2358 bytes --]

Re: [PATCH] fix build failures on msp_irq_slp.c

[Shane McDonald]

[-- Attachment #1: Type: text/plain, Size: 917 bytes --]

On Sat, Jul 11, 2009 at 4:51 AM, Shane McDonald <mcdonald.shane@gmail.com>wrote:

> Hi Florian:
>
>   My apologies for the delay in replying to your latest prompt -- I've been
> on vacation with little internet access.
>
>   Your patch looks correct to me, but as Ralf says, the existing code is a
> little suspect.  In my poking around, I've come across three different
> versions of this file: the in-tree version, the latest out-of-tree patch
> from PMC-Sierra, and an unreleased version from a colleague.  None appear to
> be quite correct.  I think I've got enough info, though, to come up with a
> good version.
>
>   I'll cook something up this weekend and get it posted.


OK, I've done my cooking, and the cleanup patch will follow in a separate
email.  It expects Florian's patch to have been applied.

Florian's patch is correct, so I'll add my:

Acked-by: Shane McDonald <mcdonald.shane@gmail.com>

Shane

[-- Attachment #2: Type: text/html, Size: 1295 bytes --]

Re: [PATCH] fix build failures on msp_irq_slp.c

[Florian Fainelli]

Le Sunday 12 July 2009 18:34:45 Shane McDonald, vous avez écrit :
> On Sat, Jul 11, 2009 at 4:51 AM, Shane McDonald 
<mcdonald.shane@gmail.com>wrote:
> > Hi Florian:
> >
> >   My apologies for the delay in replying to your latest prompt -- I've
> > been on vacation with little internet access.
> >
> >   Your patch looks correct to me, but as Ralf says, the existing code is
> > a little suspect.  In my poking around, I've come across three different
> > versions of this file: the in-tree version, the latest out-of-tree patch
> > from PMC-Sierra, and an unreleased version from a colleague.  None appear
> > to be quite correct.  I think I've got enough info, though, to come up
> > with a good version.
> >
> >   I'll cook something up this weekend and get it posted.
>
> OK, I've done my cooking, and the cleanup patch will follow in a separate
> email.  It expects Florian's patch to have been applied.

Thank you very much !

>
> Florian's patch is correct, so I'll add my:
>
> Acked-by: Shane McDonald <mcdonald.shane@gmail.com>
>
> Shane



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

Re: [PATCH] fix build failures on msp_irq_slp.c

[Ralf Baechle]

On Sun, Jul 12, 2009 at 10:34:45AM -0600, Shane McDonald wrote:

> >   My apologies for the delay in replying to your latest prompt -- I've been
> > on vacation with little internet access.
> >
> >   Your patch looks correct to me, but as Ralf says, the existing code is a
> > little suspect.  In my poking around, I've come across three different
> > versions of this file: the in-tree version, the latest out-of-tree patch
> > from PMC-Sierra, and an unreleased version from a colleague.  None appear to
> > be quite correct.  I think I've got enough info, though, to come up with a
> > good version.
> >
> >   I'll cook something up this weekend and get it posted.
> 
> 
> OK, I've done my cooking, and the cleanup patch will follow in a separate
> email.  It expects Florian's patch to have been applied.
> 
> Florian's patch is correct, so I'll add my:
> 
> Acked-by: Shane McDonald <mcdonald.shane@gmail.com>

Okay, applied.  Thanks!

  Ralf