From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 964EBC43334 for ; Thu, 30 Jun 2022 10:04:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234794AbiF3KEg (ORCPT ); Thu, 30 Jun 2022 06:04:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234772AbiF3KEb (ORCPT ); Thu, 30 Jun 2022 06:04:31 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 0B0C0443D1 for ; Thu, 30 Jun 2022 03:04:18 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 05D3E1C01; Thu, 30 Jun 2022 03:04:19 -0700 (PDT) Received: from godel.lab.cambridge.arm.com (godel.lab.cambridge.arm.com [10.7.66.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CB2703F5A1; Thu, 30 Jun 2022 03:04:17 -0700 (PDT) From: Nikos Nikoleris To: kvm@vger.kernel.org Cc: andrew.jones@linux.dev, drjones@redhat.com, pbonzini@redhat.com, jade.alglave@arm.com, alexandru.elisei@arm.com, ricarkol@google.com Subject: [kvm-unit-tests PATCH v3 25/27] arm64: Add support for efi in Makefile Date: Thu, 30 Jun 2022 11:03:22 +0100 Message-Id: <20220630100324.3153655-26-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220630100324.3153655-1-nikos.nikoleris@arm.com> References: <20220630100324.3153655-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Users can now build kvm-unit-tests as efi apps by supplying an extra argument when invoking configure: $> ./configure --enable-efi This patch is based on an earlier version by Andrew Jones Signed-off-by: Nikos Nikoleris Reviewed-by: Ricardo Koller --- configure | 15 ++++++++++++--- arm/Makefile.arm | 6 ++++++ arm/Makefile.arm64 | 18 ++++++++++++++---- arm/Makefile.common | 45 ++++++++++++++++++++++++++++++++++----------- 4 files changed, 66 insertions(+), 18 deletions(-) diff --git a/configure b/configure index 5b7daac..2ff9881 100755 --- a/configure +++ b/configure @@ -196,14 +196,19 @@ else fi fi -if [ "$efi" ] && [ "$arch" != "x86_64" ]; then +if [ "$efi" ] && [ "$arch" != "x86_64" ] && [ "$arch" != "arm64" ]; then echo "--[enable|disable]-efi is not supported for $arch" usage fi if [ -z "$page_size" ]; then - [ "$arch" = "arm64" ] && page_size="65536" - [ "$arch" = "arm" ] && page_size="4096" + if [ "$efi" = 'y' ] && [ "$arch" = "arm64" ]; then + page_size="4096" + elif [ "$arch" = "arm64" ]; then + page_size="65536" + elif [ "$arch" = "arm" ]; then + page_size="4096" + fi else if [ "$arch" != "arm64" ]; then echo "--page-size is not supported for $arch" @@ -218,6 +223,10 @@ else echo "arm64 doesn't support page size of $page_size" usage fi + if [ "$efi" = 'y' ] && [ "$page_size" != "4096" ]; then + echo "efi must use 4K pages" + exit 1 + fi fi [ -z "$processor" ] && processor="$arch" diff --git a/arm/Makefile.arm b/arm/Makefile.arm index 01fd4c7..2ce00f5 100644 --- a/arm/Makefile.arm +++ b/arm/Makefile.arm @@ -7,6 +7,10 @@ bits = 32 ldarch = elf32-littlearm machine = -marm -mfpu=vfp +ifeq ($(CONFIG_EFI),y) +$(error Cannot build arm32 tests as EFI apps) +endif + # stack.o relies on frame pointers. KEEP_FRAME_POINTER := y @@ -32,6 +36,8 @@ cflatobjs += lib/arm/stack.o cflatobjs += lib/ldiv32.o cflatobjs += lib/arm/ldivmod.o +exe = flat + # arm specific tests tests = diff --git a/arm/Makefile.arm64 b/arm/Makefile.arm64 index 42e18e7..fd3d681 100644 --- a/arm/Makefile.arm64 +++ b/arm/Makefile.arm64 @@ -27,11 +27,21 @@ cflatobjs += lib/arm64/gic-v3-its.o lib/arm64/gic-v3-its-cmd.o OBJDIRS += lib/arm64 +ifeq ($(CONFIG_EFI),y) +# avoid jump tables before all relocations have been processed +arm/efi/reloc_aarch64.o: CFLAGS += -fno-jump-tables +cflatobjs += arm/efi/reloc_aarch64.o + +exe = efi +else +exe = flat +endif + # arm64 specific tests -tests = $(TEST_DIR)/timer.flat -tests += $(TEST_DIR)/micro-bench.flat -tests += $(TEST_DIR)/cache.flat -tests += $(TEST_DIR)/debug.flat +tests = $(TEST_DIR)/timer.$(exe) +tests += $(TEST_DIR)/micro-bench.$(exe) +tests += $(TEST_DIR)/cache.$(exe) +tests += $(TEST_DIR)/debug.$(exe) include $(SRCDIR)/$(TEST_DIR)/Makefile.common diff --git a/arm/Makefile.common b/arm/Makefile.common index 5be42c0..a8007f4 100644 --- a/arm/Makefile.common +++ b/arm/Makefile.common @@ -4,14 +4,14 @@ # Authors: Andrew Jones # -tests-common = $(TEST_DIR)/selftest.flat -tests-common += $(TEST_DIR)/spinlock-test.flat -tests-common += $(TEST_DIR)/pci-test.flat -tests-common += $(TEST_DIR)/pmu.flat -tests-common += $(TEST_DIR)/gic.flat -tests-common += $(TEST_DIR)/psci.flat -tests-common += $(TEST_DIR)/sieve.flat -tests-common += $(TEST_DIR)/pl031.flat +tests-common = $(TEST_DIR)/selftest.$(exe) +tests-common += $(TEST_DIR)/spinlock-test.$(exe) +tests-common += $(TEST_DIR)/pci-test.$(exe) +tests-common += $(TEST_DIR)/pmu.$(exe) +tests-common += $(TEST_DIR)/gic.$(exe) +tests-common += $(TEST_DIR)/psci.$(exe) +tests-common += $(TEST_DIR)/sieve.$(exe) +tests-common += $(TEST_DIR)/pl031.$(exe) tests-all = $(tests-common) $(tests) all: directories $(tests-all) @@ -54,6 +54,9 @@ cflatobjs += lib/arm/smp.o cflatobjs += lib/arm/delay.o cflatobjs += lib/arm/gic.o lib/arm/gic-v2.o lib/arm/gic-v3.o cflatobjs += lib/arm/timer.o +ifeq ($(CONFIG_EFI),y) +cflatobjs += lib/efi.o +endif OBJDIRS += lib/arm @@ -61,6 +64,25 @@ libeabi = lib/arm/libeabi.a eabiobjs = lib/arm/eabi_compat.o FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libeabi) + +ifeq ($(CONFIG_EFI),y) +%.so: EFI_LDFLAGS += -defsym=EFI_SUBSYSTEM=0xa --no-undefined +%.so: %.o $(FLATLIBS) $(SRCDIR)/arm/efi/elf_aarch64_efi.lds $(cstart.o) + $(CC) $(CFLAGS) -c -o $(@:.so=.aux.o) $(SRCDIR)/lib/auxinfo.c \ + -DPROGNAME=\"$(@:.so=.efi)\" -DAUXFLAGS=$(AUXFLAGS) + $(LD) $(EFI_LDFLAGS) -o $@ -T $(SRCDIR)/arm/efi/elf_aarch64_efi.lds \ + $(filter %.o, $^) $(FLATLIBS) $(@:.so=.aux.o) \ + $(EFI_LIBS) + $(RM) $(@:.so=.aux.o) + +%.efi: %.so + $(call arch_elf_check, $^) + $(OBJCOPY) \ + -j .text -j .sdata -j .data -j .dynamic -j .dynsym \ + -j .rel -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \ + -j .reloc \ + -O binary $^ $@ +else %.elf: LDFLAGS = -nostdlib $(arch_LDFLAGS) %.elf: %.o $(FLATLIBS) $(SRCDIR)/arm/flat.lds $(cstart.o) $(CC) $(CFLAGS) -c -o $(@:.elf=.aux.o) $(SRCDIR)/lib/auxinfo.c \ @@ -74,13 +96,14 @@ FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libeabi) $(call arch_elf_check, $^) $(OBJCOPY) -O binary $^ $@ @chmod a-x $@ +endif $(libeabi): $(eabiobjs) $(AR) rcs $@ $^ arm_clean: asm_offsets_clean - $(RM) $(TEST_DIR)/*.{o,flat,elf} $(libeabi) $(eabiobjs) \ - $(TEST_DIR)/.*.d lib/arm/.*.d + $(RM) $(TEST_DIR)/*.{o,flat,elf,so,efi} $(libeabi) $(eabiobjs) \ + $(TEST_DIR)/.*.d $(TEST_DIR)/efi/.*.d lib/arm/.*.d generated-files = $(asm-offsets) -$(tests-all:.flat=.o) $(cstart.o) $(cflatobjs): $(generated-files) +$(tests-all:.$(exe)=.o) $(cstart.o) $(cflatobjs): $(generated-files) -- 2.25.1