From patchwork Mon Feb 15 13:49:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 582944 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 15160140662 for ; Tue, 16 Feb 2016 00:50:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753215AbcBONuK (ORCPT ); Mon, 15 Feb 2016 08:50:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58261 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753281AbcBONuE (ORCPT ); Mon, 15 Feb 2016 08:50:04 -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 A46158E257; Mon, 15 Feb 2016 13:50:04 +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 u1FDnZKP022252; Mon, 15 Feb 2016 08:50:00 -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 08/17] powerpc/ppc64: start skeleton framework Date: Mon, 15 Feb 2016 14:49:17 +0100 Message-Id: <1455544166-19766-9-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 Use the arm/arm64 framework as a template to start a skeleton for powerpc/ppc64. Copy the arm makefiles and linker script verbatim. We'll modify them for powerpc with the next patch, making it clear what needs to be changed. Signed-off-by: Andrew Jones Reviewed-by: Thomas Huth --- configure | 2 ++ lib/powerpc/.gitignore | 1 + lib/powerpc/io.c | 20 +++++++++++++ lib/ppc64/.gitignore | 1 + lib/ppc64/asm-offsets.c | 12 ++++++++ lib/ppc64/asm/asm-offsets.h | 1 + lib/ppc64/asm/io.h | 5 ++++ lib/ppc64/asm/page.h | 1 + lib/ppc64/asm/spinlock.h | 11 +++++++ lib/ppc64/spinlock.c | 11 +++++++ powerpc/Makefile | 1 + powerpc/Makefile.common | 73 +++++++++++++++++++++++++++++++++++++++++++++ powerpc/Makefile.ppc64 | 20 +++++++++++++ powerpc/cstart64.S | 20 +++++++++++++ powerpc/flat.lds | 27 +++++++++++++++++ powerpc/selftest.c | 7 +++++ 16 files changed, 213 insertions(+) create mode 100644 lib/powerpc/.gitignore create mode 100644 lib/powerpc/io.c create mode 100644 lib/ppc64/.gitignore create mode 100644 lib/ppc64/asm-offsets.c create mode 100644 lib/ppc64/asm/asm-offsets.h create mode 100644 lib/ppc64/asm/io.h create mode 100644 lib/ppc64/asm/page.h create mode 100644 lib/ppc64/asm/spinlock.h create mode 100644 lib/ppc64/spinlock.c create mode 100644 powerpc/Makefile create mode 100644 powerpc/Makefile.common create mode 100644 powerpc/Makefile.ppc64 create mode 100644 powerpc/cstart64.S create mode 100644 powerpc/flat.lds create mode 100644 powerpc/selftest.c diff --git a/configure b/configure index 078b70ce096a6..b367224093369 100755 --- a/configure +++ b/configure @@ -80,6 +80,8 @@ if [ "$arch" = "i386" ] || [ "$arch" = "x86_64" ]; then testdir=x86 elif [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then testdir=arm +elif [ "$arch" = "ppc64" ]; then + testdir=powerpc else testdir=$arch fi diff --git a/lib/powerpc/.gitignore b/lib/powerpc/.gitignore new file mode 100644 index 0000000000000..84872bf197c67 --- /dev/null +++ b/lib/powerpc/.gitignore @@ -0,0 +1 @@ +asm-offsets.[hs] diff --git a/lib/powerpc/io.c b/lib/powerpc/io.c new file mode 100644 index 0000000000000..0af45742fc900 --- /dev/null +++ b/lib/powerpc/io.c @@ -0,0 +1,20 @@ +/* + * Each architecture must implement puts() and exit(). + * + * Copyright (C) 2016, Red Hat Inc, Andrew Jones + * + * This work is licensed under the terms of the GNU LGPL, version 2. + */ +#include + +void io_init(void) +{ +} + +void puts(const char *s __unused) +{ +} + +void exit(int code __unused) +{ +} diff --git a/lib/ppc64/.gitignore b/lib/ppc64/.gitignore new file mode 100644 index 0000000000000..84872bf197c67 --- /dev/null +++ b/lib/ppc64/.gitignore @@ -0,0 +1 @@ +asm-offsets.[hs] diff --git a/lib/ppc64/asm-offsets.c b/lib/ppc64/asm-offsets.c new file mode 100644 index 0000000000000..2d38a716976f2 --- /dev/null +++ b/lib/ppc64/asm-offsets.c @@ -0,0 +1,12 @@ +/* + * Copyright (C) 2016, Red Hat Inc, Andrew Jones + * + * This work is licensed under the terms of the GNU LGPL, version 2. + */ +#include +#include + +int main(void) +{ + return 0; +} diff --git a/lib/ppc64/asm/asm-offsets.h b/lib/ppc64/asm/asm-offsets.h new file mode 100644 index 0000000000000..d370ee36a182b --- /dev/null +++ b/lib/ppc64/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/lib/ppc64/asm/io.h b/lib/ppc64/asm/io.h new file mode 100644 index 0000000000000..c0801d4762ba6 --- /dev/null +++ b/lib/ppc64/asm/io.h @@ -0,0 +1,5 @@ +#ifndef _ASMPPC64_IO_H_ +#define _ASMPPC64_IO_H_ +#define __cpu_is_be() (1) +#include +#endif diff --git a/lib/ppc64/asm/page.h b/lib/ppc64/asm/page.h new file mode 100644 index 0000000000000..1a8b62711f288 --- /dev/null +++ b/lib/ppc64/asm/page.h @@ -0,0 +1 @@ +#include diff --git a/lib/ppc64/asm/spinlock.h b/lib/ppc64/asm/spinlock.h new file mode 100644 index 0000000000000..002cdb194b1db --- /dev/null +++ b/lib/ppc64/asm/spinlock.h @@ -0,0 +1,11 @@ +#ifndef _ASMPPC64_SPINLOCK_H_ +#define _ASMPPC64_SPINLOCK_H_ + +struct spinlock { + int v; +}; + +extern void spin_lock(struct spinlock *lock); +extern void spin_unlock(struct spinlock *lock); + +#endif /* _ASMPPC64_SPINLOCK_H_ */ diff --git a/lib/ppc64/spinlock.c b/lib/ppc64/spinlock.c new file mode 100644 index 0000000000000..522f8d047c970 --- /dev/null +++ b/lib/ppc64/spinlock.c @@ -0,0 +1,11 @@ +#include + +void spin_lock(struct spinlock *lock) +{ + lock->v = 1; +} + +void spin_unlock(struct spinlock *lock) +{ + lock->v = 0; +} diff --git a/powerpc/Makefile b/powerpc/Makefile new file mode 100644 index 0000000000000..369a38b2d1703 --- /dev/null +++ b/powerpc/Makefile @@ -0,0 +1 @@ +include $(TEST_DIR)/Makefile.$(ARCH) diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common new file mode 100644 index 0000000000000..dd3a0ca327d06 --- /dev/null +++ b/powerpc/Makefile.common @@ -0,0 +1,73 @@ +# +# arm common makefile +# +# Authors: Andrew Jones +# + +ifeq ($(LOADADDR),) + # qemu mach-virt default load address + LOADADDR = 0x40000000 +endif + +tests-common = \ + $(TEST_DIR)/selftest.flat \ + $(TEST_DIR)/spinlock-test.flat + +all: test_cases + +################################################################## +phys_base = $(LOADADDR) + +CFLAGS += -std=gnu99 +CFLAGS += -ffreestanding +CFLAGS += -Wextra +CFLAGS += -O2 +CFLAGS += -I lib -I lib/libfdt + +asm-offsets = lib/$(ARCH)/asm-offsets.h +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 + +libgcc := $(shell $(CC) $(machine) --print-libgcc-file-name) +start_addr := $(shell printf "%x\n" $$(( $(phys_base) + $(kernel_offset) ))) + +FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libgcc) $(libeabi) +%.elf: LDFLAGS = $(CFLAGS) -nostdlib +%.elf: %.o $(FLATLIBS) arm/flat.lds + $(CC) $(LDFLAGS) -o $@ \ + -Wl,-T,arm/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 + +################################################################## + +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 new file mode 100644 index 0000000000000..0b0761c729c7c --- /dev/null +++ b/powerpc/Makefile.ppc64 @@ -0,0 +1,20 @@ +# +# arm64 makefile +# +# Authors: Andrew Jones +# +bits = 64 +ldarch = elf64-littleaarch64 +kernel_offset = 0x80000 + +cstart.o = $(TEST_DIR)/cstart64.o +cflatobjs += lib/arm64/processor.o +cflatobjs += lib/arm64/spinlock.o + +# arm64 specific tests +tests = + +include $(TEST_DIR)/Makefile.common + +arch_clean: arm_clean + $(RM) lib/arm64/.*.d diff --git a/powerpc/cstart64.S b/powerpc/cstart64.S new file mode 100644 index 0000000000000..f90828dee1c19 --- /dev/null +++ b/powerpc/cstart64.S @@ -0,0 +1,20 @@ +/* + * Entry point and assembler functions for ppc64 tests. + * + * Copyright (C) 2016, Red Hat Inc, Andrew Jones + * + * This work is licensed under the terms of the GNU LGPL, version 2. + */ +#define __ASSEMBLY__ + +.section .init + +.globl start +start: + b halt + +.text + +.globl halt +halt: +1: b 1b diff --git a/powerpc/flat.lds b/powerpc/flat.lds new file mode 100644 index 0000000000000..efdf5d7109ffb --- /dev/null +++ b/powerpc/flat.lds @@ -0,0 +1,27 @@ + +SECTIONS +{ + .text : { *(.init) *(.text) *(.text.*) } + . = ALIGN(64K); + etext = .; + .data : { + *(.data) + } + . = ALIGN(16); + .rodata : { *(.rodata) } + . = ALIGN(16); + .bss : { *(.bss) } + . = 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 = . - 16; + stacktop = .; +} + +ENTRY(start) diff --git a/powerpc/selftest.c b/powerpc/selftest.c new file mode 100644 index 0000000000000..2f2a5215dd55c --- /dev/null +++ b/powerpc/selftest.c @@ -0,0 +1,7 @@ +#include + +int main(void) +{ + printf("hello world\n"); + return 0; +}