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 <drjones@xxxxxxxxxx>
Signed-off-by: Nikos Nikoleris <nikos.nikoleris@xxxxxxx>
---
lib/linux/efi.h | 1 +
lib/arm/asm/setup.h | 2 +
lib/arm/setup.c | 181 +++++++++++++++++++++++++++++++++++++++++++-
arm/cstart.S | 1 +
arm/cstart64.S | 1 +
5 files changed, 184 insertions(+), 2 deletions(-)
diff --git a/lib/linux/efi.h b/lib/linux/efi.h
index 53748dd..89f9a9e 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..c4cd485 100644
--- a/lib/arm/asm/setup.h
+++ b/lib/arm/asm/setup.h
@@ -6,6 +6,7 @@
* This work is licensed under the terms of the GNU LGPL, version 2.
*/
#include <libcflat.h>
+#include <efi.h>
#include <asm/page.h>
#include <asm/pgtable-hwdef.h>
@@ -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 13513d0..30d04d0 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,177 @@ void setup(const void *fdt, phys_addr_t freemem_start)
if (!(auxinfo.flags & AUXINFO_MMU_OFF))
setup_vm();
}
+
+#ifdef CONFIG_EFI
+
+#include <efi.h>
+
+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;
