| Message ID | 20220506205605.359830-23-nikos.nikoleris@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | EFI and ACPI support for arm64 | expand |
On Fri, May 06, 2022 at 09:56:04PM +0100, Nikos Nikoleris wrote: > 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 <drjones@redhat.com> > > Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com> > --- > 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 86c3095..beef655 100755 > --- a/configure > +++ b/configure > @@ -195,14 +195,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" > @@ -217,6 +222,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 nit: not really needed as x86 doesn't allow other page sizes, arm64 already forces 4096 above, and arm32 doesn't support efi. > 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 6feac76..550e1b2 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 <drjones@redhat.com> > # > > -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 >
On Fri, May 06, 2022 at 09:56:04PM +0100, Nikos Nikoleris wrote: > 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 <drjones@redhat.com> > > Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com> > --- > 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 86c3095..beef655 100755 > --- a/configure > +++ b/configure > @@ -195,14 +195,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" > @@ -217,6 +222,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 6feac76..550e1b2 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 <drjones@redhat.com> > # > > -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 > Reviewed-by: Ricardo Koller <ricarkol@google.com>
On 21/06/2022 23:51, Ricardo Koller wrote: > On Fri, May 06, 2022 at 09:56:04PM +0100, Nikos Nikoleris wrote: >> 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 <drjones@redhat.com> >> >> Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com> >> --- >> 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 86c3095..beef655 100755 >> --- a/configure >> +++ b/configure >> @@ -195,14 +195,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" >> @@ -217,6 +222,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 > > nit: not really needed as x86 doesn't allow other page sizes, arm64 > already forces 4096 above, and arm32 doesn't support efi. > I might be missing something but without this nothing prevents me from doing: $> ./configure --enable-efi --page-size=16k Which we need to catch. Thanks, Nikos >> 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 6feac76..550e1b2 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 <drjones@redhat.com> >> # >> >> -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 >>
diff --git a/configure b/configure index 86c3095..beef655 100755 --- a/configure +++ b/configure @@ -195,14 +195,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" @@ -217,6 +222,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 6feac76..550e1b2 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 <drjones@redhat.com> # -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)
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 <drjones@redhat.com> Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com> --- configure | 15 ++++++++++++--- arm/Makefile.arm | 6 ++++++ arm/Makefile.arm64 | 18 ++++++++++++++---- arm/Makefile.common | 45 ++++++++++++++++++++++++++++++++++----------- 4 files changed, 66 insertions(+), 18 deletions(-)