KVM next tree merge onto current Linus master

KVM next tree merge onto current Linus master

[Alexander Graf]

Hi guys,

Just recently this really important patch got pulled into Linus' tree for 3.9:

commit 1674400aaee5b466c595a8fc310488263ce888c7
Author: Anton Blanchard <anton@samba.org>
Date:   Tue Mar 12 01:51:51 2013 +0000

    powerpc: Fix -mcmodel=medium breakage in prom_init.c

    Commit 5ac47f7a6efb (powerpc: Relocate prom_init.c on 64bit) made
    prom_init.c position independent by manually relocating its entries
    in the TOC.

    We get the address of the TOC entries with the __prom_init_toc_start
    linker symbol. If __prom_init_toc_start ends up as an entry in the
    TOC then we need to add an offset to get the current address. This is
    the case for older toolchains.

    On the other hand, if we have a newer toolchain that supports
    -mcmodel=medium then __prom_init_toc_start will be created by a
    relative offset from r2 (the TOC pointer). Since r2 has already been
    relocated, nothing more needs to be done.  Adding an offset in this
    case is wrong and Aaro Koskinen and Alexander Graf have noticed noticed
    G5 and OpenBIOS breakage.

    Alan Modra suggested we just use r2 to get at the TOC which is simpler
    and works with both old and new toolchains.

    Reported-by: Alexander Graf <agraf@suse.de>
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>


Without that commit, I can not boot my G5, thus I can't run automated tests on it against my queue.

Could you please merge kvm/next against linus/master, so that I can base my trees against that?


Alex

Re: KVM next tree merge onto current Linus master

[Marcelo Tosatti]

On Thu, Mar 21, 2013 at 08:49:07AM +0100, Alexander Graf wrote:
> Hi guys,
> 
> Just recently this really important patch got pulled into Linus' tree for 3.9:
> 
> commit 1674400aaee5b466c595a8fc310488263ce888c7
> Author: Anton Blanchard <anton@samba.org>
> Date:   Tue Mar 12 01:51:51 2013 +0000
> 
>     powerpc: Fix -mcmodel=medium breakage in prom_init.c
> 
>     Commit 5ac47f7a6efb (powerpc: Relocate prom_init.c on 64bit) made
>     prom_init.c position independent by manually relocating its entries
>     in the TOC.
> 
>     We get the address of the TOC entries with the __prom_init_toc_start
>     linker symbol. If __prom_init_toc_start ends up as an entry in the
>     TOC then we need to add an offset to get the current address. This is
>     the case for older toolchains.
> 
>     On the other hand, if we have a newer toolchain that supports
>     -mcmodel=medium then __prom_init_toc_start will be created by a
>     relative offset from r2 (the TOC pointer). Since r2 has already been
>     relocated, nothing more needs to be done.  Adding an offset in this
>     case is wrong and Aaro Koskinen and Alexander Graf have noticed noticed
>     G5 and OpenBIOS breakage.
> 
>     Alan Modra suggested we just use r2 to get at the TOC which is simpler
>     and works with both old and new toolchains.
> 
>     Reported-by: Alexander Graf <agraf@suse.de>
>     Signed-off-by: Anton Blanchard <anton@samba.org>
>     Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
>     Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> 
> 
> Without that commit, I can not boot my G5, thus I can't run automated tests on it against my queue.
> 
> Could you please merge kvm/next against linus/master, so that I can base my trees against that?
> 
> 
> Alex

Done, will push master as soon as autotest finishes.