Hi Linus
Dunno if it's too late or not yet but here's 3 fixes for powerpc that
would be welcome to have in before the release. If not I'll send them
first thing next (one of them is already in -next in fact).
Those are regression fixes and a build breakage.
Cheers,
Ben.
The following changes since commit fce519588acfac249e8fdc1f5016c73d617de315:
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 (2011-05-18 13:25:57 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
Ben Hutchings (1):
powerpc/kexec: Fix build failure on 32-bit SMP
Benjamin Herrenschmidt (1):
powerpc/smp: Make start_secondary_resume available to all CPU variants
kerstin jonsson (1):
powerpc/4xx: Fix regression in SMP on 476
arch/powerpc/kernel/crash.c | 59 +++++++++++++++++++++--------------------
arch/powerpc/kernel/head_32.S | 9 ------
arch/powerpc/kernel/misc_32.S | 11 +++++++
arch/powerpc/kernel/smp.c | 4 +-
4 files changed, 43 insertions(+), 40 deletions(-)
On Wed, May 18, 2011 at 9:06 PM, Benjamin Herrenschmidt
<[email protected]> wrote:
>
> Dunno if it's too late or not yet but here's 3 fixes for powerpc that
> would be welcome to have in before the release. If not I'll send them
> first thing next (one of them is already in -next in fact).
Gah. I just cut 2.6.39.
Linus
From: Linus Torvalds <[email protected]>
Date: Wed, 18 May 2011 21:11:47 -0700
> On Wed, May 18, 2011 at 9:06 PM, Benjamin Herrenschmidt
> <[email protected]> wrote:
>>
>> Dunno if it's too late or not yet but here's 3 fixes for powerpc that
>> would be welcome to have in before the release. If not I'll send them
>> first thing next (one of them is already in -next in fact).
>
> Gah. I just cut 2.6.39.
I know we can't let these things go forever, but in my opinion
we should have given this one or two more -rc's.
On Wed, 2011-05-18 at 21:11 -0700, Linus Torvalds wrote:
> On Wed, May 18, 2011 at 9:06 PM, Benjamin Herrenschmidt
> <[email protected]> wrote:
> >
> > Dunno if it's too late or not yet but here's 3 fixes for powerpc that
> > would be welcome to have in before the release. If not I'll send them
> > first thing next (one of them is already in -next in fact).
>
> Gah. I just cut 2.6.39.
Bah, no biggie. I'll stick some CC: stable and put them in -next :-)
Cheers,
Ben.
On Thu, May 19, 2011 at 02:06:18PM +1000, Benjamin Herrenschmidt wrote:
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
When I try to build 'next' (now at 208b3a4c), it does not compile due
to a change from the following commit.
> Benjamin Herrenschmidt (1):
> powerpc/smp: Make start_secondary_resume available to all CPU variants
I would appreciate your help in getting this fixed...
Thanks,
Richard
PS the error looks like this:
AS arch/powerpc/kernel/misc_32.o
arch/powerpc/kernel/misc_32.S: Assembler messages:
arch/powerpc/kernel/misc_32.S:703: Error: Unrecognized opcode: `std'
make[2]: *** [arch/powerpc/kernel/misc_32.o] Error 1
make[1]: *** [arch/powerpc/kernel] Error 2
> ${CROSS_COMPILE}gcc -v
Using built-in specs.
Target: powerpc-none-linux-gnuspe
Configured with: ../gcc-4.3.2/configure --target=powerpc-none-linux-gnuspe --host=i686-pc-linux-gnu --prefix=/opt/freescale/usr/local/gcc-4.3.74-eglibc-2.8.74-dp-2/powerpc-none-linux-gnuspe --with-sysroot=/opt/freescale/usr/local/gcc-4.3.74-eglibc-2.8.74-dp-2/powerpc-none-linux-gnuspe/powerpc-none-linux-gnuspe/libc --disable-libssp --disable-libmudflap --disable-libstdcxx-pch --enable-libgomp --enable-shared --enable-threads --enable-languages=c,c++ --with-gmp=/usr/src/redhat/BUILD/csl-tc-4.3.74/host-libs/usr --with-mpfr=/usr/src/redhat/BUILD/csl-tc-4.3.74/host-libs/usr --with-cpu=8548 --with-gnu-as --with-gnu-ld --enable-symvers=gnu --enable-__cxa_atexit --enable-cxx-flags=-mcpu=8548 --disable-multilib --with-long-double-128 --disable-nls --enable-e500_double
Thread model: posix
gcc version 4.3.2 (GCC)
On Fri, May 20, 2011 at 03:23:29PM +0200, Richard Cochran wrote:
>When I try to build 'next' (now at 208b3a4c), it does not compile due
>to a change from the following commit.
>
>> Benjamin Herrenschmidt (1):
>> powerpc/smp: Make start_secondary_resume available to all CPU variants
>
>I would appreciate your help in getting this fixed...
Could you try the patch below?
Commit 69e3cea8d5fd526 introduced start_secondary_resume to misc_32.S,
however it uses a 64-bit instruction which is not valid on 32-bit
platforms. Use 'stw' instead.
Reported-by: Richard Cochran <[email protected]>
Signed-off-by: Josh Boyer <[email protected]>
---
diff --git a/arch/powerpc/kernel/misc_32.S
b/arch/powerpc/kernel/misc_32.S
index 402560e..998a100 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -700,7 +700,7 @@ _GLOBAL(start_secondary_resume)
rlwinm r1,r1,0,0,(31-THREAD_SHIFT) /* current_thread_info() */
addi r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
li r3,0
- std r3,0(r1) /* Zero the stack frame pointer */
+ stw r3,0(r1) /* Zero the stack frame pointer */
bl start_secondary
b .
#endif /* CONFIG_SMP */
On Fri, May 20, 2011 at 09:58:45AM -0400, Josh Boyer wrote:
> On Fri, May 20, 2011 at 03:23:29PM +0200, Richard Cochran wrote:
> >When I try to build 'next' (now at 208b3a4c), it does not compile due
> >to a change from the following commit.
> >
> >> Benjamin Herrenschmidt (1):
> >> powerpc/smp: Make start_secondary_resume available to all CPU variants
> >
> >I would appreciate your help in getting this fixed...
>
> Could you try the patch below?
Yes, and it both compiles and boots.
Thanks,
Richard
>
> Commit 69e3cea8d5fd526 introduced start_secondary_resume to misc_32.S,
> however it uses a 64-bit instruction which is not valid on 32-bit
> platforms. Use 'stw' instead.
>
> Reported-by: Richard Cochran <[email protected]>
> Signed-off-by: Josh Boyer <[email protected]>
>
> ---
>
> diff --git a/arch/powerpc/kernel/misc_32.S
> b/arch/powerpc/kernel/misc_32.S
> index 402560e..998a100 100644
> --- a/arch/powerpc/kernel/misc_32.S
> +++ b/arch/powerpc/kernel/misc_32.S
> @@ -700,7 +700,7 @@ _GLOBAL(start_secondary_resume)
> rlwinm r1,r1,0,0,(31-THREAD_SHIFT) /* current_thread_info() */
> addi r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
> li r3,0
> - std r3,0(r1) /* Zero the stack frame pointer */
> + stw r3,0(r1) /* Zero the stack frame pointer */
> bl start_secondary
> b .
> #endif /* CONFIG_SMP */
>
On Fri, May 20, 2011 at 04:32:59PM +0200, Richard Cochran wrote:
>On Fri, May 20, 2011 at 09:58:45AM -0400, Josh Boyer wrote:
>> On Fri, May 20, 2011 at 03:23:29PM +0200, Richard Cochran wrote:
>> >When I try to build 'next' (now at 208b3a4c), it does not compile due
>> >to a change from the following commit.
>> >
>> >> Benjamin Herrenschmidt (1):
>> >> powerpc/smp: Make start_secondary_resume available to all CPU variants
>> >
>> >I would appreciate your help in getting this fixed...
>>
>> Could you try the patch below?
>
>Yes, and it both compiles and boots.
Thanks for testing!
Ben, can you pull this patch in as-is (fixing up the Subject), or do you
need me to resubmit it?
josh
>>
>> Commit 69e3cea8d5fd526 introduced start_secondary_resume to misc_32.S,
>> however it uses a 64-bit instruction which is not valid on 32-bit
>> platforms. Use 'stw' instead.
>>
>> Reported-by: Richard Cochran <[email protected]>
>> Signed-off-by: Josh Boyer <[email protected]>
>>
>> ---
>>
>> diff --git a/arch/powerpc/kernel/misc_32.S
>> b/arch/powerpc/kernel/misc_32.S
>> index 402560e..998a100 100644
>> --- a/arch/powerpc/kernel/misc_32.S
>> +++ b/arch/powerpc/kernel/misc_32.S
>> @@ -700,7 +700,7 @@ _GLOBAL(start_secondary_resume)
>> rlwinm r1,r1,0,0,(31-THREAD_SHIFT) /* current_thread_info() */
>> addi r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
>> li r3,0
>> - std r3,0(r1) /* Zero the stack frame pointer */
>> + stw r3,0(r1) /* Zero the stack frame pointer */
>> bl start_secondary
>> b .
>> #endif /* CONFIG_SMP */
>>
On May 20, 2011, at 9:46 AM, Josh Boyer wrote:
> On Fri, May 20, 2011 at 04:32:59PM +0200, Richard Cochran wrote:
>> On Fri, May 20, 2011 at 09:58:45AM -0400, Josh Boyer wrote:
>>> On Fri, May 20, 2011 at 03:23:29PM +0200, Richard Cochran wrote:
>>>> When I try to build 'next' (now at 208b3a4c), it does not compile due
>>>> to a change from the following commit.
>>>>
>>>>> Benjamin Herrenschmidt (1):
>>>>> powerpc/smp: Make start_secondary_resume available to all CPU variants
>>>>
>>>> I would appreciate your help in getting this fixed...
>>>
>>> Could you try the patch below?
>>
>> Yes, and it both compiles and boots.
>
> Thanks for testing!
>
> Ben, can you pull this patch in as-is (fixing up the Subject), or do you
> need me to resubmit it?
Yeah, we need this all so we can send it to stable for 2.6.39.1
- k-
On Fri, 2011-05-20 at 15:23 +0200, Richard Cochran wrote:
> On Thu, May 19, 2011 at 02:06:18PM +1000, Benjamin Herrenschmidt wrote:
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
>
> When I try to build 'next' (now at 208b3a4c), it does not compile due
> to a change from the following commit.
>
> > Benjamin Herrenschmidt (1):
> > powerpc/smp: Make start_secondary_resume available to all CPU variants
>
> I would appreciate your help in getting this fixed...
It's me being a moron. I'll send a fix to Linus.
Cheers,
Ben.
> Thanks,
> Richard
>
> PS the error looks like this:
>
> AS arch/powerpc/kernel/misc_32.o
> arch/powerpc/kernel/misc_32.S: Assembler messages:
> arch/powerpc/kernel/misc_32.S:703: Error: Unrecognized opcode: `std'
> make[2]: *** [arch/powerpc/kernel/misc_32.o] Error 1
> make[1]: *** [arch/powerpc/kernel] Error 2
>
> > ${CROSS_COMPILE}gcc -v
> Using built-in specs.
> Target: powerpc-none-linux-gnuspe
> Configured with: ../gcc-4.3.2/configure --target=powerpc-none-linux-gnuspe --host=i686-pc-linux-gnu --prefix=/opt/freescale/usr/local/gcc-4.3.74-eglibc-2.8.74-dp-2/powerpc-none-linux-gnuspe --with-sysroot=/opt/freescale/usr/local/gcc-4.3.74-eglibc-2.8.74-dp-2/powerpc-none-linux-gnuspe/powerpc-none-linux-gnuspe/libc --disable-libssp --disable-libmudflap --disable-libstdcxx-pch --enable-libgomp --enable-shared --enable-threads --enable-languages=c,c++ --with-gmp=/usr/src/redhat/BUILD/csl-tc-4.3.74/host-libs/usr --with-mpfr=/usr/src/redhat/BUILD/csl-tc-4.3.74/host-libs/usr --with-cpu=8548 --with-gnu-as --with-gnu-ld --enable-symvers=gnu --enable-__cxa_atexit --enable-cxx-flags=-mcpu=8548 --disable-multilib --with-long-double-128 --disable-nls --enable-e500_double
> Thread model: posix
> gcc version 4.3.2 (GCC)