Skip to contentSkip to conversation

fix build failures on msp_irq_slp.c

PATCH In review Florian Fainelli 3 participants 9 messages Apr 27, 2009 – Jul 13, 2009 MIPS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix build failures on msp_irq_slp.c

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.

---

arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c +2 -2
index f5f1b8d..66f6f85 100644
@@ -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);
 }
 
arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c +2 -2
index f5f1b8d..66f6f85 100644
@@ -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);
 }
 
#1 lore raw
Quoted 12 lines · Florian Fainelli

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.

---

arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c +0 -0
index f5f1b8d..66f6f85 100644

arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c static inline void mask_msp_slp_irq(unsigned int irq) · line 51

Quoted 8 lines
arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c +1 -1
@@ -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?

arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c

Quoted 12 lines
arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c +1 -1
@@ -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);
 }
 
arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c +0 -0
index f5f1b8d..66f6f85 100644

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

Ralf

#2 lore raw

Hi Ralf, Shane,

Le Wednesday 29 April 2009 13:58:59 Ralf Baechle, vous avez écrit :

Quoted 20 lines · Florian Fainelli
Quoted 19 lines

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.

---

(quoted diff) +0 -0

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

arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c +1 -1
@@ -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);
 
Quoted 6 lines

arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c static inline void mask_msp_slp_irq(unsigned int irq) · line 51

Quoted 2 lines
arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c +0 -0
 	/*
 	 * 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.

Quoted 11 lines
Quoted 11 lines
arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c +1 -1
@@ -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);
 }
 
Quoted 5 lines
Quoted 3 lines
(quoted diff) +0 -0

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.

Signature · 4 lines
Best regards, Florian Fainelli
Email : [email protected]
http://openwrt.org
-------------------------------
#3 lore raw

Hello:

Quoted 9 lines · Florian Fainelli

Hi Ralf, Shane,

Le Wednesday 29 April 2009 13:58:59 Ralf Baechle, vous avez écrit :

Quoted 3 lines

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

#4 lore raw

Hi Shane,

Le Wednesday 29 April 2009 16:18:11 Shane McDonald, vous avez écrit :

Quoted 3 lines

Hello:

On Wed, Apr 29, 2009 at 7:12 AM, Florian Fainelli

Quoted 7 lines · <[email protected]>wrote:
Quoted 7 lines

Hi Ralf, Shane,

Le Wednesday 29 April 2009 13:58:59 Ralf Baechle, vous avez écrit :

Quoted 3 lines

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?

Quoted 6 lines
Quoted 3 lines

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.

Signature · 4 lines
Best regards, Florian Fainelli
Email : [email protected]
http://openwrt.org
-------------------------------
#5 lore raw

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

Quoted 30 lines · Florian Fainelli

Hi Shane,

Le Wednesday 29 April 2009 16:18:11 Shane McDonald, vous avez écrit :

Quoted 3 lines

Hello:

On Wed, Apr 29, 2009 at 7:12 AM, Florian Fainelli

Quoted 8 lines · <[email protected]>wrote:
Quoted 8 lines

Hi Ralf, Shane,

Le Wednesday 29 April 2009 13:58:59 Ralf Baechle, vous avez écrit :

Quoted 3 lines

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

Quoted 4 lines
Quoted 2 lines

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

Quoted 1 line

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 : [email protected]
http://openwrt.org
-------------------------------

#6 lore raw
Quoted 5 lines · Shane McDonald

Hi Florian:

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

Quoted 8 lines

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:

Shane

#7 lore raw

Le Sunday 12 July 2009 18:34:45 Shane McDonald, vous avez écrit :

Quoted 1 line

On Sat, Jul 11, 2009 at 4:51 AM, Shane McDonald

Quoted 12 lines · <[email protected]>wrote:
Quoted 12 lines

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.

Quoted 4 lines
Quoted 1 line

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 !

Quoted 6 lines

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

Shane

Signature · 4 lines
Best regards, Florian Fainelli
Email : [email protected]
http://openwrt.org
-------------------------------
#8 lore raw
In reply to Shane McDonald
Quoted 13 lines · Shane McDonald
Quoted 11 lines

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.

Quoted 6 lines

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:

Okay, applied. Thanks!

Ralf