| Message ID | 1455897503-11835-11-git-send-email-drjones@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
On 19/02/2016 16:58, Andrew Jones wrote: > Signed-off-by: Andrew Jones <drjones@redhat.com> > Reviewed-by: Thomas Huth <thuth@redhat.com> > Tested-by: Laurent Vivier <lvivier@redhat.com> > Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > powerpc/Makefile.common | 44 +++++++++----------------------------------- > powerpc/Makefile.ppc64 | 14 ++++++-------- > powerpc/flat.lds | 14 ++++++++++---- > 3 files changed, 25 insertions(+), 47 deletions(-) > > diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common > index dd3a0ca327d06..7762231f6f1f7 100644 > --- a/powerpc/Makefile.common > +++ b/powerpc/Makefile.common > @@ -1,22 +1,15 @@ > # > -# arm common makefile > +# powerpc common makefile > # > # Authors: Andrew Jones <drjones@redhat.com> > # > > -ifeq ($(LOADADDR),) > - # qemu mach-virt default load address > - LOADADDR = 0x40000000 > -endif > - > tests-common = \ > - $(TEST_DIR)/selftest.flat \ > - $(TEST_DIR)/spinlock-test.flat > + $(TEST_DIR)/selftest.elf > > all: test_cases > > ################################################################## > -phys_base = $(LOADADDR) > > CFLAGS += -std=gnu99 > CFLAGS += -ffreestanding > @@ -30,38 +23,20 @@ include scripts/asm-offsets.mak > cflatobjs += lib/util.o > cflatobjs += lib/alloc.o > cflatobjs += lib/devicetree.o > -cflatobjs += lib/virtio.o > -cflatobjs += lib/virtio-mmio.o > -cflatobjs += lib/chr-testdev.o > -cflatobjs += lib/arm/io.o > -cflatobjs += lib/arm/setup.o > -cflatobjs += lib/arm/mmu.o > -cflatobjs += lib/arm/bitops.o > -cflatobjs += lib/arm/psci.o > -cflatobjs += lib/arm/smp.o > - > -libeabi = lib/arm/libeabi.a > -eabiobjs = lib/arm/eabi_compat.o > +cflatobjs += lib/powerpc/io.o > > libgcc := $(shell $(CC) $(machine) --print-libgcc-file-name) > -start_addr := $(shell printf "%x\n" $$(( $(phys_base) + $(kernel_offset) ))) > > -FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libgcc) $(libeabi) > +FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libgcc) > %.elf: LDFLAGS = $(CFLAGS) -nostdlib > -%.elf: %.o $(FLATLIBS) arm/flat.lds > +%.elf: %.o $(FLATLIBS) powerpc/flat.lds > $(CC) $(LDFLAGS) -o $@ \ > - -Wl,-T,arm/flat.lds,--build-id=none,-Ttext=$(start_addr) \ > + -Wl,-T,powerpc/flat.lds,--build-id=none \ > $(filter %.o, $^) $(FLATLIBS) > > -%.flat: %.elf > - $(OBJCOPY) -O binary $^ $@ > - > -$(libeabi): $(eabiobjs) > - $(AR) rcs $@ $^ > - > -arm_clean: libfdt_clean asm_offsets_clean > - $(RM) $(TEST_DIR)/*.{o,flat,elf} $(libeabi) $(eabiobjs) \ > - $(TEST_DIR)/.*.d lib/arm/.*.d > +powerpc_clean: libfdt_clean asm_offsets_clean > + $(RM) $(TEST_DIR)/*.{o,elf} \ > + $(TEST_DIR)/.*.d lib/powerpc/.*.d > > ################################################################## > > @@ -70,4 +45,3 @@ generated_files = $(asm-offsets) > test_cases: $(generated_files) $(tests-common) $(tests) > > $(TEST_DIR)/selftest.elf: $(cstart.o) $(TEST_DIR)/selftest.o > -$(TEST_DIR)/spinlock-test.elf: $(cstart.o) $(TEST_DIR)/spinlock-test.o > diff --git a/powerpc/Makefile.ppc64 b/powerpc/Makefile.ppc64 > index 0b0761c729c7c..c0b3e9a53fc1f 100644 > --- a/powerpc/Makefile.ppc64 > +++ b/powerpc/Makefile.ppc64 > @@ -1,20 +1,18 @@ > # > -# arm64 makefile > +# ppc64 makefile > # > # Authors: Andrew Jones <drjones@redhat.com> > # > bits = 64 > -ldarch = elf64-littleaarch64 > -kernel_offset = 0x80000 > +ldarch = elf64-powerpc Just a question: where is used ldarch? Laurent > > cstart.o = $(TEST_DIR)/cstart64.o > -cflatobjs += lib/arm64/processor.o > -cflatobjs += lib/arm64/spinlock.o > +cflatobjs += lib/ppc64/spinlock.o > > -# arm64 specific tests > +# ppc64 specific tests > tests = > > include $(TEST_DIR)/Makefile.common > > -arch_clean: arm_clean > - $(RM) lib/arm64/.*.d > +arch_clean: powerpc_clean > + $(RM) lib/ppc64/.*.d > diff --git a/powerpc/flat.lds b/powerpc/flat.lds > index efdf5d7109ffb..84087057c0ce2 100644 > --- a/powerpc/flat.lds > +++ b/powerpc/flat.lds > @@ -4,6 +4,8 @@ SECTIONS > .text : { *(.init) *(.text) *(.text.*) } > . = ALIGN(64K); > etext = .; > + .opd : { *(.opd) } > + . = ALIGN(16); > .data : { > *(.data) > } > @@ -11,16 +13,20 @@ SECTIONS > .rodata : { *(.rodata) } > . = ALIGN(16); > .bss : { *(.bss) } > + . = ALIGN(256); > + /* > + * tocptr is tocbase + 32K, allowing toc offsets to be +-32K > + */ > + tocptr = . + 32K; > + .got : { *(.toc) *(.got) } > . = ALIGN(64K); > edata = .; > . += 64K; > . = ALIGN(64K); > /* > - * stack depth is 16K for arm and PAGE_SIZE for arm64, see THREAD_SIZE > - * sp must be 16 byte aligned for arm64, and 8 byte aligned for arm > - * sp must always be strictly less than the true stacktop > + * stackptr set with initial stack frame (64 bytes) preallocated > */ > - stackptr = . - 16; > + stackptr = . - 64; > stacktop = .; > } > > -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Feb 23, 2016 at 04:07:17PM +0100, Laurent Vivier wrote: [...] > > bits = 64 > > -ldarch = elf64-littleaarch64 > > -kernel_offset = 0x80000 > > +ldarch = elf64-powerpc > > Just a question: where is used ldarch? Ah, ldarch came from the arm copy, which came from the x86 copy... And none of the architectures are using :-) I'll remove it, as it's wrong for LE, so just adds confusion. Thanks, drew -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common index dd3a0ca327d06..7762231f6f1f7 100644 --- a/powerpc/Makefile.common +++ b/powerpc/Makefile.common @@ -1,22 +1,15 @@ # -# arm common makefile +# powerpc common makefile # # Authors: Andrew Jones <drjones@redhat.com> # -ifeq ($(LOADADDR),) - # qemu mach-virt default load address - LOADADDR = 0x40000000 -endif - tests-common = \ - $(TEST_DIR)/selftest.flat \ - $(TEST_DIR)/spinlock-test.flat + $(TEST_DIR)/selftest.elf all: test_cases ################################################################## -phys_base = $(LOADADDR) CFLAGS += -std=gnu99 CFLAGS += -ffreestanding @@ -30,38 +23,20 @@ include scripts/asm-offsets.mak cflatobjs += lib/util.o cflatobjs += lib/alloc.o cflatobjs += lib/devicetree.o -cflatobjs += lib/virtio.o -cflatobjs += lib/virtio-mmio.o -cflatobjs += lib/chr-testdev.o -cflatobjs += lib/arm/io.o -cflatobjs += lib/arm/setup.o -cflatobjs += lib/arm/mmu.o -cflatobjs += lib/arm/bitops.o -cflatobjs += lib/arm/psci.o -cflatobjs += lib/arm/smp.o - -libeabi = lib/arm/libeabi.a -eabiobjs = lib/arm/eabi_compat.o +cflatobjs += lib/powerpc/io.o libgcc := $(shell $(CC) $(machine) --print-libgcc-file-name) -start_addr := $(shell printf "%x\n" $$(( $(phys_base) + $(kernel_offset) ))) -FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libgcc) $(libeabi) +FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libgcc) %.elf: LDFLAGS = $(CFLAGS) -nostdlib -%.elf: %.o $(FLATLIBS) arm/flat.lds +%.elf: %.o $(FLATLIBS) powerpc/flat.lds $(CC) $(LDFLAGS) -o $@ \ - -Wl,-T,arm/flat.lds,--build-id=none,-Ttext=$(start_addr) \ + -Wl,-T,powerpc/flat.lds,--build-id=none \ $(filter %.o, $^) $(FLATLIBS) -%.flat: %.elf - $(OBJCOPY) -O binary $^ $@ - -$(libeabi): $(eabiobjs) - $(AR) rcs $@ $^ - -arm_clean: libfdt_clean asm_offsets_clean - $(RM) $(TEST_DIR)/*.{o,flat,elf} $(libeabi) $(eabiobjs) \ - $(TEST_DIR)/.*.d lib/arm/.*.d +powerpc_clean: libfdt_clean asm_offsets_clean + $(RM) $(TEST_DIR)/*.{o,elf} \ + $(TEST_DIR)/.*.d lib/powerpc/.*.d ################################################################## @@ -70,4 +45,3 @@ generated_files = $(asm-offsets) test_cases: $(generated_files) $(tests-common) $(tests) $(TEST_DIR)/selftest.elf: $(cstart.o) $(TEST_DIR)/selftest.o -$(TEST_DIR)/spinlock-test.elf: $(cstart.o) $(TEST_DIR)/spinlock-test.o diff --git a/powerpc/Makefile.ppc64 b/powerpc/Makefile.ppc64 index 0b0761c729c7c..c0b3e9a53fc1f 100644 --- a/powerpc/Makefile.ppc64 +++ b/powerpc/Makefile.ppc64 @@ -1,20 +1,18 @@ # -# arm64 makefile +# ppc64 makefile # # Authors: Andrew Jones <drjones@redhat.com> # bits = 64 -ldarch = elf64-littleaarch64 -kernel_offset = 0x80000 +ldarch = elf64-powerpc cstart.o = $(TEST_DIR)/cstart64.o -cflatobjs += lib/arm64/processor.o -cflatobjs += lib/arm64/spinlock.o +cflatobjs += lib/ppc64/spinlock.o -# arm64 specific tests +# ppc64 specific tests tests = include $(TEST_DIR)/Makefile.common -arch_clean: arm_clean - $(RM) lib/arm64/.*.d +arch_clean: powerpc_clean + $(RM) lib/ppc64/.*.d diff --git a/powerpc/flat.lds b/powerpc/flat.lds index efdf5d7109ffb..84087057c0ce2 100644 --- a/powerpc/flat.lds +++ b/powerpc/flat.lds @@ -4,6 +4,8 @@ SECTIONS .text : { *(.init) *(.text) *(.text.*) } . = ALIGN(64K); etext = .; + .opd : { *(.opd) } + . = ALIGN(16); .data : { *(.data) } @@ -11,16 +13,20 @@ SECTIONS .rodata : { *(.rodata) } . = ALIGN(16); .bss : { *(.bss) } + . = ALIGN(256); + /* + * tocptr is tocbase + 32K, allowing toc offsets to be +-32K + */ + tocptr = . + 32K; + .got : { *(.toc) *(.got) } . = ALIGN(64K); edata = .; . += 64K; . = ALIGN(64K); /* - * stack depth is 16K for arm and PAGE_SIZE for arm64, see THREAD_SIZE - * sp must be 16 byte aligned for arm64, and 8 byte aligned for arm - * sp must always be strictly less than the true stacktop + * stackptr set with initial stack frame (64 bytes) preallocated */ - stackptr = . - 16; + stackptr = . - 64; stacktop = .; }