ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/loongarch: Init efi_fdt table 

The efi_system_table adds a efi_fdt configuration table.

Signed-off-by: Song Gao <gaosong@loongson.cn>
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
Message-Id: <20240426091551.2397867-9-gaosong@loongson.cn>
This commit is contained in:
Song Gao 2024-04-26 17:15:42 +08:00
parent 060685041c
commit 6042385149
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/loongarch/boot.c
View File

@ -113,6 +113,16 @@ static void init_efi_initrd_table(struct efi_system_table *systab,
initrd_table->size = initrd_size;
}
static void init_efi_fdt_table(struct efi_system_table *systab)
{
efi_guid_t tbl_guid = DEVICE_TREE_GUID;
/* efi_configuration_table 3 */
guidcpy(&systab->tables[2].guid, &tbl_guid);
systab->tables[2].table = (void *)FDT_BASE;
systab->nr_tables = 3;
}
static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
{
void *bp_tables_start;
@ -138,6 +148,7 @@ static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
sizeof(efi_memory_desc_t) * memmap_entries, 64 * KiB);
init_efi_initrd_table(systab, p, start);
p += ROUND_UP(sizeof(struct efi_initrd), 64 * KiB);
init_efi_fdt_table(systab);
systab->tables = (struct efi_configuration_table *)(bp_tables_start - start);
}

6
hw/loongarch/virt.c
View File

@ -727,7 +727,6 @@ static void loongarch_init(MachineState *machine)
int nb_numa_nodes = machine->numa_state->num_nodes;
NodeInfo *numa_info = machine->numa_state->nodes;
int i;
hwaddr fdt_base;
const CPUArchIdList *possible_cpus;
MachineClass *mc = MACHINE_GET_CLASS(machine);
CPUState *cpu;
@ -857,12 +856,11 @@ static void loongarch_init(MachineState *machine)
* Put the FDT into the memory map as a ROM image: this will ensure
* the FDT is copied again upon reset, even if addr points into RAM.
*/
fdt_base = 1 * MiB;
qemu_fdt_dumpdtb(machine->fdt, lams->fdt_size);
rom_add_blob_fixed_as("fdt", machine->fdt, lams->fdt_size, fdt_base,
rom_add_blob_fixed_as("fdt", machine->fdt, lams->fdt_size, FDT_BASE,
&address_space_memory);
qemu_register_reset_nosnapshotload(qemu_fdt_randomize_seeds,
rom_ptr_for_as(&address_space_memory, fdt_base, lams->fdt_size));
rom_ptr_for_as(&address_space_memory, FDT_BASE, lams->fdt_size));
lams->bootinfo.ram_size = ram_size;
loongarch_load_kernel(machine, &lams->bootinfo);

4
include/hw/loongarch/boot.h
View File

@ -34,6 +34,10 @@ typedef struct {
EFI_GUID(0x5568e427, 0x68fc, 0x4f3d, 0xac, 0x74, \
0xca, 0x55, 0x52, 0x31, 0xcc, 0x68)
#define DEVICE_TREE_GUID \
EFI_GUID(0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, \
0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0)
struct efi_config_table {
efi_guid_t guid;
uint64_t *ptr;

2
include/hw/loongarch/virt.h
View File

@ -35,6 +35,8 @@
#define COMMAND_LINE_SIZE 512
#define FDT_BASE 0x100000
extern struct memmap_entry *memmap_table;
extern unsigned memmap_entries;