From patchwork Fri May 6 14:08:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841218 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 CBA75C433EF for ; Fri, 6 May 2022 14:09:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442023AbiEFOM4 (ORCPT ); Fri, 6 May 2022 10:12:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442006AbiEFOMr (ORCPT ); Fri, 6 May 2022 10:12:47 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DEA505A2DF for ; Fri, 6 May 2022 07:09:04 -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 B9345152B; Fri, 6 May 2022 07:09:04 -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 E08303F885; Fri, 6 May 2022 07:09:03 -0700 (PDT) From: Nikos Nikoleris To: Paolo Bonzini Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org Subject: [kvm-unit-tests PATCH 01/23] lib: Move acpi header and implementation to lib Date: Fri, 6 May 2022 15:08:33 +0100 Message-Id: <20220506140855.353337-2-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This change is in preparation of using ACPI in arm64 systems booting with EFI. Signed-off-by: Nikos Nikoleris --- x86/Makefile.common | 2 +- lib/x86/asm/setup.h | 2 +- lib/{x86 => }/acpi.h | 4 ++-- lib/{x86 => }/acpi.c | 0 x86/s3.c | 2 +- x86/vmexit.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename lib/{x86 => }/acpi.h (99%) rename lib/{x86 => }/acpi.c (100%) diff --git a/x86/Makefile.common b/x86/Makefile.common index b903988..4cdba79 100644 --- a/x86/Makefile.common +++ b/x86/Makefile.common @@ -2,6 +2,7 @@ all: directories test_cases +cflatobjs += lib/acpi.o cflatobjs += lib/pci.o cflatobjs += lib/pci-edu.o cflatobjs += lib/alloc.o @@ -18,7 +19,6 @@ cflatobjs += lib/x86/apic.o cflatobjs += lib/x86/atomic.o cflatobjs += lib/x86/desc.o cflatobjs += lib/x86/isr.o -cflatobjs += lib/x86/acpi.o cflatobjs += lib/x86/stack.o cflatobjs += lib/x86/fault_test.o cflatobjs += lib/x86/delay.o diff --git a/lib/x86/asm/setup.h b/lib/x86/asm/setup.h index 24d4fa9..f46462c 100644 --- a/lib/x86/asm/setup.h +++ b/lib/x86/asm/setup.h @@ -4,7 +4,7 @@ unsigned long setup_tss(u8 *stacktop); #ifdef CONFIG_EFI -#include "x86/acpi.h" +#include "acpi.h" #include "x86/apic.h" #include "x86/processor.h" #include "x86/smp.h" diff --git a/lib/x86/acpi.h b/lib/acpi.h similarity index 99% rename from lib/x86/acpi.h rename to lib/acpi.h index 67ba389..1e89840 100644 --- a/lib/x86/acpi.h +++ b/lib/acpi.h @@ -1,5 +1,5 @@ -#ifndef _X86_ACPI_H_ -#define _X86_ACPI_H_ +#ifndef _ACPI_H_ +#define _ACPI_H_ #include "libcflat.h" diff --git a/lib/x86/acpi.c b/lib/acpi.c similarity index 100% rename from lib/x86/acpi.c rename to lib/acpi.c diff --git a/x86/s3.c b/x86/s3.c index 6e41d0c..378d37a 100644 --- a/x86/s3.c +++ b/x86/s3.c @@ -1,5 +1,5 @@ #include "libcflat.h" -#include "x86/acpi.h" +#include "acpi.h" #include "asm/io.h" static u32* find_resume_vector_addr(void) diff --git a/x86/vmexit.c b/x86/vmexit.c index 4adec78..2bac049 100644 --- a/x86/vmexit.c +++ b/x86/vmexit.c @@ -1,9 +1,9 @@ +#include "acpi.h" #include "libcflat.h" #include "smp.h" #include "pci.h" #include "x86/vm.h" #include "x86/desc.h" -#include "x86/acpi.h" #include "x86/apic.h" #include "x86/isr.h" From patchwork Fri May 6 14:08:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841219 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 193B4C433FE for ; Fri, 6 May 2022 14:09:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442013AbiEFOM4 (ORCPT ); Fri, 6 May 2022 10:12:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1391048AbiEFOMt (ORCPT ); Fri, 6 May 2022 10:12:49 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id ECDA866F83 for ; Fri, 6 May 2022 07:09:05 -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 C7AF314BF; Fri, 6 May 2022 07:09:05 -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 F32343F885; Fri, 6 May 2022 07:09:04 -0700 (PDT) From: Nikos Nikoleris To: Paolo Bonzini Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org Subject: [kvm-unit-tests PATCH 02/23] lib: Ensure all struct definition for ACPI tables are packed Date: Fri, 6 May 2022 15:08:34 +0100 Message-Id: <20220506140855.353337-3-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org All ACPI table definitions are provided with precise definitions of field sizes and offsets, make sure that no compiler optimization can interfere with the memory layout of the corresponding structs. Signed-off-by: Nikos Nikoleris --- lib/acpi.h | 11 ++++++++--- x86/s3.c | 16 ++++------------ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/lib/acpi.h b/lib/acpi.h index 1e89840..2a43cbf 100644 --- a/lib/acpi.h +++ b/lib/acpi.h @@ -3,6 +3,11 @@ #include "libcflat.h" +/* + * All tables and structures must be byte-packed to match the ACPI + * specification, since the tables are provided by the system BIOS + */ + #define ACPI_SIGNATURE(c1, c2, c3, c4) \ ((c1) | ((c2) << 8) | ((c3) << 16) | ((c4) << 24)) @@ -44,12 +49,12 @@ struct rsdp_descriptor { /* Root System Descriptor Pointer */ struct acpi_table { ACPI_TABLE_HEADER_DEF char data[0]; -}; +} __attribute__ ((packed)); struct rsdt_descriptor_rev1 { ACPI_TABLE_HEADER_DEF u32 table_offset_entry[0]; -}; +} __attribute__ ((packed));; struct fadt_descriptor_rev1 { @@ -104,7 +109,7 @@ struct facs_descriptor_rev1 u32 S4bios_f : 1; /* Indicates if S4BIOS support is present */ u32 reserved1 : 31; /* Must be 0 */ u8 reserved3 [40]; /* Reserved - must be zero */ -}; +} __attribute__ ((packed)); void set_efi_rsdp(struct rsdp_descriptor *rsdp); void* find_acpi_table_addr(u32 sig); diff --git a/x86/s3.c b/x86/s3.c index 378d37a..89d69fc 100644 --- a/x86/s3.c +++ b/x86/s3.c @@ -2,15 +2,6 @@ #include "acpi.h" #include "asm/io.h" -static u32* find_resume_vector_addr(void) -{ - struct facs_descriptor_rev1 *facs = find_acpi_table_addr(FACS_SIGNATURE); - if (!facs) - return 0; - printf("FACS is at %p\n", facs); - return &facs->firmware_waking_vector; -} - #define RTC_SECONDS_ALARM 1 #define RTC_MINUTES_ALARM 3 #define RTC_HOURS_ALARM 5 @@ -40,12 +31,13 @@ extern char resume_start, resume_end; int main(int argc, char **argv) { struct fadt_descriptor_rev1 *fadt = find_acpi_table_addr(FACP_SIGNATURE); - volatile u32 *resume_vector_ptr = find_resume_vector_addr(); + struct facs_descriptor_rev1 *facs = find_acpi_table_addr(FACS_SIGNATURE); char *addr, *resume_vec = (void*)0x1000; - *resume_vector_ptr = (u32)(ulong)resume_vec; + facs->firmware_waking_vector = (u32)(ulong)resume_vec; - printf("resume vector addr is %p\n", resume_vector_ptr); + printf("FACS is at %p\n", facs); + printf("resume vector addr is %p\n", &facs->firmware_waking_vector); for (addr = &resume_start; addr < &resume_end; addr++) *resume_vec++ = *addr; printf("copy resume code from %p\n", &resume_start); From patchwork Fri May 6 14:08:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841224 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 99082C433FE for ; Fri, 6 May 2022 14:09:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442019AbiEFONE (ORCPT ); Fri, 6 May 2022 10:13:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442012AbiEFOMy (ORCPT ); Fri, 6 May 2022 10:12:54 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E0CE9674F0 for ; Fri, 6 May 2022 07:09:07 -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 B17A41576; Fri, 6 May 2022 07:09:07 -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 DCE8D3F885; Fri, 6 May 2022 07:09:06 -0700 (PDT) From: Nikos Nikoleris To: Paolo Bonzini Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org Subject: [kvm-unit-tests PATCH 04/23] lib: Extend the definition of the ACPI table FADT Date: Fri, 6 May 2022 15:08:36 +0100 Message-Id: <20220506140855.353337-5-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This change add more fields in the APCI table FADT to allow for the discovery of the PSCI conduit in arm64 systems. The definition for FADT is similar to the one in include/acpi/actbl.h in Linux. Signed-off-by: Nikos Nikoleris --- lib/acpi.h | 35 ++++++++++++++++++++++++++++++----- lib/acpi.c | 2 +- x86/s3.c | 2 +- x86/vmexit.c | 2 +- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/lib/acpi.h b/lib/acpi.h index b4ba587..657e868 100644 --- a/lib/acpi.h +++ b/lib/acpi.h @@ -62,7 +62,15 @@ struct acpi_table_xsdt { u64 table_offset_entry[1]; } __attribute__ ((packed)); -struct fadt_descriptor_rev1 +struct acpi_generic_address { + u8 space_id; /* Address space where struct or register exists */ + u8 bit_width; /* Size in bits of given register */ + u8 bit_offset; /* Bit offset within the register */ + u8 access_width; /* Minimum Access size (ACPI 3.0) */ + u64 address; /* 64-bit address of struct or register */ +} __attribute__ ((packed)); + +struct acpi_table_fadt { ACPI_TABLE_HEADER_DEF /* ACPI common table header */ u32 firmware_ctrl; /* Physical address of FACS */ @@ -100,10 +108,27 @@ struct fadt_descriptor_rev1 u8 day_alrm; /* Index to day-of-month alarm in RTC CMOS RAM */ u8 mon_alrm; /* Index to month-of-year alarm in RTC CMOS RAM */ u8 century; /* Index to century in RTC CMOS RAM */ - u8 reserved4; /* Reserved */ - u8 reserved4a; /* Reserved */ - u8 reserved4b; /* Reserved */ -}; + u16 boot_flags; /* IA-PC Boot Architecture Flags (see below for individual flags) */ + u8 reserved; /* Reserved, must be zero */ + u32 flags; /* Miscellaneous flag bits (see below for individual flags) */ + struct acpi_generic_address reset_register; /* 64-bit address of the Reset register */ + u8 reset_value; /* Value to write to the reset_register port to reset the system */ + u16 arm_boot_flags; /* ARM-Specific Boot Flags (see below for individual flags) (ACPI 5.1) */ + u8 minor_revision; /* FADT Minor Revision (ACPI 5.1) */ + u64 Xfacs; /* 64-bit physical address of FACS */ + u64 Xdsdt; /* 64-bit physical address of DSDT */ + struct acpi_generic_address xpm1a_event_block; /* 64-bit Extended Power Mgt 1a Event Reg Blk address */ + struct acpi_generic_address xpm1b_event_block; /* 64-bit Extended Power Mgt 1b Event Reg Blk address */ + struct acpi_generic_address xpm1a_control_block; /* 64-bit Extended Power Mgt 1a Control Reg Blk address */ + struct acpi_generic_address xpm1b_control_block; /* 64-bit Extended Power Mgt 1b Control Reg Blk address */ + struct acpi_generic_address xpm2_control_block; /* 64-bit Extended Power Mgt 2 Control Reg Blk address */ + struct acpi_generic_address xpm_timer_block; /* 64-bit Extended Power Mgt Timer Ctrl Reg Blk address */ + struct acpi_generic_address xgpe0_block; /* 64-bit Extended General Purpose Event 0 Reg Blk address */ + struct acpi_generic_address xgpe1_block; /* 64-bit Extended General Purpose Event 1 Reg Blk address */ + struct acpi_generic_address sleep_control; /* 64-bit Sleep Control register (ACPI 5.0) */ + struct acpi_generic_address sleep_status; /* 64-bit Sleep Status register (ACPI 5.0) */ + u64 hypervisor_id; /* Hypervisor Vendor ID (ACPI 6.0) */ +} __attribute__ ((packed)); struct facs_descriptor_rev1 { diff --git a/lib/acpi.c b/lib/acpi.c index 63451b8..5e56dff 100644 --- a/lib/acpi.c +++ b/lib/acpi.c @@ -46,7 +46,7 @@ void* find_acpi_table_addr(u32 sig) /* FACS is special... */ if (sig == FACS_SIGNATURE) { - struct fadt_descriptor_rev1 *fadt; + struct acpi_table_fadt *fadt; fadt = find_acpi_table_addr(FACP_SIGNATURE); if (!fadt) { return NULL; diff --git a/x86/s3.c b/x86/s3.c index 89d69fc..16e79f8 100644 --- a/x86/s3.c +++ b/x86/s3.c @@ -30,7 +30,7 @@ extern char resume_start, resume_end; int main(int argc, char **argv) { - struct fadt_descriptor_rev1 *fadt = find_acpi_table_addr(FACP_SIGNATURE); + struct acpi_table_fadt *fadt = find_acpi_table_addr(FACP_SIGNATURE); struct facs_descriptor_rev1 *facs = find_acpi_table_addr(FACS_SIGNATURE); char *addr, *resume_vec = (void*)0x1000; diff --git a/x86/vmexit.c b/x86/vmexit.c index 2bac049..fcc0760 100644 --- a/x86/vmexit.c +++ b/x86/vmexit.c @@ -206,7 +206,7 @@ int pm_tmr_blk; static void inl_pmtimer(void) { if (!pm_tmr_blk) { - struct fadt_descriptor_rev1 *fadt; + struct acpi_table_fadt *fadt; fadt = find_acpi_table_addr(FACP_SIGNATURE); pm_tmr_blk = fadt->pm_tmr_blk; From patchwork Fri May 6 14:08:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841223 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 10CAEC433EF for ; Fri, 6 May 2022 14:09:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442032AbiEFONC (ORCPT ); Fri, 6 May 2022 10:13:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442017AbiEFOMz (ORCPT ); Fri, 6 May 2022 10:12:55 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1667166221 for ; Fri, 6 May 2022 07:09:09 -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 DB8151596; Fri, 6 May 2022 07:09:08 -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 EBD683F885; Fri, 6 May 2022 07:09:07 -0700 (PDT) From: Nikos Nikoleris To: Andrew Jones Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: [kvm-unit-tests PATCH 05/23] arm/arm64: Add support for setting up the PSCI conduit through ACPI Date: Fri, 6 May 2022 15:08:37 +0100 Message-Id: <20220506140855.353337-6-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org In systems with ACPI support and when a DT is not provided, we can use the FADT to discover whether PSCI calls need to use smc or hvc calls. This change implements this but retains the default behavior; we check if a valid DT is provided, if not, we try to setup the PSCI conduit using ACPI. Signed-off-by: Nikos Nikoleris --- arm/Makefile.common | 1 + lib/acpi.h | 5 +++++ lib/arm/psci.c | 23 ++++++++++++++++++++++- lib/devicetree.c | 2 +- 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/arm/Makefile.common b/arm/Makefile.common index 38385e0..8e9b3bb 100644 --- a/arm/Makefile.common +++ b/arm/Makefile.common @@ -38,6 +38,7 @@ cflatobjs += lib/alloc_page.o cflatobjs += lib/vmalloc.o cflatobjs += lib/alloc.o cflatobjs += lib/devicetree.o +cflatobjs += lib/acpi.o cflatobjs += lib/pci.o cflatobjs += lib/pci-host-generic.o cflatobjs += lib/pci-testdev.o diff --git a/lib/acpi.h b/lib/acpi.h index 657e868..40392e3 100644 --- a/lib/acpi.h +++ b/lib/acpi.h @@ -130,6 +130,11 @@ struct acpi_table_fadt u64 hypervisor_id; /* Hypervisor Vendor ID (ACPI 6.0) */ } __attribute__ ((packed)); +/* Masks for FADT ARM Boot Architecture Flags (arm_boot_flags) ACPI 5.1 */ + +#define ACPI_FADT_PSCI_COMPLIANT (1) /* 00: [V5+] PSCI 0.2+ is implemented */ +#define ACPI_FADT_PSCI_USE_HVC (1<<1) /* 01: [V5+] HVC must be used instead of SMC as the PSCI conduit */ + struct facs_descriptor_rev1 { u32 signature; /* ACPI Signature */ diff --git a/lib/arm/psci.c b/lib/arm/psci.c index 9c031a1..0e96d19 100644 --- a/lib/arm/psci.c +++ b/lib/arm/psci.c @@ -6,6 +6,7 @@ * * This work is licensed under the terms of the GNU LGPL, version 2. */ +#include #include #include #include @@ -56,7 +57,7 @@ void psci_system_off(void) printf("CPU%d unable to do system off (error = %d)\n", smp_processor_id(), err); } -void psci_set_conduit(void) +static void psci_set_conduit_fdt(void) { const void *fdt = dt_fdt(); const struct fdt_property *method; @@ -75,3 +76,23 @@ void psci_set_conduit(void) else assert_msg(false, "Unknown PSCI conduit: %s", method->data); } + +static void psci_set_conduit_acpi(void) +{ + struct acpi_table_fadt *fadt = find_acpi_table_addr(FACP_SIGNATURE); + assert_msg(fadt, "Unable to find ACPI FADT"); + assert_msg(fadt->arm_boot_flags & ACPI_FADT_PSCI_COMPLIANT, + "PSCI is not supported in this platfrom"); + if (fadt->arm_boot_flags & ACPI_FADT_PSCI_USE_HVC) + psci_invoke = psci_invoke_hvc; + else + psci_invoke = psci_invoke_smc; +} + +void psci_set_conduit(void) +{ + if (dt_available()) + psci_set_conduit_fdt(); + else + psci_set_conduit_acpi(); +} diff --git a/lib/devicetree.c b/lib/devicetree.c index 78c1f6f..3ff9d16 100644 --- a/lib/devicetree.c +++ b/lib/devicetree.c @@ -16,7 +16,7 @@ const void *dt_fdt(void) bool dt_available(void) { - return fdt_check_header(fdt) == 0; + return fdt && fdt_check_header(fdt) == 0; } int dt_get_nr_cells(int fdtnode, u32 *nr_address_cells, u32 *nr_size_cells) From patchwork Fri May 6 14:08:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841222 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 79C48C4332F for ; Fri, 6 May 2022 14:09:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442024AbiEFONB (ORCPT ); Fri, 6 May 2022 10:13:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442019AbiEFOMz (ORCPT ); Fri, 6 May 2022 10:12:55 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 35F0C68317 for ; Fri, 6 May 2022 07:09:10 -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 106DB1570; Fri, 6 May 2022 07:09:10 -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 2121F3F885; Fri, 6 May 2022 07:09:09 -0700 (PDT) From: Nikos Nikoleris To: Andrew Jones Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: [kvm-unit-tests PATCH 06/23] arm/arm64: Add support for discovering the UART through ACPI Date: Fri, 6 May 2022 15:08:38 +0100 Message-Id: <20220506140855.353337-7-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org In systems with ACPI support and when a DT is not provided, we can use the SPCR to discover the serial port address range. This change implements this but retains the default behavior; we check if a valid DT is provided, if not, we try to discover the UART using ACPI. Signed-off-by: Nikos Nikoleris --- lib/acpi.h | 25 +++++++++++++++++++++++++ lib/arm/io.c | 21 +++++++++++++++++++-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/lib/acpi.h b/lib/acpi.h index 40392e3..0611cdf 100644 --- a/lib/acpi.h +++ b/lib/acpi.h @@ -16,6 +16,7 @@ #define XSDT_SIGNATURE ACPI_SIGNATURE('X','S','D','T') #define FACP_SIGNATURE ACPI_SIGNATURE('F','A','C','P') #define FACS_SIGNATURE ACPI_SIGNATURE('F','A','C','S') +#define SPCR_SIGNATURE ACPI_SIGNATURE('S','P','C','R') #define ACPI_SIGNATURE_8BYTE(c1, c2, c3, c4, c5, c6, c7, c8) \ @@ -147,6 +148,30 @@ struct facs_descriptor_rev1 u8 reserved3 [40]; /* Reserved - must be zero */ } __attribute__ ((packed)); +struct spcr_descriptor { + ACPI_TABLE_HEADER_DEF /* ACPI common table header */ + u8 interface_type; /* 0=full 16550, 1=subset of 16550 */ + u8 reserved[3]; + struct acpi_generic_address serial_port; + u8 interrupt_type; + u8 pc_interrupt; + u32 interrupt; + u8 baud_rate; + u8 parity; + u8 stop_bits; + u8 flow_control; + u8 terminal_type; + u8 reserved1; + u16 pci_device_id; + u16 pci_vendor_id; + u8 pci_bus; + u8 pci_device; + u8 pci_function; + u32 pci_flags; + u8 pci_segment; + u32 reserved2; +} __attribute__ ((packed)); + void set_efi_rsdp(struct rsdp_descriptor *rsdp); void* find_acpi_table_addr(u32 sig); diff --git a/lib/arm/io.c b/lib/arm/io.c index 343e108..893bdfc 100644 --- a/lib/arm/io.c +++ b/lib/arm/io.c @@ -8,6 +8,7 @@ * * This work is licensed under the terms of the GNU LGPL, version 2. */ +#include #include #include #include @@ -29,7 +30,7 @@ static struct spinlock uart_lock; #define UART_EARLY_BASE (u8 *)(unsigned long)CONFIG_UART_EARLY_BASE static volatile u8 *uart0_base = UART_EARLY_BASE; -static void uart0_init(void) +static void uart0_init_fdt(void) { /* * kvm-unit-tests uses the uart only for output. Both uart models have @@ -73,9 +74,25 @@ static void uart0_init(void) } } +static void uart0_init_acpi(void) +{ + struct spcr_descriptor *spcr = find_acpi_table_addr(SPCR_SIGNATURE); + assert_msg(spcr, "Unable to find ACPI SPCR"); + uart0_base = ioremap(spcr->serial_port.address, spcr->serial_port.bit_width); + + if (uart0_base != UART_EARLY_BASE) { + printf("WARNING: early print support may not work. " + "Found uart at %p, but early base is %p.\n", + uart0_base, UART_EARLY_BASE); + } +} + void io_init(void) { - uart0_init(); + if (dt_available()) + uart0_init_fdt(); + else + uart0_init_acpi(); chr_testdev_init(); } From patchwork Fri May 6 14:08:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841220 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 82FC7C433F5 for ; Fri, 6 May 2022 14:09:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442016AbiEFOM6 (ORCPT ); Fri, 6 May 2022 10:12:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442018AbiEFOMz (ORCPT ); Fri, 6 May 2022 10:12:55 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 60BC068321 for ; Fri, 6 May 2022 07:09:11 -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 3A67B1595; Fri, 6 May 2022 07:09:11 -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 4AFF03F885; Fri, 6 May 2022 07:09:10 -0700 (PDT) From: Nikos Nikoleris To: Andrew Jones Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: [kvm-unit-tests PATCH 07/23] arm/arm64: Add support for timer initialization through ACPI Date: Fri, 6 May 2022 15:08:39 +0100 Message-Id: <20220506140855.353337-8-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org For systems with ACPI support, we can discover timers through the ACPI GTDT table. This change implements the code to discover timers through the GTDT and adds ACPI support in timer_save_state. This change retains the default behavior; we check if a valid DT is provided, if not, we try to discover timers using ACPI. Signed-off-by: Nikos Nikoleris --- arm/Makefile.common | 1 + lib/arm/asm/timer.h | 2 ++ lib/acpi.h | 18 ++++++++++++ lib/arm/setup.c | 39 ------------------------ lib/arm/timer.c | 72 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 93 insertions(+), 39 deletions(-) create mode 100644 lib/arm/timer.c diff --git a/arm/Makefile.common b/arm/Makefile.common index 8e9b3bb..5be42c0 100644 --- a/arm/Makefile.common +++ b/arm/Makefile.common @@ -53,6 +53,7 @@ cflatobjs += lib/arm/psci.o 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 OBJDIRS += lib/arm diff --git a/lib/arm/asm/timer.h b/lib/arm/asm/timer.h index f75cc67..aaf839f 100644 --- a/lib/arm/asm/timer.h +++ b/lib/arm/asm/timer.h @@ -27,5 +27,7 @@ extern struct timer_state __timer_state; #define TIMER_PTIMER_IRQ (__timer_state.ptimer.irq) #define TIMER_VTIMER_IRQ (__timer_state.vtimer.irq) +void timer_save_state(void); + #endif /* !__ASSEMBLY__ */ #endif /* _ASMARM_TIMER_H_ */ diff --git a/lib/acpi.h b/lib/acpi.h index 0611cdf..47e56d2 100644 --- a/lib/acpi.h +++ b/lib/acpi.h @@ -17,6 +17,7 @@ #define FACP_SIGNATURE ACPI_SIGNATURE('F','A','C','P') #define FACS_SIGNATURE ACPI_SIGNATURE('F','A','C','S') #define SPCR_SIGNATURE ACPI_SIGNATURE('S','P','C','R') +#define GTDT_SIGNATURE ACPI_SIGNATURE('G','T','D','T') #define ACPI_SIGNATURE_8BYTE(c1, c2, c3, c4, c5, c6, c7, c8) \ @@ -172,6 +173,23 @@ struct spcr_descriptor { u32 reserved2; } __attribute__ ((packed)); +struct acpi_table_gtdt { + ACPI_TABLE_HEADER_DEF /* ACPI common table header */ + u64 counter_block_addresss; + u32 reserved; + u32 secure_el1_interrupt; + u32 secure_el1_flags; + u32 non_secure_el1_interrupt; + u32 non_secure_el1_flags; + u32 virtual_timer_interrupt; + u32 virtual_timer_flags; + u32 non_secure_el2_interrupt; + u32 non_secure_el2_flags; + u64 counter_read_block_address; + u32 platform_timer_count; + u32 platform_timer_offset; +} __attribute__ ((packed)); + void set_efi_rsdp(struct rsdp_descriptor *rsdp); void* find_acpi_table_addr(u32 sig); diff --git a/lib/arm/setup.c b/lib/arm/setup.c index bcdf0d7..1572c64 100644 --- a/lib/arm/setup.c +++ b/lib/arm/setup.c @@ -35,8 +35,6 @@ extern unsigned long etext; -struct timer_state __timer_state; - char *initrd; u32 initrd_size; @@ -199,43 +197,6 @@ static void mem_init(phys_addr_t freemem_start) page_alloc_ops_enable(); } -static void timer_save_state(void) -{ - const struct fdt_property *prop; - const void *fdt = dt_fdt(); - int node, len; - u32 *data; - - node = fdt_node_offset_by_compatible(fdt, -1, "arm,armv8-timer"); - assert(node >= 0 || node == -FDT_ERR_NOTFOUND); - - if (node == -FDT_ERR_NOTFOUND) { - __timer_state.ptimer.irq = -1; - __timer_state.vtimer.irq = -1; - return; - } - - /* - * From Linux devicetree timer binding documentation - * - * interrupts : - * secure timer irq - * non-secure timer irq (ptimer) - * virtual timer irq (vtimer) - * hypervisor timer irq - */ - prop = fdt_get_property(fdt, node, "interrupts", &len); - assert(prop && len == (4 * 3 * sizeof(u32))); - - data = (u32 *)prop->data; - assert(fdt32_to_cpu(data[3]) == 1 /* PPI */); - __timer_state.ptimer.irq = fdt32_to_cpu(data[4]); - __timer_state.ptimer.irq_flags = fdt32_to_cpu(data[5]); - assert(fdt32_to_cpu(data[6]) == 1 /* PPI */); - __timer_state.vtimer.irq = fdt32_to_cpu(data[7]); - __timer_state.vtimer.irq_flags = fdt32_to_cpu(data[8]); -} - void setup(const void *fdt, phys_addr_t freemem_start) { void *freemem; diff --git a/lib/arm/timer.c b/lib/arm/timer.c new file mode 100644 index 0000000..52d25d8 --- /dev/null +++ b/lib/arm/timer.c @@ -0,0 +1,72 @@ +/* + * Initialize timers. + * + * Copyright (C) 2022, Arm Ltd., Nikos Nikoleris + * Copyright (C) 2014, Red Hat Inc, Andrew Jones + * + * This work is licensed under the terms of the GNU LGPL, version 2. + */ +#include +#include + +#include +#include +#include + +struct timer_state __timer_state; + +static void timer_save_state_fdt(void) +{ + const struct fdt_property *prop; + const void *fdt = dt_fdt(); + int node, len; + u32 *data; + + node = fdt_node_offset_by_compatible(fdt, -1, "arm,armv8-timer"); + assert(node >= 0 || node == -FDT_ERR_NOTFOUND); + + if (node == -FDT_ERR_NOTFOUND) { + __timer_state.ptimer.irq = -1; + __timer_state.vtimer.irq = -1; + return; + } + + /* + * From Linux devicetree timer binding documentation + * + * interrupts : + * secure timer irq + * non-secure timer irq (ptimer) + * virtual timer irq (vtimer) + * hypervisor timer irq + */ + prop = fdt_get_property(fdt, node, "interrupts", &len); + assert(prop && len == (4 * 3 * sizeof(u32))); + + data = (u32 *)prop->data; + assert(fdt32_to_cpu(data[3]) == 1 /* PPI */); + __timer_state.ptimer.irq = fdt32_to_cpu(data[4]); + __timer_state.ptimer.irq_flags = fdt32_to_cpu(data[5]); + assert(fdt32_to_cpu(data[6]) == 1 /* PPI */); + __timer_state.vtimer.irq = fdt32_to_cpu(data[7]); + __timer_state.vtimer.irq_flags = fdt32_to_cpu(data[8]); +} + +static void timer_save_state_acpi(void) +{ + struct acpi_table_gtdt *gtdt = find_acpi_table_addr(GTDT_SIGNATURE); + assert_msg(gtdt, "Unable to find ACPI GTDT"); + __timer_state.ptimer.irq = gtdt->non_secure_el1_interrupt; + __timer_state.ptimer.irq_flags = gtdt->non_secure_el1_flags; + + __timer_state.vtimer.irq = gtdt->virtual_timer_interrupt; + __timer_state.vtimer.irq_flags = gtdt->virtual_timer_flags; +} + +void timer_save_state(void) +{ + if (dt_available()) + timer_save_state_fdt(); + else + timer_save_state_acpi(); +} From patchwork Fri May 6 14:08:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841221 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 90A42C433EF for ; Fri, 6 May 2022 14:09:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1391048AbiEFONA (ORCPT ); Fri, 6 May 2022 10:13:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442021AbiEFOMz (ORCPT ); Fri, 6 May 2022 10:12:55 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 88EC368984 for ; Fri, 6 May 2022 07:09:12 -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 6448B1570; Fri, 6 May 2022 07:09:12 -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 74D4C3F885; Fri, 6 May 2022 07:09:11 -0700 (PDT) From: Nikos Nikoleris To: Andrew Jones Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: [kvm-unit-tests PATCH 08/23] arm/arm64: Add support for cpu initialization through ACPI Date: Fri, 6 May 2022 15:08:40 +0100 Message-Id: <20220506140855.353337-9-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org In systems with ACPI support and when a DT is not provided, we can use the MADTs to discover the number of CPUs and their corresponding MIDR. This change implements this but retains the default behavior; we check if a valid DT is provided, if not, we try to discover the cores in the system using ACPI. Signed-off-by: Nikos Nikoleris --- lib/acpi.h | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/acpi.c | 21 ++++++++++++++++ lib/arm/setup.c | 25 ++++++++++++++++--- 3 files changed, 107 insertions(+), 3 deletions(-) diff --git a/lib/acpi.h b/lib/acpi.h index 47e56d2..296ad25 100644 --- a/lib/acpi.h +++ b/lib/acpi.h @@ -16,6 +16,7 @@ #define XSDT_SIGNATURE ACPI_SIGNATURE('X','S','D','T') #define FACP_SIGNATURE ACPI_SIGNATURE('F','A','C','P') #define FACS_SIGNATURE ACPI_SIGNATURE('F','A','C','S') +#define MADT_SIGNATURE ACPI_SIGNATURE('A','P','I','C') #define SPCR_SIGNATURE ACPI_SIGNATURE('S','P','C','R') #define GTDT_SIGNATURE ACPI_SIGNATURE('G','T','D','T') @@ -149,6 +150,67 @@ struct facs_descriptor_rev1 u8 reserved3 [40]; /* Reserved - must be zero */ } __attribute__ ((packed)); +struct acpi_table_madt { + ACPI_TABLE_HEADER_DEF /* ACPI common table header */ + u32 address; /* Physical address of local APIC */ + u32 flags; +} __attribute__ ((packed)); + +struct acpi_subtable_header { + u8 type; + u8 length; +} __attribute__ ((packed)); + +typedef int (*acpi_table_handler)(struct acpi_subtable_header *header); + +/* 11: Generic interrupt - GICC (ACPI 5.0 + ACPI 6.0 + ACPI 6.3 changes) */ + +struct acpi_madt_generic_interrupt { + u8 type; + u8 length; + u16 reserved; /* reserved - must be zero */ + u32 cpu_interface_number; + u32 uid; + u32 flags; + u32 parking_version; + u32 performance_interrupt; + u64 parked_address; + u64 base_address; + u64 gicv_base_address; + u64 gich_base_address; + u32 vgic_interrupt; + u64 gicr_base_address; + u64 arm_mpidr; + u8 efficiency_class; + u8 reserved2[1]; + u16 spe_interrupt; /* ACPI 6.3 */ +} __attribute__ ((packed)); + +/* Values for MADT subtable type in struct acpi_subtable_header */ + +enum acpi_madt_type { + ACPI_MADT_TYPE_LOCAL_APIC = 0, + ACPI_MADT_TYPE_IO_APIC = 1, + ACPI_MADT_TYPE_INTERRUPT_OVERRIDE = 2, + ACPI_MADT_TYPE_NMI_SOURCE = 3, + ACPI_MADT_TYPE_LOCAL_APIC_NMI = 4, + ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE = 5, + ACPI_MADT_TYPE_IO_SAPIC = 6, + ACPI_MADT_TYPE_LOCAL_SAPIC = 7, + ACPI_MADT_TYPE_INTERRUPT_SOURCE = 8, + ACPI_MADT_TYPE_LOCAL_X2APIC = 9, + ACPI_MADT_TYPE_LOCAL_X2APIC_NMI = 10, + ACPI_MADT_TYPE_GENERIC_INTERRUPT = 11, + ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR = 12, + ACPI_MADT_TYPE_GENERIC_MSI_FRAME = 13, + ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR = 14, + ACPI_MADT_TYPE_GENERIC_TRANSLATOR = 15, + ACPI_MADT_TYPE_RESERVED = 16 /* 16 and greater are reserved */ +}; + +/* MADT Local APIC flags */ +#define ACPI_MADT_ENABLED (1) /* 00: Processor is usable if set */ + struct spcr_descriptor { ACPI_TABLE_HEADER_DEF /* ACPI common table header */ u8 interface_type; /* 0=full 16550, 1=subset of 16550 */ @@ -192,5 +254,7 @@ struct acpi_table_gtdt { void set_efi_rsdp(struct rsdp_descriptor *rsdp); void* find_acpi_table_addr(u32 sig); +void acpi_table_parse_madt(enum acpi_madt_type mtype, + acpi_table_handler handler); #endif diff --git a/lib/acpi.c b/lib/acpi.c index 5e56dff..d76c762 100644 --- a/lib/acpi.c +++ b/lib/acpi.c @@ -102,3 +102,24 @@ void* find_acpi_table_addr(u32 sig) return NULL; } + +void acpi_table_parse_madt(enum acpi_madt_type mtype, + acpi_table_handler handler) +{ + struct acpi_table_madt *madt; + void *end; + + madt = find_acpi_table_addr(MADT_SIGNATURE); + assert(madt); + + struct acpi_subtable_header *header = + (void*)(ulong)madt + sizeof(struct acpi_table_madt); + end = (void*)((ulong)madt + madt->length); + + while ((void *)header < end) { + if (header->type == mtype) { + handler(header); + } + header = (void*)(ulong)header + header->length; + } +} diff --git a/lib/arm/setup.c b/lib/arm/setup.c index 1572c64..3c24c75 100644 --- a/lib/arm/setup.c +++ b/lib/arm/setup.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -55,7 +56,7 @@ int mpidr_to_cpu(uint64_t mpidr) return -1; } -static void cpu_set(int fdtnode __unused, u64 regval, void *info __unused) +static void cpu_set_fdt(int fdtnode __unused, u64 regval, void *info __unused) { int cpu = nr_cpus++; @@ -65,13 +66,31 @@ static void cpu_set(int fdtnode __unused, u64 regval, void *info __unused) set_cpu_present(cpu, true); } +static int cpu_set_acpi(struct acpi_subtable_header *header) +{ + int cpu = nr_cpus++; + struct acpi_madt_generic_interrupt *gicc = (void *)header; + + assert_msg(cpu < NR_CPUS, "Number cpus exceeds maximum supported (%d).", NR_CPUS); + + cpus[cpu] = gicc->arm_mpidr; + set_cpu_present(cpu, true); + + return 0; +} + static void cpu_init(void) { int ret; nr_cpus = 0; - ret = dt_for_each_cpu_node(cpu_set, NULL); - assert(ret == 0); + if (dt_available()) { + ret = dt_for_each_cpu_node(cpu_set_fdt, NULL); + assert(ret == 0); + } else + acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_INTERRUPT, + cpu_set_acpi); + set_cpu_online(0, true); } From patchwork Fri May 6 14:08:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841225 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 4A81CC433F5 for ; Fri, 6 May 2022 14:09:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442017AbiEFONF (ORCPT ); Fri, 6 May 2022 10:13:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442029AbiEFOM7 (ORCPT ); Fri, 6 May 2022 10:12:59 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 81748674D7 for ; Fri, 6 May 2022 07:09:16 -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 373A31595; Fri, 6 May 2022 07:09:16 -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 47BAC3F885; Fri, 6 May 2022 07:09:15 -0700 (PDT) From: Nikos Nikoleris To: Andrew Jones Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: [kvm-unit-tests PATCH 12/23] arm/arm64: mmu_disable: Clean and invalidate before disabling Date: Fri, 6 May 2022 15:08:44 +0100 Message-Id: <20220506140855.353337-13-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Andrew Jones The commit message of commit 410b3bf09e76 ("arm/arm64: Perform dcache clean + invalidate after turning MMU off") justifies cleaning and invalidating the dcache after disabling the MMU by saying it's nice not to rely on the current page tables and that it should still work (per the spec), as long as there's an identity map in the current tables. Doing the invalidation after also somewhat helped with reenabling the MMU without seeing stale data, but the real problem with reenabling was because the cache needs to be disabled with the MMU, but it wasn't. Since we have to trust/validate that the current page tables have an identity map anyway, then there's no harm in doing the clean and invalidate first (it feels a little better to do so, anyway, considering the cache maintenance instructions take virtual addresses). Then, also disable the cache with the MMU to avoid problems when reenabling. We invalidate the Icache and disable that too for good measure. And, a final TLB invalidation ensures we're crystal clean when we return from asm_mmu_disable(). Cc: Alexandru Elisei Signed-off-by: Andrew Jones Signed-off-by: Nikos Nikoleris --- arm/cstart.S | 28 +++++++++++++++++++++------- arm/cstart64.S | 21 ++++++++++++++++----- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/arm/cstart.S b/arm/cstart.S index 7036e67..dc324c5 100644 --- a/arm/cstart.S +++ b/arm/cstart.S @@ -179,6 +179,7 @@ halt: .globl asm_mmu_enable asm_mmu_enable: /* TLBIALL */ + mov r2, #0 mcr p15, 0, r2, c8, c7, 0 dsb nsh @@ -211,12 +212,7 @@ asm_mmu_enable: .globl asm_mmu_disable asm_mmu_disable: - /* SCTLR */ - mrc p15, 0, r0, c1, c0, 0 - bic r0, #CR_M - mcr p15, 0, r0, c1, c0, 0 - isb - + /* Clean + invalidate the entire memory */ ldr r0, =__phys_offset ldr r0, [r0] ldr r1, =__phys_end @@ -224,7 +220,25 @@ asm_mmu_disable: sub r1, r1, r0 dcache_by_line_op dccimvac, sy, r0, r1, r2, r3 - mov pc, lr + /* Invalidate Icache */ + mov r0, #0 + mcr p15, 0, r0, c7, c5, 0 + isb + + /* Disable cache, Icache and MMU */ + mrc p15, 0, r0, c1, c0, 0 + bic r0, #CR_C + bic r0, #CR_I + bic r0, #CR_M + mcr p15, 0, r0, c1, c0, 0 + isb + + /* Invalidate TLB */ + mov r0, #0 + mcr p15, 0, r0, c8, c7, 0 + dsb nsh + + mov pc, lr /* * Vectors diff --git a/arm/cstart64.S b/arm/cstart64.S index e4ab7d0..390feb9 100644 --- a/arm/cstart64.S +++ b/arm/cstart64.S @@ -246,11 +246,6 @@ asm_mmu_enable: .globl asm_mmu_disable asm_mmu_disable: - mrs x0, sctlr_el1 - bic x0, x0, SCTLR_EL1_M - msr sctlr_el1, x0 - isb - /* Clean + invalidate the entire memory */ adrp x0, __phys_offset ldr x0, [x0, :lo12:__phys_offset] @@ -259,6 +254,22 @@ asm_mmu_disable: sub x1, x1, x0 dcache_by_line_op civac, sy, x0, x1, x2, x3 + /* Invalidate Icache */ + ic iallu + isb + + /* Disable cache, Icache and MMU */ + mrs x0, sctlr_el1 + bic x0, x0, SCTLR_EL1_C + bic x0, x0, SCTLR_EL1_I + bic x0, x0, SCTLR_EL1_M + msr sctlr_el1, x0 + isb + + /* Invalidate TLB */ + tlbi vmalle1 + dsb nsh + ret /* From patchwork Fri May 6 14:08:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841226 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 264F8C433EF for ; Fri, 6 May 2022 14:09:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442040AbiEFONG (ORCPT ); Fri, 6 May 2022 10:13:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442021AbiEFONA (ORCPT ); Fri, 6 May 2022 10:13:00 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 924CE66F93 for ; Fri, 6 May 2022 07:09:17 -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 6100815A1; Fri, 6 May 2022 07:09:17 -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 71AEB3F885; Fri, 6 May 2022 07:09:16 -0700 (PDT) From: Nikos Nikoleris To: Andrew Jones Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: [kvm-unit-tests PATCH 13/23] arm/arm64: Rename etext to _etext Date: Fri, 6 May 2022 15:08:45 +0100 Message-Id: <20220506140855.353337-14-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Andrew Jones Rename etext to the more popular _etext allowing different linker scripts to more easily be used. Signed-off-by: Andrew Jones Signed-off-by: Nikos Nikoleris --- lib/arm/setup.c | 4 ++-- arm/flat.lds | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/arm/setup.c b/lib/arm/setup.c index 3c24c75..2d67292 100644 --- a/lib/arm/setup.c +++ b/lib/arm/setup.c @@ -34,7 +34,7 @@ #define NR_EXTRA_MEM_REGIONS 16 #define NR_INITIAL_MEM_REGIONS (MAX_DT_MEM_REGIONS + NR_EXTRA_MEM_REGIONS) -extern unsigned long etext; +extern unsigned long _etext; char *initrd; u32 initrd_size; @@ -140,7 +140,7 @@ unsigned int mem_region_get_flags(phys_addr_t paddr) static void mem_regions_add_assumed(void) { - phys_addr_t code_end = (phys_addr_t)(unsigned long)&etext; + phys_addr_t code_end = (phys_addr_t)(unsigned long)&_etext; struct mem_region *r; r = mem_region_find(code_end - 1); diff --git a/arm/flat.lds b/arm/flat.lds index 47fcb64..9016ac9 100644 --- a/arm/flat.lds +++ b/arm/flat.lds @@ -27,7 +27,7 @@ SECTIONS PROVIDE(_text = .); .text : { *(.init) *(.text) *(.text.*) } . = ALIGN(64K); - PROVIDE(etext = .); + PROVIDE(_etext = .); PROVIDE(reloc_start = .); .rela.dyn : { *(.rela.dyn) } From patchwork Fri May 6 14:08:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841227 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 DD1CFC433FE for ; Fri, 6 May 2022 14:09:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442041AbiEFONH (ORCPT ); Fri, 6 May 2022 10:13:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442027AbiEFONC (ORCPT ); Fri, 6 May 2022 10:13:02 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 914A2674F0 for ; Fri, 6 May 2022 07:09:19 -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 63AFC1570; Fri, 6 May 2022 07:09: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 7391A3F885; Fri, 6 May 2022 07:09:18 -0700 (PDT) From: Nikos Nikoleris To: Andrew Jones Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: [kvm-unit-tests PATCH 15/23] arm64: Add a new type of memory type flag MR_F_RESERVED Date: Fri, 6 May 2022 15:08:47 +0100 Message-Id: <20220506140855.353337-16-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Andrew Jones This will be used by future change to add PTE entries for special EFI memory regions. Signed-off-by: Nikos Nikoleris --- lib/arm/asm/setup.h | 1 + lib/arm/mmu.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib/arm/asm/setup.h b/lib/arm/asm/setup.h index f0e70b1..64cd379 100644 --- a/lib/arm/asm/setup.h +++ b/lib/arm/asm/setup.h @@ -15,6 +15,7 @@ extern int nr_cpus; #define MR_F_IO (1U << 0) #define MR_F_CODE (1U << 1) +#define MR_F_RESERVED (1U << 2) #define MR_F_UNKNOWN (1U << 31) struct mem_region { diff --git a/lib/arm/mmu.c b/lib/arm/mmu.c index e1a72fe..931be98 100644 --- a/lib/arm/mmu.c +++ b/lib/arm/mmu.c @@ -174,6 +174,10 @@ void *setup_mmu(phys_addr_t phys_end, void *unused) for (r = mem_regions; r->end; ++r) { if (r->flags & MR_F_IO) { continue; + } else if (r->flags & MR_F_RESERVED) { + /* Reserved pages need to be writable for whatever reserved them */ + mmu_set_range_ptes(mmu_idmap, r->start, r->start, r->end, + __pgprot(PTE_WBWA)); } else if (r->flags & MR_F_CODE) { /* armv8 requires code shared between EL1 and EL0 to be read-only */ mmu_set_range_ptes(mmu_idmap, r->start, r->start, r->end, From patchwork Fri May 6 14:08:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841228 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 B1584C433EF for ; Fri, 6 May 2022 14:09:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442038AbiEFONJ (ORCPT ); Fri, 6 May 2022 10:13:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442035AbiEFONE (ORCPT ); Fri, 6 May 2022 10:13:04 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CB91066F83 for ; Fri, 6 May 2022 07:09:20 -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 8DACA1595; Fri, 6 May 2022 07:09:20 -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 9E40A3F885; Fri, 6 May 2022 07:09:19 -0700 (PDT) From: Nikos Nikoleris To: Andrew Jones Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: [kvm-unit-tests PATCH 16/23] arm/arm64: Add a setup sequence for systems that boot through EFI Date: Fri, 6 May 2022 15:08:48 +0100 Message-Id: <20220506140855.353337-17-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This change implements an alternative setup sequence for the system when we are booting through EFI. The memory map is discovered through EFI boot services and devices through ACPI. This change is based on a change initially proposed by Andrew Jones Signed-off-by: Nikos Nikoleris --- lib/linux/efi.h | 1 + lib/arm/asm/setup.h | 2 + lib/arm/setup.c | 179 +++++++++++++++++++++++++++++++++++++++++++- arm/cstart.S | 1 + arm/cstart64.S | 1 + 5 files changed, 182 insertions(+), 2 deletions(-) diff --git a/lib/linux/efi.h b/lib/linux/efi.h index d7401c9..73faa70 100644 --- a/lib/linux/efi.h +++ b/lib/linux/efi.h @@ -63,6 +63,7 @@ typedef guid_t efi_guid_t; (c) & 0xff, ((c) >> 8) & 0xff, d } } #define ACPI_TABLE_GUID EFI_GUID(0xeb9d2d30, 0x2d88, 0x11d3, 0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d) +#define ACPI_20_TABLE_GUID EFI_GUID(0x8868e871, 0xe4f1, 0x11d3, 0xbc, 0x22, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81) #define LOADED_IMAGE_PROTOCOL_GUID EFI_GUID(0x5b1b31a1, 0x9562, 0x11d2, 0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b) diff --git a/lib/arm/asm/setup.h b/lib/arm/asm/setup.h index 64cd379..1a7e734 100644 --- a/lib/arm/asm/setup.h +++ b/lib/arm/asm/setup.h @@ -5,6 +5,7 @@ * * This work is licensed under the terms of the GNU LGPL, version 2. */ +#include #include #include #include @@ -37,5 +38,6 @@ extern unsigned int mem_region_get_flags(phys_addr_t paddr); #define SMP_CACHE_BYTES L1_CACHE_BYTES void setup(const void *fdt, phys_addr_t freemem_start); +efi_status_t setup_efi(efi_bootinfo_t *efi_bootinfo); #endif /* _ASMARM_SETUP_H_ */ diff --git a/lib/arm/setup.c b/lib/arm/setup.c index 2d67292..edd4dc5 100644 --- a/lib/arm/setup.c +++ b/lib/arm/setup.c @@ -34,7 +34,7 @@ #define NR_EXTRA_MEM_REGIONS 16 #define NR_INITIAL_MEM_REGIONS (MAX_DT_MEM_REGIONS + NR_EXTRA_MEM_REGIONS) -extern unsigned long _etext; +extern unsigned long _text, _etext, _data, _edata; char *initrd; u32 initrd_size; @@ -44,7 +44,10 @@ int nr_cpus; static struct mem_region __initial_mem_regions[NR_INITIAL_MEM_REGIONS + 1]; struct mem_region *mem_regions = __initial_mem_regions; -phys_addr_t __phys_offset, __phys_end; +phys_addr_t __phys_offset = (phys_addr_t)-1, __phys_end = 0; + +extern void exceptions_init(void); +extern void asm_mmu_disable(void); int mpidr_to_cpu(uint64_t mpidr) { @@ -272,3 +275,175 @@ void setup(const void *fdt, phys_addr_t freemem_start) if (!(auxinfo.flags & AUXINFO_MMU_OFF)) setup_vm(); } + +#ifdef CONFIG_EFI + +#include + +static efi_status_t setup_rsdp(efi_bootinfo_t *efi_bootinfo) +{ + efi_status_t status; + struct rsdp_descriptor *rsdp; + + /* + * RSDP resides in an EFI_ACPI_RECLAIM_MEMORY region, which is not used + * by kvm-unit-tests arm64 memory allocator. So it is not necessary to + * copy the data structure to another memory region to prevent + * unintentional overwrite. + */ + status = efi_get_system_config_table(ACPI_20_TABLE_GUID, (void **)&rsdp); + if (status != EFI_SUCCESS) { + return status; + } + + set_efi_rsdp(rsdp); + + return EFI_SUCCESS; +} + +static efi_status_t efi_mem_init(efi_bootinfo_t *efi_bootinfo) +{ + int i; + unsigned long free_mem_pages = 0; + unsigned long free_mem_start = 0; + struct efi_boot_memmap *map = &(efi_bootinfo->mem_map); + efi_memory_desc_t *buffer = *map->map; + efi_memory_desc_t *d = NULL; + phys_addr_t base, top; + struct mem_region *r; + uintptr_t text = (uintptr_t)&_text, etext = __ALIGN((uintptr_t)&_etext, 4096); + uintptr_t data = (uintptr_t)&_data, edata = __ALIGN((uintptr_t)&_edata, 4096); + + /* + * Record the largest free EFI_CONVENTIONAL_MEMORY region + * which will be used to set up the memory allocator, so that + * the memory allocator can work in the largest free + * continuous memory region. + */ + for (i = 0, r = &mem_regions[0]; i < *(map->map_size); i += *(map->desc_size), ++r) { + d = (efi_memory_desc_t *)(&((u8 *)buffer)[i]); + + r->start = d->phys_addr; + r->end = d->phys_addr + d->num_pages * EFI_PAGE_SIZE; + + switch(d->type) { + case EFI_RESERVED_TYPE: + case EFI_LOADER_DATA: + case EFI_BOOT_SERVICES_CODE: + case EFI_BOOT_SERVICES_DATA: + case EFI_RUNTIME_SERVICES_CODE: + case EFI_RUNTIME_SERVICES_DATA: + case EFI_UNUSABLE_MEMORY: + case EFI_ACPI_RECLAIM_MEMORY: + case EFI_ACPI_MEMORY_NVS: + case EFI_PAL_CODE: + r->flags = MR_F_RESERVED; + break; + case EFI_MEMORY_MAPPED_IO: + case EFI_MEMORY_MAPPED_IO_PORT_SPACE: + r->flags = MR_F_IO; + break; + case EFI_LOADER_CODE: + if (r->start <= text && r->end > text) { + /* This is the unit test region. Flag the code separately. */ + phys_addr_t tmp = r->end; + assert(etext <= data); + assert(edata <= r->end); + r->flags = MR_F_CODE; + r->end = data; + ++r; + r->start = data; + r->end = tmp; + } else { + r->flags = MR_F_RESERVED; + } + break; + case EFI_CONVENTIONAL_MEMORY: + if (free_mem_pages < d->num_pages) { + free_mem_pages = d->num_pages; + free_mem_start = d->phys_addr; + } + break; + } + + if (!(r->flags & MR_F_IO)) { + if (r->start < __phys_offset) + __phys_offset = r->start; + if (r->end > __phys_end) + __phys_end = r->end; + } + } + __phys_end &= PHYS_MASK; + asm_mmu_disable(); + + if (free_mem_pages == 0) { + return EFI_OUT_OF_RESOURCES; + } + assert(sizeof(long) == 8 || free_mem_start < (3ul << 30)); + + phys_alloc_init(free_mem_start, free_mem_pages << EFI_PAGE_SHIFT); + phys_alloc_set_minimum_alignment(SMP_CACHE_BYTES); + + phys_alloc_get_unused(&base, &top); + base = PAGE_ALIGN(base); + top = top & PAGE_MASK; + assert(sizeof(long) == 8 || !(base >> 32)); + if (sizeof(long) != 8 && (top >> 32) != 0) + top = ((uint64_t)1 << 32); + page_alloc_init_area(0, base >> PAGE_SHIFT, top >> PAGE_SHIFT); + page_alloc_ops_enable(); + + return EFI_SUCCESS; +} + +efi_status_t setup_efi(efi_bootinfo_t *efi_bootinfo) +{ + efi_status_t status; + + struct thread_info *ti = current_thread_info(); + memset(ti, 0, sizeof(*ti)); + + exceptions_init(); + + status = efi_mem_init(efi_bootinfo); + if (status != EFI_SUCCESS) { + printf("Failed to initialize memory: "); + switch (status) { + case EFI_OUT_OF_RESOURCES: + printf("No free memory region\n"); + break; + default: + printf("Unknown error\n"); + break; + } + return status; + } + + status = setup_rsdp(efi_bootinfo); + if (status != EFI_SUCCESS) { + printf("Cannot find RSDP in EFI system table\n"); + return status; + } + + psci_set_conduit(); + cpu_init(); + /* cpu_init must be called before thread_info_init */ + thread_info_init(current_thread_info(), 0); + /* mem_init must be called before io_init */ + io_init(); + + timer_save_state(); + if (initrd) { + /* environ is currently the only file in the initrd */ + char *env = malloc(initrd_size); + memcpy(env, initrd, initrd_size); + setup_env(env, initrd_size); + } + + if (!(auxinfo.flags & AUXINFO_MMU_OFF)) + setup_vm(); + + return EFI_SUCCESS; +} + +#endif diff --git a/arm/cstart.S b/arm/cstart.S index dc324c5..66a55b9 100644 --- a/arm/cstart.S +++ b/arm/cstart.S @@ -256,6 +256,7 @@ asm_mmu_disable: * * Input r0 is the stack top, which is the exception stacks base */ +.globl exceptions_init exceptions_init: mrc p15, 0, r2, c1, c0, 0 @ read SCTLR bic r2, #CR_V @ SCTLR.V := 0 diff --git a/arm/cstart64.S b/arm/cstart64.S index 390feb9..55b41ea 100644 --- a/arm/cstart64.S +++ b/arm/cstart64.S @@ -276,6 +276,7 @@ asm_mmu_disable: * Vectors */ +.globl exceptions_init exceptions_init: adrp x4, vector_table add x4, x4, :lo12:vector_table From patchwork Fri May 6 14:08:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841229 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 37080C433F5 for ; Fri, 6 May 2022 14:09:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442039AbiEFONJ (ORCPT ); Fri, 6 May 2022 10:13:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442036AbiEFONF (ORCPT ); Fri, 6 May 2022 10:13:05 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DBF5B674D7 for ; Fri, 6 May 2022 07:09:21 -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 B7A941570; Fri, 6 May 2022 07:09:21 -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 C84753F885; Fri, 6 May 2022 07:09:20 -0700 (PDT) From: Nikos Nikoleris To: Andrew Jones Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: [kvm-unit-tests PATCH 17/23] arm64: Copy code from GNU-EFI Date: Fri, 6 May 2022 15:08:49 +0100 Message-Id: <20220506140855.353337-18-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This change adds unmodified dependencies that we need from GNU-EFI in order to build arm64 EFI apps. GNU-EFI sources from https://git.code.sf.net/p/gnu-efi/code v3.0.14 Signed-off-by: Nikos Nikoleris --- arm/efi/elf_aarch64_efi.lds | 63 +++++++++++++++++ arm/efi/crt0-efi-aarch64.S | 130 ++++++++++++++++++++++++++++++++++++ arm/efi/reloc_aarch64.c | 97 +++++++++++++++++++++++++++ 3 files changed, 290 insertions(+) create mode 100644 arm/efi/elf_aarch64_efi.lds create mode 100644 arm/efi/crt0-efi-aarch64.S create mode 100644 arm/efi/reloc_aarch64.c diff --git a/arm/efi/elf_aarch64_efi.lds b/arm/efi/elf_aarch64_efi.lds new file mode 100644 index 0000000..836d982 --- /dev/null +++ b/arm/efi/elf_aarch64_efi.lds @@ -0,0 +1,63 @@ +OUTPUT_FORMAT("elf64-littleaarch64", "elf64-littleaarch64", "elf64-littleaarch64") +OUTPUT_ARCH(aarch64) +ENTRY(_start) +SECTIONS +{ + .text 0x0 : { + _text = .; + *(.text.head) + *(.text) + *(.text.*) + *(.gnu.linkonce.t.*) + *(.srodata) + *(.rodata*) + . = ALIGN(16); + } + _etext = .; + _text_size = . - _text; + .dynamic : { *(.dynamic) } + .data : ALIGN(4096) + { + _data = .; + *(.sdata) + *(.data) + *(.data1) + *(.data.*) + *(.got.plt) + *(.got) + + /* the EFI loader doesn't seem to like a .bss section, so we stick + it all into .data: */ + . = ALIGN(16); + _bss = .; + *(.sbss) + *(.scommon) + *(.dynbss) + *(.bss) + *(COMMON) + . = ALIGN(16); + _bss_end = .; + } + + .rela.dyn : { *(.rela.dyn) } + .rela.plt : { *(.rela.plt) } + .rela.got : { *(.rela.got) } + .rela.data : { *(.rela.data) *(.rela.data*) } + . = ALIGN(512); + _edata = .; + _data_size = . - _data; + + . = ALIGN(4096); + .dynsym : { *(.dynsym) } + . = ALIGN(4096); + .dynstr : { *(.dynstr) } + . = ALIGN(4096); + .note.gnu.build-id : { *(.note.gnu.build-id) } + /DISCARD/ : + { + *(.rel.reloc) + *(.eh_frame) + *(.note.GNU-stack) + } + .comment 0 : { *(.comment) } +} diff --git a/arm/efi/crt0-efi-aarch64.S b/arm/efi/crt0-efi-aarch64.S new file mode 100644 index 0000000..d50e78d --- /dev/null +++ b/arm/efi/crt0-efi-aarch64.S @@ -0,0 +1,130 @@ +/* + * crt0-efi-aarch64.S - PE/COFF header for AArch64 EFI applications + * + * Copright (C) 2014 Linaro Ltd. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice and this list of conditions, without modification. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License as published by the Free Software Foundation; + * either version 2 of the License, or (at your option) any later version. + */ + + .section .text.head + + /* + * Magic "MZ" signature for PE/COFF + */ + .globl ImageBase +ImageBase: + .ascii "MZ" + .skip 58 // 'MZ' + pad + offset == 64 + .long pe_header - ImageBase // Offset to the PE header. +pe_header: + .ascii "PE" + .short 0 +coff_header: + .short 0xaa64 // AArch64 + .short 2 // nr_sections + .long 0 // TimeDateStamp + .long 0 // PointerToSymbolTable + .long 0 // NumberOfSymbols + .short section_table - optional_header // SizeOfOptionalHeader + .short 0x206 // Characteristics. + // IMAGE_FILE_DEBUG_STRIPPED | + // IMAGE_FILE_EXECUTABLE_IMAGE | + // IMAGE_FILE_LINE_NUMS_STRIPPED +optional_header: + .short 0x20b // PE32+ format + .byte 0x02 // MajorLinkerVersion + .byte 0x14 // MinorLinkerVersion + .long _data - _start // SizeOfCode + .long _data_size // SizeOfInitializedData + .long 0 // SizeOfUninitializedData + .long _start - ImageBase // AddressOfEntryPoint + .long _start - ImageBase // BaseOfCode + +extra_header_fields: + .quad 0 // ImageBase + .long 0x1000 // SectionAlignment + .long 0x200 // FileAlignment + .short 0 // MajorOperatingSystemVersion + .short 0 // MinorOperatingSystemVersion + .short 0 // MajorImageVersion + .short 0 // MinorImageVersion + .short 0 // MajorSubsystemVersion + .short 0 // MinorSubsystemVersion + .long 0 // Win32VersionValue + + .long _edata - ImageBase // SizeOfImage + + // Everything before the kernel image is considered part of the header + .long _start - ImageBase // SizeOfHeaders + .long 0 // CheckSum + .short EFI_SUBSYSTEM // Subsystem + .short 0 // DllCharacteristics + .quad 0 // SizeOfStackReserve + .quad 0 // SizeOfStackCommit + .quad 0 // SizeOfHeapReserve + .quad 0 // SizeOfHeapCommit + .long 0 // LoaderFlags + .long 0x6 // NumberOfRvaAndSizes + + .quad 0 // ExportTable + .quad 0 // ImportTable + .quad 0 // ResourceTable + .quad 0 // ExceptionTable + .quad 0 // CertificationTable + .quad 0 // BaseRelocationTable + + // Section table +section_table: + .ascii ".text\0\0\0" + .long _data - _start // VirtualSize + .long _start - ImageBase // VirtualAddress + .long _data - _start // SizeOfRawData + .long _start - ImageBase // PointerToRawData + + .long 0 // PointerToRelocations (0 for executables) + .long 0 // PointerToLineNumbers (0 for executables) + .short 0 // NumberOfRelocations (0 for executables) + .short 0 // NumberOfLineNumbers (0 for executables) + .long 0x60000020 // Characteristics (section flags) + + .ascii ".data\0\0\0" + .long _data_size // VirtualSize + .long _data - ImageBase // VirtualAddress + .long _data_size // SizeOfRawData + .long _data - ImageBase // PointerToRawData + + .long 0 // PointerToRelocations (0 for executables) + .long 0 // PointerToLineNumbers (0 for executables) + .short 0 // NumberOfRelocations (0 for executables) + .short 0 // NumberOfLineNumbers (0 for executables) + .long 0xc0000040 // Characteristics (section flags) + + .align 12 +_start: + stp x29, x30, [sp, #-32]! + mov x29, sp + + stp x0, x1, [sp, #16] + mov x2, x0 + mov x3, x1 + adr x0, ImageBase + adrp x1, _DYNAMIC + add x1, x1, #:lo12:_DYNAMIC + bl _relocate + cbnz x0, 0f + + ldp x0, x1, [sp, #16] + bl efi_main + +0: ldp x29, x30, [sp], #32 + ret diff --git a/arm/efi/reloc_aarch64.c b/arm/efi/reloc_aarch64.c new file mode 100644 index 0000000..0867279 --- /dev/null +++ b/arm/efi/reloc_aarch64.c @@ -0,0 +1,97 @@ +/* reloc_aarch64.c - position independent x86 ELF shared object relocator + Copyright (C) 2014 Linaro Ltd. + Copyright (C) 1999 Hewlett-Packard Co. + Contributed by David Mosberger . + + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials + provided with the distribution. + * Neither the name of Hewlett-Packard Co. nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANYDIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. +*/ + +#include +#include + +#include + +EFI_STATUS _relocate (long ldbase, Elf64_Dyn *dyn, + EFI_HANDLE image EFI_UNUSED, + EFI_SYSTEM_TABLE *systab EFI_UNUSED) +{ + long relsz = 0, relent = 0; + Elf64_Rela *rel = 0; + unsigned long *addr; + int i; + + for (i = 0; dyn[i].d_tag != DT_NULL; ++i) { + switch (dyn[i].d_tag) { + case DT_RELA: + rel = (Elf64_Rela*) + ((unsigned long)dyn[i].d_un.d_ptr + + ldbase); + break; + + case DT_RELASZ: + relsz = dyn[i].d_un.d_val; + break; + + case DT_RELAENT: + relent = dyn[i].d_un.d_val; + break; + + default: + break; + } + } + + if (!rel && relent == 0) + return EFI_SUCCESS; + + if (!rel || relent == 0) + return EFI_LOAD_ERROR; + + while (relsz > 0) { + /* apply the relocs */ + switch (ELF64_R_TYPE (rel->r_info)) { + case R_AARCH64_NONE: + break; + + case R_AARCH64_RELATIVE: + addr = (unsigned long *) + (ldbase + rel->r_offset); + *addr = ldbase + rel->r_addend; + break; + + default: + break; + } + rel = (Elf64_Rela*) ((char *) rel + relent); + relsz -= relent; + } + return EFI_SUCCESS; +} From patchwork Fri May 6 14:08:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841230 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 9B729C433FE for ; Fri, 6 May 2022 14:09:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442054AbiEFONL (ORCPT ); Fri, 6 May 2022 10:13:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1388397AbiEFONF (ORCPT ); Fri, 6 May 2022 10:13:05 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 10A54674E9 for ; Fri, 6 May 2022 07:09:23 -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 E0E9F1595; Fri, 6 May 2022 07:09:22 -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 F1AF93F885; Fri, 6 May 2022 07:09:21 -0700 (PDT) From: Nikos Nikoleris To: Andrew Jones Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: [kvm-unit-tests PATCH 18/23] arm64: Change GNU-EFI imported file to use defined types Date: Fri, 6 May 2022 15:08:50 +0100 Message-Id: <20220506140855.353337-19-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Signed-off-by: Nikos Nikoleris --- arm/efi/reloc_aarch64.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arm/efi/reloc_aarch64.c b/arm/efi/reloc_aarch64.c index 0867279..fa0cd6b 100644 --- a/arm/efi/reloc_aarch64.c +++ b/arm/efi/reloc_aarch64.c @@ -34,14 +34,11 @@ SUCH DAMAGE. */ -#include -#include - +#include "efi.h" #include -EFI_STATUS _relocate (long ldbase, Elf64_Dyn *dyn, - EFI_HANDLE image EFI_UNUSED, - EFI_SYSTEM_TABLE *systab EFI_UNUSED) +efi_status_t _relocate(long ldbase, Elf64_Dyn *dyn, efi_handle_t image, + efi_system_table_t *sys_tab) { long relsz = 0, relent = 0; Elf64_Rela *rel = 0; From patchwork Fri May 6 14:08:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841231 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 5C921C433F5 for ; Fri, 6 May 2022 14:09:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442043AbiEFONO (ORCPT ); Fri, 6 May 2022 10:13:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442042AbiEFONH (ORCPT ); Fri, 6 May 2022 10:13:07 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 490B868317 for ; Fri, 6 May 2022 07:09:24 -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 1D71A15A1; Fri, 6 May 2022 07:09:24 -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 26F783F885; Fri, 6 May 2022 07:09:23 -0700 (PDT) From: Nikos Nikoleris To: Andrew Jones Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: [kvm-unit-tests PATCH 19/23] arm64: Use code from the gnu-efi when booting with EFI Date: Fri, 6 May 2022 15:08:51 +0100 Message-Id: <20220506140855.353337-20-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org arm/efi/crt0-efi-aarch64.S defines the header and the handover sequence from EFI to a efi_main. This change includes the whole file in arm/cstart64.S when we compile with EFI support. In addition, we change the handover code in arm/efi/crt0-efi-aarch64.S to align the stack pointer. This alignment is necessary because we make assumptions about cpu0's stack alignment and most importantly we place its thread_info at the bottom of this stack. Signed-off-by: Nikos Nikoleris --- arm/cstart64.S | 6 ++++++ arm/efi/crt0-efi-aarch64.S | 17 +++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/arm/cstart64.S b/arm/cstart64.S index 55b41ea..08cf02f 100644 --- a/arm/cstart64.S +++ b/arm/cstart64.S @@ -15,6 +15,10 @@ #include #include +#ifdef CONFIG_EFI +#include "efi/crt0-efi-aarch64.S" +#else + .macro zero_range, tmp1, tmp2 9998: cmp \tmp1, \tmp2 b.eq 9997f @@ -107,6 +111,8 @@ start: bl exit b halt +#endif + .text /* diff --git a/arm/efi/crt0-efi-aarch64.S b/arm/efi/crt0-efi-aarch64.S index d50e78d..11a062d 100644 --- a/arm/efi/crt0-efi-aarch64.S +++ b/arm/efi/crt0-efi-aarch64.S @@ -111,10 +111,19 @@ section_table: .align 12 _start: - stp x29, x30, [sp, #-32]! + stp x29, x30, [sp, #-16]! + + // Align sp; this is necessary due to way we store cpu0's thread_info mov x29, sp + and x29, x29, #THREAD_MASK + mov x30, sp + mov sp, x29 + str x30, [sp, #-32]! + + mov x29, sp stp x0, x1, [sp, #16] + mov x2, x0 mov x3, x1 adr x0, ImageBase @@ -126,5 +135,9 @@ _start: ldp x0, x1, [sp, #16] bl efi_main -0: ldp x29, x30, [sp], #32 + // Restore sp + ldr x30, [sp] + mov sp, x30 + +0: ldp x29, x30, [sp], #16 ret From patchwork Fri May 6 14:08:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841232 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 3508FC433EF for ; Fri, 6 May 2022 14:09:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442060AbiEFONS (ORCPT ); Fri, 6 May 2022 10:13:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442050AbiEFONI (ORCPT ); Fri, 6 May 2022 10:13:08 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9D48D68317 for ; Fri, 6 May 2022 07:09:25 -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 46C1A1570; Fri, 6 May 2022 07:09:25 -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 576DE3F885; Fri, 6 May 2022 07:09:24 -0700 (PDT) From: Nikos Nikoleris To: Andrew Jones Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: [kvm-unit-tests PATCH 20/23] lib: Avoid external dependency in libelf Date: Fri, 6 May 2022 15:08:52 +0100 Message-Id: <20220506140855.353337-21-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org There is just a small number of definitions we need from uapi/linux/elf.h and asm/elf.h and the relocation code is self-contained. Signed-off-by: Nikos Nikoleris --- arm/efi/reloc_aarch64.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arm/efi/reloc_aarch64.c b/arm/efi/reloc_aarch64.c index fa0cd6b..3f6d9a6 100644 --- a/arm/efi/reloc_aarch64.c +++ b/arm/efi/reloc_aarch64.c @@ -34,8 +34,7 @@ SUCH DAMAGE. */ -#include "efi.h" -#include +#include efi_status_t _relocate(long ldbase, Elf64_Dyn *dyn, efi_handle_t image, efi_system_table_t *sys_tab) From patchwork Fri May 6 14:08:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841233 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 201C8C433FE for ; Fri, 6 May 2022 14:09:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442073AbiEFONX (ORCPT ); Fri, 6 May 2022 10:13:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442048AbiEFONK (ORCPT ); Fri, 6 May 2022 10:13:10 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A083768F92 for ; Fri, 6 May 2022 07:09:26 -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 5555D1595; Fri, 6 May 2022 07:09:26 -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 80A933F885; Fri, 6 May 2022 07:09:25 -0700 (PDT) From: Nikos Nikoleris To: Paolo Bonzini Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org Subject: [kvm-unit-tests PATCH 21/23] x86: Move x86_64-specific EFI CFLAGS to x86_64 Makefile Date: Fri, 6 May 2022 15:08:53 +0100 Message-Id: <20220506140855.353337-22-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Compiler flag -macculate-outgoing-args is only needed by the x86_64 ABI. Move it to the relevant Makefile. Signed-off-by: Nikos Nikoleris --- Makefile | 4 ---- x86/Makefile.x86_64 | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6ed5dea..307bc29 100644 --- a/Makefile +++ b/Makefile @@ -40,14 +40,10 @@ OBJDIRS += $(LIBFDT_objdir) # EFI App ifeq ($(CONFIG_EFI),y) -EFI_ARCH = x86_64 EFI_CFLAGS := -DCONFIG_EFI # The following CFLAGS and LDFLAGS come from: # - GNU-EFI/Makefile.defaults # - GNU-EFI/apps/Makefile -# Function calls must include the number of arguments passed to the functions -# More details: https://wiki.osdev.org/GNU-EFI -EFI_CFLAGS += -maccumulate-outgoing-args # GCC defines wchar to be 32 bits, but EFI expects 16 bits EFI_CFLAGS += -fshort-wchar # EFI applications use PIC as they are loaded to dynamic addresses, not a fixed diff --git a/x86/Makefile.x86_64 b/x86/Makefile.x86_64 index f18c1e2..ac588ed 100644 --- a/x86/Makefile.x86_64 +++ b/x86/Makefile.x86_64 @@ -2,6 +2,10 @@ cstart.o = $(TEST_DIR)/cstart64.o bits = 64 ldarch = elf64-x86-64 ifeq ($(CONFIG_EFI),y) +# Function calls must include the number of arguments passed to the functions +# More details: https://wiki.osdev.org/GNU-EFI +CFLAGS += -maccumulate-outgoing-args + exe = efi bin = so FORMAT = efi-app-x86_64 From patchwork Fri May 6 14:08:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841234 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 45CE5C433F5 for ; Fri, 6 May 2022 14:09:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442077AbiEFON1 (ORCPT ); Fri, 6 May 2022 10:13:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442058AbiEFONM (ORCPT ); Fri, 6 May 2022 10:13:12 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E2FD36899D for ; Fri, 6 May 2022 07:09:27 -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 7F4D61570; Fri, 6 May 2022 07:09:27 -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 8FC793F885; Fri, 6 May 2022 07:09:26 -0700 (PDT) From: Nikos Nikoleris To: Andrew Jones Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: [kvm-unit-tests PATCH 22/23] arm64: Add support for efi in Makefile Date: Fri, 6 May 2022 15:08:54 +0100 Message-Id: <20220506140855.353337-23-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail 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 --- 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 # -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) From patchwork Fri May 6 14:08:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 12841235 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 999E1C433EF for ; Fri, 6 May 2022 14:09:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442087AbiEFON2 (ORCPT ); Fri, 6 May 2022 10:13:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1388397AbiEFONO (ORCPT ); Fri, 6 May 2022 10:13:14 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 188F6689B6 for ; Fri, 6 May 2022 07:09:29 -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 A96E01596; Fri, 6 May 2022 07:09:28 -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 B9E823F885; Fri, 6 May 2022 07:09:27 -0700 (PDT) From: Nikos Nikoleris To: Andrew Jones Cc: jade.alglave@arm.com, alexandru.elisei@arm.com, Nikos Nikoleris , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: [kvm-unit-tests PATCH 23/23] arm64: Add an efi/run script Date: Fri, 6 May 2022 15:08:55 +0100 Message-Id: <20220506140855.353337-24-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220506140855.353337-1-nikos.nikoleris@arm.com> References: <20220506140855.353337-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This change adds a efi/run script inspired by the one in x86. This script will setup a folder with the test compiled as an EFI app and a startup.nsh script. The script launches QEMU providing an image with EDKII and the path to the folder with the test which is executed automatically. For example: $> ./arm/efi/run ./arm/selftest.efi setup smp=2 mem=256 Signed-off-by: Nikos Nikoleris --- scripts/runtime.bash | 14 +++++----- arm/efi/run | 61 ++++++++++++++++++++++++++++++++++++++++++++ arm/run | 8 ++++-- arm/Makefile.common | 1 + arm/dummy.c | 4 +++ 5 files changed, 78 insertions(+), 10 deletions(-) create mode 100755 arm/efi/run create mode 100644 arm/dummy.c diff --git a/scripts/runtime.bash b/scripts/runtime.bash index 7d0180b..dc28f24 100644 --- a/scripts/runtime.bash +++ b/scripts/runtime.bash @@ -131,14 +131,12 @@ function run() fi last_line=$(premature_failure > >(tail -1)) && { - skip=true - if [ "${CONFIG_EFI}" == "y" ] && [[ "${last_line}" =~ "enabling apic" ]]; then - skip=false - fi - if [ ${skip} == true ]; then - print_result "SKIP" $testname "" "$last_line" - return 77 - fi + if [ "${CONFIG_EFI}" == "y" ] && [ "${ARCH}" = x86_64 ]; then + if ! [[ "${last_line}" =~ "enabling apic" ]]; then + print_result "SKIP" $testname "" "$last_line" + return 77 + fi + fi } cmdline=$(get_cmdline $kernel) diff --git a/arm/efi/run b/arm/efi/run new file mode 100755 index 0000000..dfff717 --- /dev/null +++ b/arm/efi/run @@ -0,0 +1,61 @@ +#!/bin/bash + +set -e + +if [ $# -eq 0 ]; then + echo "Usage $0 TEST_CASE [QEMU_ARGS]" + exit 2 +fi + +if [ ! -f config.mak ]; then + echo "run './configure --enable-efi && make' first. See ./configure -h" + exit 2 +fi +source config.mak +source scripts/arch-run.bash +source scripts/common.bash + +: "${EFI_SRC:=$(realpath "$(dirname "$0")/../")}" +: "${EFI_UEFI:=/usr/share/qemu-efi-aarch64/QEMU_EFI.fd}" +: "${EFI_TEST:=efi-tests}" +: "${EFI_CASE:=$(basename $1 .efi)}" + +if [ ! -f "$EFI_UEFI" ]; then + echo "UEFI firmware not found: $EFI_UEFI" + echo "Please install the UEFI firmware to this path" + echo "Or specify the correct path with the env variable EFI_UEFI" + exit 2 +fi + +# Remove the TEST_CASE from $@ +shift 1 + +# Fish out the arguments for the test, they should be the next string +# after the "-append" option +qemu_args=() +cmd_args=() +while (( "$#" )); do + if [ "$1" = "-append" ]; then + cmd_args=$2 + shift 2 + else + qemu_args+=("$1") + shift 1 + fi +done + +if [ "$EFI_CASE" = "_NO_FILE_4Uhere_" ]; then + EFI_CASE=dummy +fi + +: "${EFI_CASE_DIR:="$EFI_TEST/$EFI_CASE"}" +mkdir -p "$EFI_CASE_DIR" + +cp "$EFI_SRC/$EFI_CASE.efi" "$EFI_TEST/$EFI_CASE/" +echo "@echo -off" > "$EFI_TEST/$EFI_CASE/startup.nsh" +echo "$EFI_CASE.efi" "${cmd_args[@]}" >> "$EFI_TEST/$EFI_CASE/startup.nsh" + +EFI_RUN=y $TEST_DIR/run \ + -bios "$EFI_UEFI" \ + -drive file.dir="$EFI_TEST/$EFI_CASE/",file.driver=vvfat,file.rw=on,format=raw,if=virtio \ + "${qemu_args[@]}" diff --git a/arm/run b/arm/run index 28a0b4a..e96875e 100755 --- a/arm/run +++ b/arm/run @@ -67,7 +67,11 @@ fi A="-accel $ACCEL" command="$qemu -nodefaults $M $A -cpu $processor $chr_testdev $pci_testdev" -command+=" -display none -serial stdio -kernel" +command+=" -display none -serial stdio" command="$(migration_cmd) $(timeout_cmd) $command" -run_qemu $command "$@" +if [ "$EFI_RUN" = "y" ]; then + ENVIRON_DEFAULT=n run_qemu $command "$@" +else + run_qemu $command -kernel "$@" +fi diff --git a/arm/Makefile.common b/arm/Makefile.common index a8007f4..aabd335 100644 --- a/arm/Makefile.common +++ b/arm/Makefile.common @@ -12,6 +12,7 @@ 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-common += $(TEST_DIR)/dummy.$(exe) tests-all = $(tests-common) $(tests) all: directories $(tests-all) diff --git a/arm/dummy.c b/arm/dummy.c new file mode 100644 index 0000000..5019e79 --- /dev/null +++ b/arm/dummy.c @@ -0,0 +1,4 @@ +int main(int argc, char **argv) +{ + return 0; +}