From patchwork Tue May 30 16:08:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 13260649 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 1A8E3C7EE23 for ; Tue, 30 May 2023 16:10:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233274AbjE3QKM (ORCPT ); Tue, 30 May 2023 12:10:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233264AbjE3QKL (ORCPT ); Tue, 30 May 2023 12:10:11 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3611F1B3 for ; Tue, 30 May 2023 09:09:50 -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 F21E016F2; Tue, 30 May 2023 09:10:34 -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 A6D0A3F663; Tue, 30 May 2023 09:09:48 -0700 (PDT) From: Nikos Nikoleris To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, andrew.jones@linux.dev Cc: pbonzini@redhat.com, alexandru.elisei@arm.com, ricarkol@google.com, shahuang@redhat.com Subject: [kvm-unit-tests PATCH v6 00/32] EFI and ACPI support for arm64 Date: Tue, 30 May 2023 17:08:52 +0100 Message-Id: <20230530160924.82158-1-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Hello, This series adds initial support for building arm64 tests as EFI apps and running them under QEMU. Much like x86_64, we import external dependencies from gnu-efi and adapt them to work with types and other assumptions from kvm-unit-tests. In addition, this series adds support for enumerating parts of the system using ACPI. The first set of patches, moves the existing ACPI code to the common lib path. Then, it extends definitions and functions to allow for more robust discovery of ACPI tables. We add support for setting up the PSCI conduit, discovering the UART, timers, GIC and cpus via ACPI. The code retains existing behavior and gives priority to discovery through DT when one has been provided. In the second set of patches, we add support for getting the command line from the EFI shell. This is a requirement for many of the existing arm64 tests. In the third set of patches, we import code from gnu-efi, make minor changes and add an alternative setup sequence from arm64 systems that boot through EFI. Finally, we add support in the build system and a run script which is used to run an EFI app. After this set of patches one can build arm64 EFI tests: $> ./configure --enable-efi $> make And use the run script to run an EFI tests: $> ./arm/efi/run ./arm/selftest.efi -smp 2 -m 256 -append "setup smp=2 mem=256" Or all tests: $> ./run_tests.sh There are a few items that this series does not address but they would be useful to have: - Support for booting the system from EL2. Currently, we assume that a test starts EL1. This will be required to run EFI tests on sytems that implement EL2. - Support for reading environment variables and populating __envp. - Support for discovering the PCI subsystem using ACPI. - Get rid of other assumptions (e.g., vmalloc area) that don't hold on real HW. - Various fixes related to cache maintaince to better support turn the MMU off. - Switch to a new stack and avoid relying on the one provided by EFI. git branch: https://gitlab.com/nnikoleris/kvm-unit-tests/-/tree/target-efi-upstream-v6 v5: https://lore.kernel.org/kvmarm/20230428120405.3770496-1-nikos.nikoleris@arm.com/ v4: https://lore.kernel.org/kvmarm/20230213101759.2577077-1-nikos.nikoleris@arm.com/ v3: https://lore.kernel.org/all/20220630100324.3153655-1-nikos.nikoleris@arm.com/ v2: https://lore.kernel.org/kvm/20220506205605.359830-1-nikos.nikoleris@arm.com/ Changes in v6: - Fixed a symbol issue in the debug tests that would cause them to fail when build with fPIC. - Added support for booting with FDT. Changes in v5: - Minor style changes (thanks Shaoqin). - Avoid including lib/acpi.o to cflatobjs twice (thanks Drew). - Increase NR_INITIAL_MEM_REGIONS to avoid overflows and add check when we run out of space (thanks Shaoqin). Changes in v4: - Removed patch that reworks cache maintenance when turning the MMU off. This is not strictly required for EFI tests running with tcg and will be addressed in a separate series by Alex. - Fix compilation for arm (Alex). - Convert ACPI tables to Linux style (Alex). Changes in v3: - Addressed feedback from Drew, Alex and Ricardo. Many thanks for the reviews! - Added support for discovering the GIC through ACPI - Added a missing header file () - Added support for correctly parsing the outcome of tests (./run_tests) Thanks, Nikos Alexandru Elisei (2): lib/acpi: Convert table names to Linux style lib: arm: Print test exit status Andrew Jones (2): arm/arm64: Rename etext to _etext arm64: Add a new type of memory type flag MR_F_RESERVED Nikos Nikoleris (28): lib: Move acpi header and implementation to lib x86: Move x86_64-specific EFI CFLAGS to x86_64 Makefile lib: Apply Lindent to acpi.{c,h} lib: Fix style for acpi.{c,h} x86: Avoid references to fields of ACPI tables lib/acpi: Ensure all struct definition for ACPI tables are packed lib/acpi: Add support for the XSDT table lib/acpi: Extend the definition of the FADT table devicetree: Check that fdt is not NULL in dt_available() arm64: Add support for setting up the PSCI conduit through ACPI arm64: Add support for discovering the UART through ACPI arm64: Add support for timer initialization through ACPI arm64: Add support for cpu initialization through ACPI arm64: Add support for gic initialization through ACPI lib/printf: Support for precision modifier in printf lib/printf: Add support for printing wide strings lib/efi: Add support for getting the cmdline lib/efi: Add support for reading an FDT lib: Avoid ms_abi for calls related to EFI on arm64 arm64: Add a setup sequence for systems that boot through EFI arm64: Copy code from GNU-EFI arm64: Change GNU-EFI imported code to use defined types arm64: Use code from the gnu-efi when booting with EFI lib: Avoid external dependency in libelf arm64: Add support for efi in Makefile arm64: debug: Make inline assembly symbols global arm64: Add an efi/run script arm64: Use the provided fdt when booting through EFI scripts/runtime.bash | 13 +- arm/efi/run | 70 +++++++++ arm/run | 14 +- configure | 17 +- Makefile | 4 - arm/Makefile.arm | 6 + arm/Makefile.arm64 | 22 ++- arm/Makefile.common | 47 ++++-- x86/Makefile.common | 2 +- x86/Makefile.x86_64 | 4 + lib/linux/efi.h | 126 +++++++++++++++ lib/arm/asm/setup.h | 9 ++ lib/arm/asm/timer.h | 2 + lib/x86/asm/setup.h | 2 +- lib/acpi.h | 302 ++++++++++++++++++++++++++++++++++++ lib/argv.h | 1 + lib/efi.h | 12 ++ lib/elf.h | 57 +++++++ lib/libcflat.h | 1 + lib/x86/acpi.h | 112 ------------- lib/acpi.c | 129 +++++++++++++++ lib/argv.c | 2 +- lib/arm/gic.c | 139 ++++++++++++++++- lib/arm/io.c | 41 ++++- lib/arm/mmu.c | 4 + lib/arm/psci.c | 37 ++++- lib/arm/setup.c | 284 +++++++++++++++++++++++++++------ lib/arm/timer.c | 92 +++++++++++ lib/devicetree.c | 2 +- lib/efi.c | 222 ++++++++++++++++++++++++++ lib/printf.c | 194 +++++++++++++++++++++-- lib/x86/acpi.c | 82 ---------- lib/x86/setup.c | 2 +- arm/efi/elf_aarch64_efi.lds | 63 ++++++++ arm/flat.lds | 2 +- arm/cstart.S | 1 + arm/cstart64.S | 7 + arm/efi/crt0-efi-aarch64.S | 141 +++++++++++++++++ arm/debug.c | 20 ++- arm/dummy.c | 12 ++ arm/efi/reloc_aarch64.c | 94 +++++++++++ arm/micro-bench.c | 4 +- arm/timer.c | 10 +- x86/s3.c | 21 +-- x86/vmexit.c | 4 +- 45 files changed, 2102 insertions(+), 330 deletions(-) create mode 100755 arm/efi/run create mode 100644 lib/acpi.h create mode 100644 lib/elf.h delete mode 100644 lib/x86/acpi.h create mode 100644 lib/acpi.c create mode 100644 lib/arm/timer.c delete mode 100644 lib/x86/acpi.c create mode 100644 arm/efi/elf_aarch64_efi.lds create mode 100644 arm/efi/crt0-efi-aarch64.S create mode 100644 arm/dummy.c create mode 100644 arm/efi/reloc_aarch64.c