From patchwork Mon Feb 15 13:49:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 582945 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3EC961402EC for ; Tue, 16 Feb 2016 00:50:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753306AbcBONuP (ORCPT ); Mon, 15 Feb 2016 08:50:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60859 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753205AbcBONuI (ORCPT ); Mon, 15 Feb 2016 08:50:08 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 388CD8F4EC; Mon, 15 Feb 2016 13:50:08 +0000 (UTC) Received: from hawk.localdomain.com (dhcp-1-251.brq.redhat.com [10.34.1.251]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1FDnZKQ022252; Mon, 15 Feb 2016 08:50:05 -0500 From: Andrew Jones To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: thuth@redhat.com, dgibson@redhat.com, david@gibson.dropbear.id.au, agraf@suse.de, lvivier@redhat.com, pbonzini@redhat.com Subject: [kvm-unit-tests PATCH v4 09/17] powerpc/ppc64: ppc-ify makefiles and linker script Date: Mon, 15 Feb 2016 14:49:18 +0100 Message-Id: <1455544166-19766-10-git-send-email-drjones@redhat.com> In-Reply-To: <1455544166-19766-1-git-send-email-drjones@redhat.com> References: <1455544166-19766-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Signed-off-by: Andrew Jones Reviewed-by: Thomas Huth Tested-by: Laurent Vivier Reviewed-by: David Gibson --- powerpc/Makefile.common | 40 ++++++++++------------------------------ powerpc/Makefile.ppc64 | 15 +++++++-------- powerpc/flat.lds | 14 ++++++++++---- 3 files changed, 27 insertions(+), 42 deletions(-) diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common index dd3a0ca327d06..13b828ab171d6 100644 --- a/powerpc/Makefile.common +++ b/powerpc/Makefile.common @@ -1,17 +1,15 @@ # -# arm common makefile +# powerpc common makefile # # Authors: Andrew Jones # ifeq ($(LOADADDR),) - # qemu mach-virt default load address - LOADADDR = 0x40000000 + LOADADDR = 0x0 endif tests-common = \ - $(TEST_DIR)/selftest.flat \ - $(TEST_DIR)/spinlock-test.flat + $(TEST_DIR)/selftest.elf all: test_cases @@ -30,38 +28,21 @@ 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,-Ttext=$(start_addr) \ $(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 +51,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..95bf6772d65ed 100644 --- a/powerpc/Makefile.ppc64 +++ b/powerpc/Makefile.ppc64 @@ -1,20 +1,19 @@ # -# arm64 makefile +# ppc64 makefile # # Authors: Andrew Jones # bits = 64 -ldarch = elf64-littleaarch64 -kernel_offset = 0x80000 +ldarch = elf64-powerpc +kernel_offset = 0x0 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 = .; }