| Message ID | 20230428120405.3770496-23-nikos.nikoleris@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | EFI and ACPI support for arm64 | expand |
On 4/28/23 20:03, Nikos Nikoleris wrote: > 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@redhat.com> > > Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com> Reviewed-by: Shaoqin Huang <shahuang@redhat.com> > --- > lib/linux/efi.h | 1 + > lib/arm/asm/setup.h | 8 ++ > lib/arm/setup.c | 186 +++++++++++++++++++++++++++++++++++++++++++- > arm/cstart.S | 1 + > arm/cstart64.S | 1 + > 5 files changed, 194 insertions(+), 3 deletions(-) > > diff --git a/lib/linux/efi.h b/lib/linux/efi.h > index 53748dd4..89f9a9e0 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 64cd379b..06069116 100644 > --- a/lib/arm/asm/setup.h > +++ b/lib/arm/asm/setup.h > @@ -38,4 +38,12 @@ extern unsigned int mem_region_get_flags(phys_addr_t paddr); > > void setup(const void *fdt, phys_addr_t freemem_start); > > +#ifdef CONFIG_EFI > + > +#include <efi.h> > + > +efi_status_t setup_efi(efi_bootinfo_t *efi_bootinfo); > + > +#endif > + > #endif /* _ASMARM_SETUP_H_ */ > diff --git a/lib/arm/setup.c b/lib/arm/setup.c > index 03a4098e..c4f495a9 100644 > --- a/lib/arm/setup.c > +++ b/lib/arm/setup.c > @@ -30,10 +30,10 @@ > #include "io.h" > > #define MAX_DT_MEM_REGIONS 16 > -#define NR_EXTRA_MEM_REGIONS 16 > +#define NR_EXTRA_MEM_REGIONS 64 > #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; > @@ -43,7 +43,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) > { > @@ -289,3 +292,180 @@ 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 acpi_table_rsdp *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; i < *(map->map_size); i += *(map->desc_size)) { > + d = (efi_memory_desc_t *)(&((u8 *)buffer)[i]); > + > + r.start = d->phys_addr; > + r.end = d->phys_addr + d->num_pages * EFI_PAGE_SIZE; > + r.flags = 0; > + > + 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; > + mem_region_add(&r); > + r.start = data; > + r.end = tmp; > + r.flags = 0; > + } 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; > + } > + mem_region_add(&r); > + } > + __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 7036e67f..3dd71ed9 100644 > --- a/arm/cstart.S > +++ b/arm/cstart.S > @@ -242,6 +242,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 e4ab7d06..223c1092 100644 > --- a/arm/cstart64.S > +++ b/arm/cstart64.S > @@ -265,6 +265,7 @@ asm_mmu_disable: > * Vectors > */ > > +.globl exceptions_init > exceptions_init: > adrp x4, vector_table > add x4, x4, :lo12:vector_table
diff --git a/lib/linux/efi.h b/lib/linux/efi.h index 53748dd4..89f9a9e0 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 64cd379b..06069116 100644 --- a/lib/arm/asm/setup.h +++ b/lib/arm/asm/setup.h @@ -38,4 +38,12 @@ extern unsigned int mem_region_get_flags(phys_addr_t paddr); void setup(const void *fdt, phys_addr_t freemem_start); +#ifdef CONFIG_EFI + +#include <efi.h> + +efi_status_t setup_efi(efi_bootinfo_t *efi_bootinfo); + +#endif + #endif /* _ASMARM_SETUP_H_ */ diff --git a/lib/arm/setup.c b/lib/arm/setup.c index 03a4098e..c4f495a9 100644 --- a/lib/arm/setup.c +++ b/lib/arm/setup.c @@ -30,10 +30,10 @@ #include "io.h" #define MAX_DT_MEM_REGIONS 16 -#define NR_EXTRA_MEM_REGIONS 16 +#define NR_EXTRA_MEM_REGIONS 64 #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; @@ -43,7 +43,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) { @@ -289,3 +292,180 @@ 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 acpi_table_rsdp *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; i < *(map->map_size); i += *(map->desc_size)) { + d = (efi_memory_desc_t *)(&((u8 *)buffer)[i]); + + r.start = d->phys_addr; + r.end = d->phys_addr + d->num_pages * EFI_PAGE_SIZE; + r.flags = 0; + + 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; + mem_region_add(&r); + r.start = data; + r.end = tmp; + r.flags = 0; + } 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; + } + mem_region_add(&r); + } + __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 7036e67f..3dd71ed9 100644 --- a/arm/cstart.S +++ b/arm/cstart.S @@ -242,6 +242,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 e4ab7d06..223c1092 100644 --- a/arm/cstart64.S +++ b/arm/cstart64.S @@ -265,6 +265,7 @@ asm_mmu_disable: * Vectors */ +.globl exceptions_init exceptions_init: adrp x4, vector_table add x4, x4, :lo12:vector_table
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@redhat.com> Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com> --- lib/linux/efi.h | 1 + lib/arm/asm/setup.h | 8 ++ lib/arm/setup.c | 186 +++++++++++++++++++++++++++++++++++++++++++- arm/cstart.S | 1 + arm/cstart64.S | 1 + 5 files changed, 194 insertions(+), 3 deletions(-)