From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Gibson Subject: Re: [kvm-unit-tests PATCH v5 09/18] powerpc/ppc64: start skeleton framework Date: Fri, 19 Feb 2016 13:11:13 +1100 Message-ID: <20160219021113.GS15224@voom.fritz.box> References: <1455734459-31902-1-git-send-email-drjones@redhat.com> <1455734459-31902-10-git-send-email-drjones@redhat.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="8N5nZmKALFZnI1Hj" Cc: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, thuth@redhat.com, dgibson@redhat.com, agraf@suse.de, lvivier@redhat.com, pbonzini@redhat.com, rkrcmar@redhat.com To: Andrew Jones Return-path: Received: from ozlabs.org ([103.22.144.67]:49754 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1948292AbcBSCUy (ORCPT ); Thu, 18 Feb 2016 21:20:54 -0500 Content-Disposition: inline In-Reply-To: <1455734459-31902-10-git-send-email-drjones@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: --8N5nZmKALFZnI1Hj Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Feb 17, 2016 at 07:40:50PM +0100, Andrew Jones wrote: > 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. >=20 > Signed-off-by: Andrew Jones > Reviewed-by: Thomas Huth Reviewed-by: David Gibson > --- > 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 >=20 > diff --git a/configure b/configure > index 078b70ce096a6..b367224093369 100755 > --- a/configure > +++ b/configure > @@ -80,6 +80,8 @@ if [ "$arch" =3D "i386" ] || [ "$arch" =3D "x86_64" ]; = then > testdir=3Dx86 > elif [ "$arch" =3D "arm" ] || [ "$arch" =3D "arm64" ]; then > testdir=3Darm > +elif [ "$arch" =3D "ppc64" ]; then > + testdir=3Dpowerpc > else > testdir=3D$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 =3D 1; > +} > + > +void spin_unlock(struct spinlock *lock) > +{ > + lock->v =3D 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 =3D 0x40000000 > +endif > + > +tests-common =3D \ > + $(TEST_DIR)/selftest.flat \ > + $(TEST_DIR)/spinlock-test.flat > + > +all: test_cases > + > +################################################################## > +phys_base =3D $(LOADADDR) > + > +CFLAGS +=3D -std=3Dgnu99 > +CFLAGS +=3D -ffreestanding > +CFLAGS +=3D -Wextra > +CFLAGS +=3D -O2 > +CFLAGS +=3D -I lib -I lib/libfdt > + > +asm-offsets =3D lib/$(ARCH)/asm-offsets.h > +include scripts/asm-offsets.mak > + > +cflatobjs +=3D lib/util.o > +cflatobjs +=3D lib/alloc.o > +cflatobjs +=3D lib/devicetree.o > +cflatobjs +=3D lib/virtio.o > +cflatobjs +=3D lib/virtio-mmio.o > +cflatobjs +=3D lib/chr-testdev.o > +cflatobjs +=3D lib/arm/io.o > +cflatobjs +=3D lib/arm/setup.o > +cflatobjs +=3D lib/arm/mmu.o > +cflatobjs +=3D lib/arm/bitops.o > +cflatobjs +=3D lib/arm/psci.o > +cflatobjs +=3D lib/arm/smp.o > + > +libeabi =3D lib/arm/libeabi.a > +eabiobjs =3D lib/arm/eabi_compat.o > + > +libgcc :=3D $(shell $(CC) $(machine) --print-libgcc-file-name) > +start_addr :=3D $(shell printf "%x\n" $$(( $(phys_base) + $(kernel_offse= t) ))) > + > +FLATLIBS =3D $(libcflat) $(LIBFDT_archive) $(libgcc) $(libeabi) > +%.elf: LDFLAGS =3D $(CFLAGS) -nostdlib > +%.elf: %.o $(FLATLIBS) arm/flat.lds > + $(CC) $(LDFLAGS) -o $@ \ > + -Wl,-T,arm/flat.lds,--build-id=3Dnone,-Ttext=3D$(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 =3D $(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 =3D 64 > +ldarch =3D elf64-littleaarch64 > +kernel_offset =3D 0x80000 > + > +cstart.o =3D $(TEST_DIR)/cstart64.o > +cflatobjs +=3D lib/arm64/processor.o > +cflatobjs +=3D lib/arm64/spinlock.o > + > +# arm64 specific tests > +tests =3D > + > +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.*) } > + . =3D ALIGN(64K); > + etext =3D .; > + .data : { > + *(.data) > + } > + . =3D ALIGN(16); > + .rodata : { *(.rodata) } > + . =3D ALIGN(16); > + .bss : { *(.bss) } > + . =3D ALIGN(64K); > + edata =3D .; > + . +=3D 64K; > + . =3D ALIGN(64K); > + /* > + * stack depth is 16K for arm and PAGE_SIZE for arm64, see THREAD_SI= ZE > + * 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 =3D . - 16; > + stacktop =3D .; > +} > + > +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; > +} --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --8N5nZmKALFZnI1Hj Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWxnnBAAoJEGw4ysog2bOSOH8QAKLzVOH1QN9xGIVlzkprond6 KoukZ9HVdWFtb7nlBEjFqbcxEU3KOa3MIq7axQDImOoE5zxg4yOrHnTO8BE6b6HM O0hBzzHQXJ+hHT/7A78JxS+wPEv9FdVnM0ZwCEk3GJCu0W8u/0IAC1B7l3gUgsza jufDp0olbLNorJrcIkPqZ6A+JRcFi8xrVAr7IDAl62KLPtfp2BKrL7eldU5b7YyN 5rU0GutZGsWP2U6ltV6aW/2axND+mb0kRleRaZJZhpZUVOBWl5pWf9BgOsW+ANRE xpOO9wdDBRXtBIEoGloXv86tk7yd4lNdjmR+Fo+GNr6FlvOFtJ43xyGs0fieygsH vPlfyTjL5Nl0w1qnh2OFdBpQMedoUdr7gr3FiywZ+FUcHgE172tA3FmPX+t8CtfM pzCGgHfZhFQOZbEE9fsQsgq7uuu5BFwWvwDUjwWkSbXpcK0tZ/r5qtk/EebMw/xl Xnt8YM3cYogCKL9FbtfIeh754t81+UETIGnoYgrbBkU3+/YIJ8uadjjUS/thiuZK SKigb8+IJQvdfKPJOyDMQbVRxSx6pdf2F9nP16WrqHXvjUCyl+Cl/cr80wGSPNYN tHYIzk9+MASXtpdULVGAxH5T4ow2B/mMsBJ/dDn3P/qIQDN9YakVT+MMZOaikwD+ nQPdivdAkeabgIi+W+c5 =1ew7 -----END PGP SIGNATURE----- --8N5nZmKALFZnI1Hj--