[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 08/17] hw/loongarch: Init efi_fdt table
From: |
Song Gao |
Subject: |
[PULL v2 08/17] hw/loongarch: Init efi_fdt table |
Date: |
Mon, 29 Apr 2024 10:30:34 +0800 |
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>
---
hw/loongarch/boot.c | 11 +++++++++++
hw/loongarch/virt.c | 6 ++----
include/hw/loongarch/boot.h | 4 ++++
include/hw/loongarch/virt.h | 2 ++
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index c8b3e742b4..7d1630b2e7 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -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);
}
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 708aa8bc60..42e5df8a24 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -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);
diff --git a/include/hw/loongarch/boot.h b/include/hw/loongarch/boot.h
index 42d1ee3663..4ebcc89dcf 100644
--- a/include/hw/loongarch/boot.h
+++ b/include/hw/loongarch/boot.h
@@ -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;
diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
index 8a9fe4053d..4e14bf6060 100644
--- a/include/hw/loongarch/virt.h
+++ b/include/hw/loongarch/virt.h
@@ -35,6 +35,8 @@
#define COMMAND_LINE_SIZE 512
+#define FDT_BASE 0x100000
+
extern struct memmap_entry *memmap_table;
extern unsigned memmap_entries;
--
2.25.1
- [PULL v2 00/17] loongarch-to-apply queue, Song Gao, 2024/04/28
- [PULL v2 03/17] hw/loongarch: Add slave cpu boot_code, Song Gao, 2024/04/28
- [PULL v2 02/17] hw/loongarch: Add load initrd, Song Gao, 2024/04/28
- [PULL v2 06/17] hw/loongarch: Init efi_boot_memmap table, Song Gao, 2024/04/28
- [PULL v2 08/17] hw/loongarch: Init efi_fdt table,
Song Gao <=
- [PULL v2 04/17] hw/loongarch: Add init_cmdline, Song Gao, 2024/04/28
- [PULL v2 05/17] hw/loongarch: Init efi_system_table, Song Gao, 2024/04/28
- [PULL v2 09/17] hw/loongarch: Fix fdt memory node wrong 'reg', Song Gao, 2024/04/28
- [PULL v2 01/17] hw/loongarch: Move boot functions to boot.c, Song Gao, 2024/04/28
- [PULL v2 07/17] hw/loongarch: Init efi_initrd table, Song Gao, 2024/04/28
- [PULL v2 13/17] hw/loongarch: fdt adds pch_msi Controller, Song Gao, 2024/04/28
- [PULL v2 14/17] hw/loongarch: fdt adds pcie irq_map node, Song Gao, 2024/04/28
- [PULL v2 15/17] hw/loongarch: fdt remove unused irqchip node, Song Gao, 2024/04/28
- [PULL v2 17/17] hw/loongarch: Add cells missing from rtc node, Song Gao, 2024/04/28
- [PULL v2 10/17] hw/loongarch: fdt adds cpu interrupt controller node, Song Gao, 2024/04/28