sparc32 broke

sparc32 broke

[Robert Reif]

A compile of todays mainline produces this compile error:

arch/sparc/kernel/sun4d_smp.c:63: error: expected identifier or ‘(’ 
before ‘{’ token
arch/sparc/kernel/sun4d_smp.c: In function ‘smp4d_callin’:
arch/sparc/kernel/sun4d_smp.c:118: error: lvalue required as left 
operand of assignment
arch/sparc/kernel/sun4d_smp.c:118: error: lvalue required as left 
operand of assignment

Prior to today, sparc32 has also failed to boot completely for the last 
few days.
It boots but fails in the init scripts when it can't find the boot 
partition.

Ill try to bisect the boot problem but it will take a while.

Re: sparc32 broke

[David Miller]

From: Robert Reif <reif@earthlink.net>
Date: Thu, 08 Jan 2009 19:32:21 -0500

> A compile of todays mainline produces this compile error:
> 
> arch/sparc/kernel/sun4d_smp.c:63: error: expected identifier or ‘(’ before ‘{’ token
> arch/sparc/kernel/sun4d_smp.c: In function ‘smp4d_callin’:
> arch/sparc/kernel/sun4d_smp.c:118: error: lvalue required as left operand of assignment
> arch/sparc/kernel/sun4d_smp.c:118: error: lvalue required as left operand of assignment

Thanks for the report, I've committed the fix below to sparc-2.6

> Prior to today, sparc32 has also failed to boot completely for the last few days.
> It boots but fails in the init scripts when it can't find the boot partition.
> 
> Ill try to bisect the boot problem but it will take a while.

Thanks, let us know if you need any help figuring something out.

sparc: Fix sun4d_irq.c build.

Reported by Robert Reif.

Fallout from 'swap' changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 arch/sparc/kernel/sun4d_smp.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index 16ab0cb..50afaed 100644
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -60,7 +60,7 @@ extern int __smp4d_processor_id(void);
 #define SMP_PRINTK(x)
 #endif
 
-static inline unsigned long swap(volatile unsigned long *ptr, unsigned long val)
+static inline unsigned long sun4d_swap(volatile unsigned long *ptr, unsigned long val)
 {
 	__asm__ __volatile__("swap [%1], %0\n\t" :
 			     "=&r" (val), "=&r" (ptr) :
@@ -115,7 +115,7 @@ void __cpuinit smp4d_callin(void)
 	local_flush_tlb_all();
 
 	/* Allow master to continue. */
-	swap((unsigned long *)&cpu_callin_map[cpuid], 1);
+	sun4d_swap((unsigned long *)&cpu_callin_map[cpuid], 1);
 	local_flush_cache_all();
 	local_flush_tlb_all();
 	
-- 
1.6.1.15.g159c88

ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¬¥ªÜ–)îÇø§¶\x17›¡Ü¨}©ž²Æ zÚ&j:+v‰¨þø\x1e¯ù\x1e®w¥þŠà2ŠÞ™¨è­Ú&¢)ß¡«a¶Úÿÿûàz¿äz¹Þ—ú+ƒùšŽŠÝ¢jÿŠwèþ^[f

Re: sparc32 broke

[Robert Reif]

Robert Reif wrote:
> Prior to today, sparc32 has also failed to boot completely for the 
> last few days.
> It boots but fails in the init scripts when it can't find the boot 
> partition.
>
> Ill try to bisect the boot problem but it will take a while.
I bisected it down to: ece93487c31607558f4b91f378fcee4b43956dbc sparc: 
unify signal.h

Re: sparc32 broke

[David Miller]

From: Robert Reif <reif@earthlink.net>
Date: Fri, 09 Jan 2009 23:19:19 -0500

> I bisected it down to: ece93487c31607558f4b91f378fcee4b43956dbc
> sparc: unify signal.h

Sam, the first thing I notice is that _NSIG_BPW changed.

It's supposed to be 32 for sparc32 and 64 for sparc64.
But now it's unconditionally 64 in the unified header.
This also makes _NSIG_WORDS et al. wrong.

Robert, does this fix the bug for you?

sparc: Fix asm/signal.h for 32-bit.

Fix a 32-bit sparc regression reported by Robert Reif.

_NSIG_BPW needs to be 32 for 32-bit and 64 for 64-bit

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc/include/asm/signal.h b/arch/sparc/include/asm/signal.h
index 41535e7..047fbd0 100644
--- a/arch/sparc/include/asm/signal.h
+++ b/arch/sparc/include/asm/signal.h
@@ -84,7 +84,7 @@
 
 #define __OLD_NSIG	32
 #define __NEW_NSIG      64
-#define _NSIG_BPW       64
+#define _NSIG_BPW       CONFIG_BITS
 #define _NSIG_WORDS     (__NEW_NSIG / _NSIG_BPW)
 
 #define SIGRTMIN       32

Re: sparc32 broke

[Sam Ravnborg]

On Fri, Jan 09, 2009 at 10:22:04PM -0800, David Miller wrote:
> From: Robert Reif <reif@earthlink.net>
> Date: Fri, 09 Jan 2009 23:19:19 -0500
> 
> > I bisected it down to: ece93487c31607558f4b91f378fcee4b43956dbc
> > sparc: unify signal.h
> 
> Sam, the first thing I notice is that _NSIG_BPW changed.
> 
> It's supposed to be 32 for sparc32 and 64 for sparc64.
> But now it's unconditionally 64 in the unified header.
> This also makes _NSIG_WORDS et al. wrong.

I cannot explain why this happened - it is obviously buggy.

    Sorry!

I will re-review the commit later today after I get some coffee.

Thanks for testing & bisect Robert!

> 
> diff --git a/arch/sparc/include/asm/signal.h b/arch/sparc/include/asm/signal.h
> index 41535e7..047fbd0 100644
> --- a/arch/sparc/include/asm/signal.h
> +++ b/arch/sparc/include/asm/signal.h
> @@ -84,7 +84,7 @@
>  
>  #define __OLD_NSIG	32
>  #define __NEW_NSIG      64
> -#define _NSIG_BPW       64
> +#define _NSIG_BPW       CONFIG_BITS

The real fix should look like this:

#ifdef __arch64__
#define _NSIG_BPW       64
#else
#define _NSIG_BPW       64
#endif

This is required because this header is exported to userspace
where we do not have access to CONFIG_* symbols.

	Sam

Re: sparc32 broke

[David Miller]

From: Sam Ravnborg <sam@ravnborg.org>
Date: Sat, 10 Jan 2009 08:33:21 +0100

> The real fix should look like this:
> 
> #ifdef __arch64__
> #define _NSIG_BPW       64
> #else
> #define _NSIG_BPW       64
> #endif
> 
> This is required because this header is exported to userspace
> where we do not have access to CONFIG_* symbols.

I assume you meant to use "32" in the #else branch :-)

Re: sparc32 broke

[Sam Ravnborg]

On Fri, Jan 09, 2009 at 11:35:24PM -0800, David Miller wrote:
> From: Sam Ravnborg <sam@ravnborg.org>
> Date: Sat, 10 Jan 2009 08:33:21 +0100
> 
> > The real fix should look like this:
> > 
> > #ifdef __arch64__
> > #define _NSIG_BPW       64
> > #else
> > #define _NSIG_BPW       64
> > #endif
> > 
> > This is required because this header is exported to userspace
> > where we do not have access to CONFIG_* symbols.
> 
> I assume you meant to use "32" in the #else branch :-)
Freudian attempt or similar...

I now did a re-review of the unified signal.h.
And I could not spot any other subtle differences.

	Sam

Re: sparc32 broke

[Robert Reif]

David Miller wrote:
> From: Sam Ravnborg <sam@ravnborg.org>
> Date: Sat, 10 Jan 2009 08:33:21 +0100
>
>   
>> The real fix should look like this:
>>
>> #ifdef __arch64__
>> #define _NSIG_BPW       64
>> #else
>> #define _NSIG_BPW       64
>> #endif
>>
>> This is required because this header is exported to userspace
>> where we do not have access to CONFIG_* symbols.
>>     
>
> I assume you meant to use "32" in the #else branch :-)
>
>   
This fixed it (with the 32).

Re: sparc32 broke

[David Miller]

From: Robert Reif <reif@earthlink.net>
Date: Sat, 10 Jan 2009 09:56:01 -0500

> David Miller wrote:
> > From: Sam Ravnborg <sam@ravnborg.org>
> > Date: Sat, 10 Jan 2009 08:33:21 +0100
> >
> >   
> >> The real fix should look like this:
> >>
> >> #ifdef __arch64__
> >> #define _NSIG_BPW       64
> >> #else
> >> #define _NSIG_BPW       64
> >> #endif
> >>
> >> This is required because this header is exported to userspace
> >> where we do not have access to CONFIG_* symbols.
> >>     
> >
> > I assume you meant to use "32" in the #else branch :-)
>
> This fixed it (with the 32).

Thanks for testing Robert, I've just commited the following:

sparc: Fix asm/signal.h for 32-bit.

Fix a 32-bit sparc regression reported by Robert Reif.

_NSIG_BPW needs to be 32 for 32-bit and 64 for 64-bit

Tested-by: Robert Reif <reif@earthlink.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 arch/sparc/include/asm/signal.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/sparc/include/asm/signal.h b/arch/sparc/include/asm/signal.h
index 41535e7..cba4520 100644
--- a/arch/sparc/include/asm/signal.h
+++ b/arch/sparc/include/asm/signal.h
@@ -84,7 +84,11 @@
 
 #define __OLD_NSIG	32
 #define __NEW_NSIG      64
+#ifdef __arch64__
 #define _NSIG_BPW       64
+#else
+#define _NSIG_BPW       32
+#endif
 #define _NSIG_WORDS     (__NEW_NSIG / _NSIG_BPW)
 
 #define SIGRTMIN       32
-- 
1.6.1.15.g159c88