Commit 9b09c6d9 authored by Tony Breeds's avatar Tony Breeds Committed by Paul Mackerras
Browse files

powerpc: Change the default link address for pSeries zImage kernels 



Currently we set the start of the .text section to be 4Mb for pSeries.
In situations where the zImage is > 8Mb we'll fail to boot (due to
overlapping with OF).  Move .text in a zImage from 4MB to 64MB
(well past OF).

We still will not be able to load large zImage unless we also move OF,
to that end, add a note to the zImage ELF to move OF to 32Mb.  If this
is the very first kernel booted then we'll need to move OF manually by
setting real-base.

Signed-off-by: default avatarTony Breeds <tony@bakeyournoodle.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent c230328d

arch/powerpc/boot/addnote.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ char arch[] = "PowerPC"; 
#define N_DESCR	6

unsigned int descr[N_DESCR] = {

	0xffffffff,		/* real-mode = true */

	0x00c00000,		/* real-base, i.e. where we expect OF to be */

	0x02000000,		/* real-base, i.e. where we expect OF to be */

	0xffffffff,		/* real-size */

	0xffffffff,		/* virt-base */

	0xffffffff,		/* virt-size */

arch/powerpc/boot/oflib.c

+13 −2
Original line number Diff line number Diff line
@@ -168,8 +168,19 @@ void *of_claim(unsigned long virt, unsigned long size, unsigned long align) 


void *of_vmlinux_alloc(unsigned long size)

{

	void *p = malloc(size);

	unsigned long start = (unsigned long)_start, end = (unsigned long)_end;

	void *addr;

	void *p;



	/* With some older POWER4 firmware we need to claim the area the kernel

	 * will reside in.  Newer firmwares don't need this so we just ignore

	 * the return value.

	 */

	addr = of_claim(start, end - start, 0);

	printf("Trying to claim from 0x%lx to 0x%lx (0x%lx) got %p\r\n",

	       start, end, end - start, addr);



	p = malloc(size);

	if (!p)

		fatal("Can't allocate memory for kernel image!\n\r");

arch/powerpc/boot/wrapper

+12 −2
Original line number Diff line number Diff line
@@ -138,14 +138,20 @@ objflags=-S 
tmp=$tmpdir/zImage.$$.o

ksection=.kernel:vmlinux.strip

isection=.kernel:initrd

link_address='0x400000'



case "$platform" in

pmac|pseries|chrp)

pseries)

    platformo=$object/of.o

    link_address='0x4000000'

    ;;

pmac|chrp)

    platformo=$object/of.o

    ;;

coff)

    platformo=$object/of.o

    lds=$object/zImage.coff.lds

    link_address='0x500000'

    ;;

miboot|uboot)

    # miboot and U-boot want just the bare bits, not an ELF binary
@@ -190,6 +196,7 @@ ps3) 
    objflags="-O binary --set-section-flags=.bss=contents,alloc,load,data"

    ksection=.kernel:vmlinux.bin

    isection=.kernel:initrd

    link_address=''

    ;;

ep88xc|ep405|ep8248e)

    platformo="$object/fixed-head.o $object/$platform.o"
@@ -272,7 +279,10 @@ if [ -n "$dtb" ]; then 
fi



if [ "$platform" != "miboot" ]; then

    ${CROSS}ld -m elf32ppc -T $lds -o "$ofile" \

    if [ -n "$link_address" ] ; then

        text_start="-Ttext $link_address --defsym _start=$link_address"

    fi

    ${CROSS}ld -m elf32ppc -T $lds $text_start -o "$ofile" \

	$platformo $tmp $object/wrapper.a

    rm $tmp

fi

arch/powerpc/boot/zImage.coff.lds.S

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ ENTRY(_zimage_start_opd) 
EXTERN(_zimage_start_opd)

SECTIONS

{

  . = (5*1024*1024);

  _start = .;

  .text      :

  {

arch/powerpc/boot/zImage.lds.S

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ ENTRY(_zimage_start) 
EXTERN(_zimage_start)

SECTIONS

{

  . = (4*1024*1024);

  _start = .;

  .text      :

  {

CRA Git | Maintained and supported by SUSTech CRA and CCSE