Signed-off-by: Song Gao <gaos...@loongson.cn>
---
hw/loongarch/boot.c | 45 +++++++++++++++++++++++++++++++++++++
hw/loongarch/virt.c | 11 ++-------
include/hw/loongarch/boot.h | 27 ++++++++++++++++++++++
include/hw/loongarch/virt.h | 10 +++++++++
4 files changed, 84 insertions(+), 9 deletions(-)
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index 7d043fd718..5d963176bd 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -18,12 +18,14 @@ enum {
SLAVE_BOOT,
EFI_SYSTAB,
EFI_TABLES,
+ EFI_MEMMAP,
};
static const MemMapEntry loader_rommap[] = {
[SLAVE_BOOT] = {0xf100000, 0x10000},
[EFI_SYSTAB] = {0xf200000, 0x10000},
[EFI_TABLES] = {0xf300000, 0x10000},
+ [EFI_MEMMAP] = {0xf400000, 0x10000},
};
static unsigned int slave_boot_code[] = {
@@ -74,6 +76,47 @@ static unsigned int slave_boot_code[] = {
0x4c000020, /* jirl $r0,$r1,0 */
};
+static inline void *guidcpy(void *dst, const void *src)
+{
+ return memcpy(dst, src, sizeof(efi_guid_t));
+}
+
+static void init_efi_boot_memmap(struct efi_system_table *systab)
+{
+ unsigned i;
+ struct efi_boot_memmap *boot_memmap;
+ efi_guid_t tbl_guid = LINUX_EFI_BOOT_MEMMAP_GUID;
+
+ boot_memmap = g_malloc0(sizeof(struct efi_boot_memmap) +
+ sizeof(efi_memory_desc_t) * 32);
+ if (!boot_memmap) {
+ error_report("init_boot_memmap :can not malloc memory\n");
+ exit(1);
+ }
+ boot_memmap->desc_size = sizeof(efi_memory_desc_t);
+ boot_memmap->desc_ver = 1;
+ boot_memmap->map_size = 0;
+
+ efi_memory_desc_t *map;
+ for (i = 0; i < memmap_entries; i++) {
+ map = (void *)boot_memmap + sizeof(*map);
+ map[i].type = memmap_table[i].type;
+ map[i].phys_addr = memmap_table[i].address;
+ map[i].num_pages = memmap_table[i].length >> 16; /* 64KB align*/
+ }
+
+ rom_add_blob_fixed("memmap_rom", boot_memmap,
+ loader_rommap[EFI_MEMMAP].size,
+ loader_rommap[EFI_MEMMAP].base);
+
+ /* efi_configuration_table 1 */
+ guidcpy(&systab->tables[0].guid, &tbl_guid);
+ systab->tables[0].table = (void *)loader_rommap[EFI_MEMMAP].base;
+ systab->nr_tables = 1;
+
+ g_free(boot_memmap);
+}
+
static void init_systab(struct loongarch_boot_info *info)
{
struct efi_system_table *systab;
@@ -90,6 +133,8 @@ static void init_systab(struct loongarch_boot_info *info)
systab->nr_tables = 0;
systab->tables = efi_tables;
+ init_efi_boot_memmap(systab);
+
rom_add_blob_fixed("tables_rom", efi_tables,
loader_rommap[EFI_TABLES].size,
loader_rommap[EFI_TABLES].base);
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 3e27d72f55..c45e724961 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -342,15 +342,8 @@ static void virt_powerdown_req(Notifier *notifier, void
*opaque)
acpi_send_event(s->acpi_ged, ACPI_POWER_DOWN_STATUS);
}
-struct memmap_entry {
- uint64_t address;
- uint64_t length;
- uint32_t type;
- uint32_t reserved;
-};
-
-static struct memmap_entry *memmap_table;
-static unsigned memmap_entries;
+struct memmap_entry *memmap_table;
+unsigned memmap_entries;
static void memmap_add_entry(uint64_t address, uint64_t length, uint32_t type)
{
diff --git a/include/hw/loongarch/boot.h b/include/hw/loongarch/boot.h
index 4ee116b25d..bef9ab659e 100644
--- a/include/hw/loongarch/boot.h
+++ b/include/hw/loongarch/boot.h
@@ -23,6 +23,15 @@ typedef struct {
uint8_t b[16];
} efi_guid_t __attribute__((aligned(8)));
+#define EFI_GUID(a, b, c, d...) (efi_guid_t){ {
\
+ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff,
\
+ (b) & 0xff, ((b) >> 8) & 0xff,
\
+ (c) & 0xff, ((c) >> 8) & 0xff, d } }
+
+#define LINUX_EFI_BOOT_MEMMAP_GUID \
+ EFI_GUID(0x800f683f, 0xd08b, 0x423a, 0xa2, 0x93, \
+ 0x96, 0x5c, 0x3c, 0x6f, 0xe2, 0xb4)
+
struct efi_config_table {
efi_guid_t guid;
uint64_t *ptr;
@@ -58,6 +67,24 @@ struct efi_system_table {
struct efi_configuration_table *tables;
};
+typedef struct {
+ uint32_t type;
+ uint32_t pad;
+ uint64_t phys_addr;
+ uint64_t virt_addr;
+ uint64_t num_pages;
+ uint64_t attribute;
+} efi_memory_desc_t;
+
+struct efi_boot_memmap {
+ uint64_t map_size;
+ uint64_t desc_size;
+ uint32_t desc_ver;
+ uint64_t map_key;
+ uint64_t buff_size;
+ efi_memory_desc_t map[32];
+};
+
struct loongarch_boot_info {
uint64_t ram_size;
const char *kernel_filename;
diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
index d21de2cef4..aef4cd05b1 100644
--- a/include/hw/loongarch/virt.h
+++ b/include/hw/loongarch/virt.h
@@ -33,6 +33,16 @@
#define COMMAND_LINE_SIZE 512
+extern struct memmap_entry *memmap_table;
+extern unsigned memmap_entries;
+
+struct memmap_entry {
+ uint64_t address;
+ uint64_t length;
+ uint32_t type;
+ uint32_t reserved;
+};
+
struct LoongArchMachineState {
/*< private >*/
MachineState parent_obj;
--
2.25.1
