Add init_systab and set boot_info->a2 Signed-off-by: Song Gao <gaos...@loongson.cn> --- hw/loongarch/boot.c | 39 +++++++++++++++++++++++++++++ include/hw/loongarch/boot.h | 50 +++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+)
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c index 076e795714..7d043fd718 100644 --- a/hw/loongarch/boot.c +++ b/hw/loongarch/boot.c @@ -16,10 +16,14 @@ enum { SLAVE_BOOT, + EFI_SYSTAB, + EFI_TABLES, }; static const MemMapEntry loader_rommap[] = { [SLAVE_BOOT] = {0xf100000, 0x10000}, + [EFI_SYSTAB] = {0xf200000, 0x10000}, + [EFI_TABLES] = {0xf300000, 0x10000}, }; static unsigned int slave_boot_code[] = { @@ -70,6 +74,39 @@ static unsigned int slave_boot_code[] = { 0x4c000020, /* jirl $r0,$r1,0 */ }; +static void init_systab(struct loongarch_boot_info *info) +{ + struct efi_system_table *systab; + struct efi_configuration_table *efi_tables; + systab = g_malloc0(loader_rommap[EFI_SYSTAB].size); + efi_tables = g_malloc0(loader_rommap[EFI_TABLES].size); + + systab->hdr.signature = EFI_SYSTEM_TABLE_SIGNATURE; + systab->hdr.revision = EFI_SPECIFICATION_VERSION; + systab->hdr.revision = sizeof(struct efi_system_table), + systab->fw_revision = FW_VERSION << 16 | FW_PATCHLEVEL << 8; + systab->runtime = 0; + systab->boottime = 0; + systab->nr_tables = 0; + systab->tables = efi_tables; + + rom_add_blob_fixed("tables_rom", efi_tables, + loader_rommap[EFI_TABLES].size, + loader_rommap[EFI_TABLES].base); + + systab->tables = (struct efi_configuration_table *) + loader_rommap[EFI_TABLES].base; + + rom_add_blob_fixed("systab_rom", systab, + loader_rommap[EFI_SYSTAB].size, + loader_rommap[EFI_SYSTAB].base); + + info->a2 = loader_rommap[EFI_SYSTAB].base; + + g_free(systab); + g_free(efi_tables); +} + static int init_cmdline(struct loongarch_boot_info *info) { hwaddr cmdline_addr; @@ -134,6 +171,7 @@ static int64_t load_kernel_info(struct loongarch_boot_info *info) } init_cmdline(info); + init_systab(info); return kernel_entry; } @@ -148,6 +186,7 @@ static void reset_load_elf(void *opaque) if (cpu == LOONGARCH_CPU(first_cpu)) { env->gpr[4] = env->boot_info->a0; env->gpr[5] = env->boot_info->a1; + env->gpr[6] = env->boot_info->a2; } cpu_set_pc(CPU(cpu), env->elf_address); } diff --git a/include/hw/loongarch/boot.h b/include/hw/loongarch/boot.h index 3275c1e295..4ee116b25d 100644 --- a/include/hw/loongarch/boot.h +++ b/include/hw/loongarch/boot.h @@ -8,6 +8,56 @@ #ifndef HW_LOONGARCH_BOOT_H #define HW_LOONGARCH_BOOT_H +/* UEFI 2.10 */ +#define EFI_SYSTEM_TABLE_SIGNATURE 0x5453595320494249 +#define EFI_2_100_SYSTEM_TABLE_REVISION ((2<<16) | (100)) +#define EFI_SPECIFICATION_VERSION EFI_SYSTEM_TABLE_REVISION +#define EFI_SYSTEM_TABLE_REVISION EFI_2_100_SYSTEM_TABLE_REVISION + +#define FW_VERSION 0x1 +#define FW_PATCHLEVEL 0x0 + +#define EFI_MAX_CONFIGURATION_TABLES 16 + +typedef struct { + uint8_t b[16]; +} efi_guid_t __attribute__((aligned(8))); + +struct efi_config_table { + efi_guid_t guid; + uint64_t *ptr; + const char name[16]; +}; + +typedef struct { + uint64_t signature; + uint32_t revision; + uint32_t headersize; + uint32_t crc32; + uint32_t reserved; +} efi_table_hdr_t; + +struct efi_configuration_table { + efi_guid_t guid; + void *table; +}; + +struct efi_system_table { + efi_table_hdr_t hdr; + uint64_t fw_vendor; /* physical addr of CHAR16 vendor string */ + uint32_t fw_revision; + uint64_t con_in_handle; + uint64_t *con_in; + uint64_t con_out_handle; + uint64_t *con_out; + uint64_t stderr_handle; + uint64_t stderr; + uint64_t *runtime; + uint64_t *boottime; + uint64_t nr_tables; + struct efi_configuration_table *tables; +}; + struct loongarch_boot_info { uint64_t ram_size; const char *kernel_filename; -- 2.25.1