The following changes since commit 3b14a767eaca3df5534a162851f04787b363670e:

Merge tag 'qemu-openbios-20240924' of https://github.com/mcayland/qemu into staging (2024-09-28 12:34:44 +0100)

https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20240929

for you to fetch changes up to f7c8ef7bad7495d8c84b262a8b243efe39e56b13:

hw/loongarch/fw_cfg: Build in common_ss[] (2024-09-29 16:22:56 +0800)

pull-loongarch-20240929

Bibo Mao (3):

acpi: ged: Add macro for acpi sleep control register

hw/loongarch/virt: Add FDT table support with acpi ged pm register

target/loongarch: Avoid bits shift exceeding width of bool type

Jiaxun Yang (2):

hw/loongarch/boot: Refactor EFI booting protocol generation

hw/loongarch/boot: Rework boot code generation

Philippe Mathieu-Daudé (2):

hw/loongarch/virt: Remove unnecessary 'cpu.h' inclusion

hw/loongarch/fw_cfg: Build in common_ss[]

hw/acpi/generic_event_device.c | 6 +-

hw/loongarch/boot.c | 321 +++++++++++++++++++++------------

hw/loongarch/meson.build | 2 +-

hw/loongarch/virt.c | 39 ++++

include/hw/acpi/generic_event_device.h | 7 +-

include/hw/loongarch/boot.h | 106 +++++++++--

include/hw/loongarch/virt.h | 1 -

target/loongarch/arch_dump.c | 6 +-

8 files changed, 342 insertions(+), 146 deletions(-)

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Reviewed-by: Song Gao <gaosong@loongson.cn>

Message-Id: <20240927213254.17552-2-philmd@linaro.org>

Signed-off-by: Song Gao <gaosong@loongson.cn>

include/hw/loongarch/virt.h | 1 -

1 file changed, 1 deletion(-)

diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h

--- a/include/hw/loongarch/virt.h

+++ b/include/hw/loongarch/virt.h

@@ -XXX,XX +XXX,XX @@

#ifndef HW_LOONGARCH_H

#define HW_LOONGARCH_H

-#include "target/loongarch/cpu.h"

#include "hw/boards.h"

#include "qemu/queue.h"

#include "hw/block/flash.h"

2.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Nothing in LoongArch fw_cfg.c requires target specific definitions.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Reviewed-by: Song Gao <gaosong@loongson.cn>

Message-Id: <20240927213254.17552-3-philmd@linaro.org>

Signed-off-by: Song Gao <gaosong@loongson.cn>

hw/loongarch/meson.build | 2 +-

diff --git a/hw/loongarch/meson.build b/hw/loongarch/meson.build

--- a/hw/loongarch/meson.build

+++ b/hw/loongarch/meson.build

@@ -XXX,XX +XXX,XX @@

loongarch_ss = ss.source_set()

loongarch_ss.add(files(

- 'fw_cfg.c',

'boot.c',

))

+common_ss.add(when: 'CONFIG_LOONGARCH_VIRT', if_true: files('fw_cfg.c'))

loongarch_ss.add(when: 'CONFIG_LOONGARCH_VIRT', if_true: files('virt.c'))

loongarch_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-build.c'))

2.34.1

From: Bibo Mao <maobibo@loongson.cn>

ACPI ged is used for power management on LoongArch virt platform, in

general it is parsed from acpi table. However if system boot directly from

elf kernel, no UEFI bios is provided and acpi table cannot be used also.

Here acpi ged pm register is exposed with FDT table, it is compatbile

with syscon method in FDT table, only that acpi ged pm register is accessed

with 8-bit mode, rather with 32-bit mode.

Reviewed-by: Song Gao <gaosong@loongson.cn>

Tested-by: Song Gao <gaosong@loongson.cn>

Message-Id: <20240918014206.2165821-3-maobibo@loongson.cn>

Signed-off-by: Song Gao <gaosong@loongson.cn>

hw/loongarch/virt.c | 39 +++++++++++++++++++++++++++++++++++++++

1 file changed, 39 insertions(+)

@@ -XXX,XX +XXX,XX @@ static void fdt_add_rtc_node(LoongArchVirtMachineState *lvms,

g_free(nodename);

}

+static void fdt_add_ged_reset(LoongArchVirtMachineState *lvms)

+ char *name;

+ uint32_t ged_handle;

+ MachineState *ms = MACHINE(lvms);

+ hwaddr base = VIRT_GED_REG_ADDR;

+ hwaddr size = ACPI_GED_REG_COUNT;

+

+ ged_handle = qemu_fdt_alloc_phandle(ms->fdt);

+ name = g_strdup_printf("/ged@%" PRIx64, base);

+ qemu_fdt_add_subnode(ms->fdt, name);

+ qemu_fdt_setprop_string(ms->fdt, name, "compatible", "syscon");

+ qemu_fdt_setprop_cells(ms->fdt, name, "reg", 0x0, base, 0x0, size);

+ /* 8 bit registers */

+ qemu_fdt_setprop_cell(ms->fdt, name, "reg-shift", 0);

+ qemu_fdt_setprop_cell(ms->fdt, name, "reg-io-width", 1);

+ qemu_fdt_setprop_cell(ms->fdt, name, "phandle", ged_handle);

+ ged_handle = qemu_fdt_get_phandle(ms->fdt, name);

+ g_free(name);

+

+ name = g_strdup_printf("/reboot");

+ qemu_fdt_add_subnode(ms->fdt, name);

+ qemu_fdt_setprop_string(ms->fdt, name, "compatible", "syscon-reboot");

+ qemu_fdt_setprop_cell(ms->fdt, name, "regmap", ged_handle);

+ qemu_fdt_setprop_cell(ms->fdt, name, "offset", ACPI_GED_REG_RESET);

+ qemu_fdt_setprop_cell(ms->fdt, name, "value", ACPI_GED_RESET_VALUE);

+ g_free(name);

+

+ name = g_strdup_printf("/poweroff");

+ qemu_fdt_add_subnode(ms->fdt, name);

+ qemu_fdt_setprop_string(ms->fdt, name, "compatible", "syscon-poweroff");

+ qemu_fdt_setprop_cell(ms->fdt, name, "regmap", ged_handle);

+ qemu_fdt_setprop_cell(ms->fdt, name, "offset", ACPI_GED_REG_SLEEP_CTL);

+ qemu_fdt_setprop_cell(ms->fdt, name, "value", ACPI_GED_SLP_EN |

+ (ACPI_GED_SLP_TYP_S5 << ACPI_GED_SLP_TYP_POS));

+ g_free(name);

static void fdt_add_uart_node(LoongArchVirtMachineState *lvms,

uint32_t *pch_pic_phandle, hwaddr base,

int irq, bool chosen)

fdt_add_rtc_node(lvms, pch_pic_phandle);

+ fdt_add_ged_reset(lvms);

2.34.1

From: Bibo Mao <maobibo@loongson.cn>

Macro definition is added for acpi sleep control register, ged emulation

driver can use the macro , also it can be used in FDT table if ged is

exposed with FDT table.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

Message-Id: <20240918014206.2165821-2-maobibo@loongson.cn>

Signed-off-by: Song Gao <gaosong@loongson.cn>

hw/acpi/generic_event_device.c | 6 +++---

include/hw/acpi/generic_event_device.h | 7 +++++--

2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c

--- a/hw/acpi/generic_event_device.c

+++ b/hw/acpi/generic_event_device.c

@@ -XXX,XX +XXX,XX @@ static void ged_regs_write(void *opaque, hwaddr addr, uint64_t data,

switch (addr) {

case ACPI_GED_REG_SLEEP_CTL:

- slp_typ = (data >> 2) & 0x07;

- slp_en = (data >> 5) & 0x01;

- if (slp_en && slp_typ == 5) {

+ slp_typ = (data >> ACPI_GED_SLP_TYP_POS) & ACPI_GED_SLP_TYP_MASK;

+ slp_en = !!(data & ACPI_GED_SLP_EN);

+ if (slp_en && slp_typ == ACPI_GED_SLP_TYP_S5) {

qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

return;

diff --git a/include/hw/acpi/generic_event_device.h b/include/hw/acpi/generic_event_device.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/acpi/generic_event_device.h

+++ b/include/hw/acpi/generic_event_device.h

@@ -XXX,XX +XXX,XX @@ OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, ACPI_GED)

/* ACPI_GED_REG_RESET value for reset*/

#define ACPI_GED_RESET_VALUE 0x42

-/* ACPI_GED_REG_SLEEP_CTL.SLP_TYP value for S5 (aka poweroff) */

-#define ACPI_GED_SLP_TYP_S5 0x05

+/* [ACPI 5.0 Chapter 4.8.3.7] Sleep Control and Status Register */

+#define ACPI_GED_SLP_TYP_POS 0x2 /* SLP_TYPx Bit Offset */

+#define ACPI_GED_SLP_TYP_MASK 0x07 /* SLP_TYPx 3-bit mask */

+#define ACPI_GED_SLP_TYP_S5 0x05 /* System _S5 State (Soft Off) */

+#define ACPI_GED_SLP_EN 0x20 /* SLP_EN write-only bit */

#define GED_DEVICE "GED"

#define AML_GED_EVT_REG "EREG"

2.34.1

From: Jiaxun Yang <jiaxun.yang@flygoat.com>

Use stl_p to write instructions so that host endian conversion

will be performed.

Replace mailbox read/write on LoongArch32 systems with 32bit IOCSR

instructions to prevent illegal instructions.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>

Reviewed-by: Song Gao <gaosong@loongson.cn>

Message-Id: <20240914-loongarch-booting-v1-2-1517cae11c10@flygoat.com>

Signed-off-by: Song Gao <gaosong@loongson.cn>

---

hw/loongarch/boot.c | 107 ++++++++++++++++++++++++--------------------

1 file changed, 59 insertions(+), 48 deletions(-)

diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c

--- a/hw/loongarch/boot.c

+++ b/hw/loongarch/boot.c

@@ -XXX,XX +XXX,XX @@ unsigned memmap_entries;

ram_addr_t initrd_offset;

uint64_t initrd_size;

-static const unsigned int slave_boot_code[] = {

- /* Configure reset ebase. */

- 0x0400302c, /* csrwr $t0, LOONGARCH_CSR_EENTRY */

- /* Disable interrupt. */

- 0x0380100c, /* ori $t0, $zero,0x4 */

- 0x04000180, /* csrxchg $zero, $t0, LOONGARCH_CSR_CRMD */

- /* Clear mailbox. */

- 0x1400002d, /* lu12i.w $t1, 1(0x1) */

- 0x038081ad, /* ori $t1, $t1, CORE_BUF_20 */

- 0x06481da0, /* iocsrwr.d $zero, $t1 */

-

- /* Enable IPI interrupt. */

- 0x1400002c, /* lu12i.w $t0, 1(0x1) */

- 0x0400118c, /* csrxchg $t0, $t0, LOONGARCH_CSR_ECFG */

- 0x02fffc0c, /* addi.d $t0, $r0,-1(0xfff) */

- 0x1400002d, /* lu12i.w $t1, 1(0x1) */

- 0x038011ad, /* ori $t1, $t1, CORE_EN_OFF */

- 0x064819ac, /* iocsrwr.w $t0, $t1 */

- 0x1400002d, /* lu12i.w $t1, 1(0x1) */

- 0x038081ad, /* ori $t1, $t1, CORE_BUF_20 */

-

- /* Wait for wakeup <.L11>: */

- 0x06488000, /* idle 0x0 */

- 0x03400000, /* andi $zero, $zero, 0x0 */

- 0x064809ac, /* iocsrrd.w $t0, $t1 */

- 0x43fff59f, /* beqz $t0, -12(0x7ffff4) # 48 <.L11> */

-

- /* Read and clear IPI interrupt. */

- 0x1400002d, /* lu12i.w $t1, 1(0x1) */

- 0x064809ac, /* iocsrrd.w $t0, $t1 */

- 0x1400002d, /* lu12i.w $t1, 1(0x1) */

- 0x038031ad, /* ori $t1, $t1, CORE_CLEAR_OFF */

- 0x064819ac, /* iocsrwr.w $t0, $t1 */

-

- /* Disable IPI interrupt. */

- 0x1400002c, /* lu12i.w $t0, 1(0x1) */

- 0x04001180, /* csrxchg $zero, $t0, LOONGARCH_CSR_ECFG */

-

- /* Read mail buf and jump to specified entry */

- 0x1400002d, /* lu12i.w $t1, 1(0x1) */

- 0x038081ad, /* ori $t1, $t1, CORE_BUF_20 */

- 0x06480dac, /* iocsrrd.d $t0, $t1 */

- 0x00150181, /* move $ra, $t0 */

- 0x4c000020, /* jirl $zero, $ra,0 */

-};

+static void generate_secondary_boot_code(void *boot_code, bool is_64bit)

+ uint32_t *p = boot_code;

+

+ /* Configure reset ebase. */

+ stl_p(p++, 0x0400302c); /* csrwr $t0, LOONGARCH_CSR_EENTRY */

+

+ /* Disable interrupt. */

+ stl_p(p++, 0x0380100c); /* ori $t0, $zero,0x4 */

+ stl_p(p++, 0x04000180); /* csrxchg $zero, $t0, LOONGARCH_CSR_CRMD */

+

+ /* Clear mailbox. */

+ stl_p(p++, 0x1400002d); /* lu12i.w $t1, 1(0x1) */

+ stl_p(p++, 0x038081ad); /* ori $t1, $t1, CORE_BUF_20 */

+ if (is_64bit) {

+ stl_p(p++, 0x06481da0); /* iocsrwr.d $zero, $t1 */

+ } else {

+ stl_p(p++, 0x064819a0); /* iocsrwr.w $zero, $t1 */

+ /* Enable IPI interrupt. */

+ stl_p(p++, 0x1400002c); /* lu12i.w $t0, 1(0x1) */

+ stl_p(p++, 0x0400118c); /* csrxchg $t0, $t0, LOONGARCH_CSR_ECFG */

+ stl_p(p++, 0x02fffc0c); /* addi.d $t0, $r0, -1(0xfff) */

+ stl_p(p++, 0x1400002d); /* lu12i.w $t1, 1(0x1) */

+ stl_p(p++, 0x038011ad); /* ori $t1, $t1, CORE_EN_OFF */

+ stl_p(p++, 0x064819ac); /* iocsrwr.w $t0, $t1 */

+ stl_p(p++, 0x1400002d); /* lu12i.w $t1, 1(0x1) */

+ stl_p(p++, 0x038081ad); /* ori $t1, $t1, CORE_BUF_20 */

+

+ /* Wait for wakeup <.L11>: */

+ stl_p(p++, 0x06488000); /* idle 0x0 */

+ stl_p(p++, 0x03400000); /* andi $zero, $zero, 0x0 */

+ stl_p(p++, 0x064809ac); /* iocsrrd.w $t0, $t1 */

+ stl_p(p++, 0x43fff59f); /* beqz $t0, -12(0x7ffff4) # 48 <.L11> */

+

+ /* Read and clear IPI interrupt. */

+ stl_p(p++, 0x1400002d); /* lu12i.w $t1, 1(0x1) */

+ stl_p(p++, 0x064809ac); /* iocsrrd.w $t0, $t1 */

+ stl_p(p++, 0x1400002d); /* lu12i.w $t1, 1(0x1) */

+ stl_p(p++, 0x038031ad); /* ori $t1, $t1, CORE_CLEAR_OFF */

+ stl_p(p++, 0x064819ac); /* iocsrwr.w $t0, $t1 */

+

+ /* Disable IPI interrupt. */

+ stl_p(p++, 0x1400002c); /* lu12i.w $t0, 1(0x1) */

+ stl_p(p++, 0x04001180); /* csrxchg $zero, $t0, LOONGARCH_CSR_ECFG */

+

+ /* Read mail buf and jump to specified entry. */

+ stl_p(p++, 0x1400002d); /* lu12i.w $t1, 1(0x1) */

+ stl_p(p++, 0x038081ad); /* ori $t1, $t1, CORE_BUF_20 */

+ if (is_64bit) {

+ stl_p(p++, 0x06480dac); /* iocsrrd.d $t0, $t1 */

+ } else {

+ stl_p(p++, 0x064809ac); /* iocsrrd.w $t0, $t1 */

+ stl_p(p++, 0x00150181); /* move $ra, $t0 */

+ stl_p(p++, 0x4c000020); /* jirl $zero, $ra, 0 */

+}

static inline void *guidcpy(void *dst, const void *src)

{

@@ -XXX,XX +XXX,XX @@ static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info)

/* Load slave boot code at pflash0 . */

void *boot_code = g_malloc0(VIRT_FLASH0_SIZE);

- memcpy(boot_code, &slave_boot_code, sizeof(slave_boot_code));

+ generate_secondary_boot_code(boot_code, is_la64(&lacpu->env));

rom_add_blob_fixed("boot_code", boot_code, VIRT_FLASH0_SIZE, VIRT_FLASH0_BASE);

CPU_FOREACH(cs) {

2.34.1

From: Jiaxun Yang <jiaxun.yang@flygoat.com>

Refector EFI style booting data structure generation to

support 32bit EFI variant on LoongArch32 CPU.

All data structs are filled with padding members if necessary

and marked as QEMU_PACKED to avoid host ABI alignment impact.

Host endian is being cared as well.

It also fixed various problems in old implementation such

as null pointer on empty string, memory desc map_size not set,

incorrect memory map definition and so on.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>

Reviewed-by: Song Gao <gaosong@loongson.cn>

Message-Id: <20240914-loongarch-booting-v1-1-1517cae11c10@flygoat.com>

Signed-off-by: Song Gao <gaosong@loongson.cn>

---

hw/loongarch/boot.c | 220 ++++++++++++++++++++++++------------

include/hw/loongarch/boot.h | 106 +++++++++++++----

2 files changed, 237 insertions(+), 89 deletions(-)

diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c

--- a/hw/loongarch/boot.c

+++ b/hw/loongarch/boot.c

@@ -XXX,XX +XXX,XX @@

* Copyright (c) 2023 Loongson Technology Corporation Limited

*/

+#include <zlib.h>

#include "qemu/osdep.h"

#include "qemu/units.h"

#include "target/loongarch/cpu.h"

@@ -XXX,XX +XXX,XX @@ static const unsigned int slave_boot_code[] = {

/* Clear mailbox. */

0x1400002d, /* lu12i.w $t1, 1(0x1) */

- 0x038081ad, /* ori $t1, $t1, CORE_BUF_20 */

+ 0x038081ad, /* ori $t1, $t1, CORE_BUF_20 */

0x06481da0, /* iocsrwr.d $zero, $t1 */

/* Enable IPI interrupt. */

@@ -XXX,XX +XXX,XX @@ 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,

- void *p, void *start)

+static void efi_hdr_crc32(efi_table_hdr_t *hdr)

- unsigned i;

- struct efi_boot_memmap *boot_memmap = p;

- efi_guid_t tbl_guid = LINUX_EFI_BOOT_MEMMAP_GUID;

-

- /* efi_configuration_table 1 */

- guidcpy(&systab->tables[0].guid, &tbl_guid);

- systab->tables[0].table = (struct efi_configuration_table *)(p - start);

- systab->nr_tables = 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 = p + sizeof(struct efi_boot_memmap);

- for (i = 0; i < memmap_entries; i++) {

- map = (void *)boot_memmap + sizeof(*map);

- map[i].type = memmap_table[i].type;

- map[i].phys_addr = ROUND_UP(memmap_table[i].address, 64 * KiB);

- map[i].num_pages = ROUND_DOWN(memmap_table[i].address +

- memmap_table[i].length - map[i].phys_addr, 64 * KiB);

- p += sizeof(efi_memory_desc_t);

- }

+ hdr->crc32 = 0;

+ val = crc32(0, (const unsigned char *)hdr, hdr->headersize);

+ hdr->crc32 = cpu_to_le32(val);

-static void init_efi_initrd_table(struct efi_system_table *systab,

- void *p, void *start)

+static void init_efi_vendor_string(void **p)

- efi_guid_t tbl_guid = LINUX_EFI_INITRD_MEDIA_GUID;

- struct efi_initrd *initrd_table = p;

+ uint16_t *vendor_str = *p;

- /* efi_configuration_table 2 */

- guidcpy(&systab->tables[1].guid, &tbl_guid);

- systab->tables[1].table = (struct efi_configuration_table *)(p - start);

- systab->nr_tables = 2;

+ /* QEMU in UTF16-LE */

+ stw_le_p(vendor_str++, 0x0051); /* Q */

+ stw_le_p(vendor_str++, 0x0045); /* E */

+ stw_le_p(vendor_str++, 0x004D); /* M */

+ stw_le_p(vendor_str++, 0x0055); /* U */

+ stw_le_p(vendor_str++, 0x0000); /* \0 */

- initrd_table->base = initrd_offset;

- initrd_table->size = initrd_size;

+ *p = vendor_str;

+ *p = QEMU_ALIGN_PTR_UP(*p, sizeof(target_long));

}

-static void init_efi_fdt_table(struct efi_system_table *systab)

+static void memmap_write_descs(efi_memory_desc_t *map)

{

- 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;

- struct efi_system_table *systab = p;

+ int i;

- info->a2 = p - start;

+ for (i = 0; i < memmap_entries; i++) {

+ uint32_t efi_type;

+ hwaddr start = memmap_table[i].address;

+ hwaddr end = memmap_table[i].address + memmap_table[i].length;

+ switch (memmap_table[i].type) {

+ case MEMMAP_TYPE_MEMORY:

+ efi_type = EFI_CONVENTIONAL_MEMORY;

+ break;

+ case MEMMAP_TYPE_RESERVED:

+ efi_type = EFI_RESERVED_TYPE;

+ break;

+ case MEMMAP_TYPE_ACPI:

+ efi_type = EFI_ACPI_RECLAIM_MEMORY;

+ break;

+ case MEMMAP_TYPE_NVS:

+ efi_type = EFI_ACPI_MEMORY_NVS;

+ break;

+ default:

+ efi_type = EFI_RESERVED_TYPE;

+ break;

+ }

- 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;

+ if (memmap_table[i].reserved) {

+ start = QEMU_ALIGN_DOWN(start, EFI_PAGE_SIZE);

+ end = QEMU_ALIGN_UP(end, EFI_PAGE_SIZE);

+ } else {

+ start = QEMU_ALIGN_UP(start, EFI_PAGE_SIZE);

+ end = QEMU_ALIGN_DOWN(end, EFI_PAGE_SIZE);

+ }

- p += ROUND_UP(sizeof(struct efi_system_table), 64 * KiB);

+ map[i].type = cpu_to_le32(efi_type);

+ map[i].phys_addr = cpu_to_le64(start);

+ map[i].virt_addr = cpu_to_le64(start);

+ map[i].num_pages = cpu_to_le64((end - start) >> EFI_PAGE_SHIFT);

+ }

+}

- systab->tables = p;

- bp_tables_start = p;

+#define EFI_BOOT_MEMMAP_TABLE_GEN(type) \

+static void init_efi_boot_memmap_##type(void *guidp, void **p) \

+{ \

+ struct efi_boot_memmap_##type *boot_memmap = *p; \

+ efi_guid_t tbl_guid = LINUX_EFI_BOOT_MEMMAP_GUID; \

+ \

+ /* efi_configuration_table 1 */ \

+ guidcpy(guidp, &tbl_guid); \

+ \

+ boot_memmap->desc_size = cpu_to_le##type(sizeof(efi_memory_desc_t)); \

+ boot_memmap->desc_ver = cpu_to_le32(1); \

+ boot_memmap->map_size = cpu_to_le##type(boot_memmap->desc_size * \

+ memmap_entries); \

+ memmap_write_descs(boot_memmap->map); \

+ *p += sizeof(struct efi_boot_memmap_##type); \

+}

- init_efi_boot_memmap(systab, p, start);

- p += ROUND_UP(sizeof(struct efi_boot_memmap) +

- 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);

+#define EFI_INITRD_TABLE_GEN(type) \

+static void init_efi_initrd_table_##type(void *guidp, void **p) \

+{ \

+ efi_guid_t tbl_guid = LINUX_EFI_INITRD_MEDIA_GUID; \

+ struct efi_initrd_##type *initrd_table = *p; \

+ \

+ /* efi_configuration_table */ \

+ guidcpy(guidp, &tbl_guid); \

+ \

+ initrd_table->base = cpu_to_le##type(initrd_offset); \

+ initrd_table->size = cpu_to_le##type(initrd_size); \

+ *p += sizeof(struct efi_initrd_##type); \

+}

- systab->tables = (struct efi_configuration_table *)(bp_tables_start - start);

+#define BOOTP_ALIGN_PTR_UP(p, s, n) \

+ ((typeof(p))((uintptr_t)(s) + \

+ QEMU_ALIGN_UP((uintptr_t)(p) - (uintptr_t)(s), n)))

+

+#define EFI_INIT_SYSTAB_GEN(type) \

+ EFI_BOOT_MEMMAP_TABLE_GEN(type) \

+ EFI_INITRD_TABLE_GEN(type) \

+static void init_systab_##type(struct loongarch_boot_info *info, \

+ void *p, void *start) \

+{ \

+ uint32_t nr_tables = 0; \

+ const efi_guid_t fdt_guid = DEVICE_TREE_GUID; \

+ struct efi_system_table_##type *systab; \

+ struct efi_configuration_table_##type *cfg_tabs; \

+ \

+ p = BOOTP_ALIGN_PTR_UP(p, start, EFI_TABLE_ALIGN); \

+ systab = p; \

+ info->a2 = p - start; \

+ \

+ systab->hdr.signature = cpu_to_le64(EFI_SYSTEM_TABLE_SIGNATURE); \

+ systab->hdr.revision = cpu_to_le32(EFI_SPECIFICATION_VERSION); \

+ systab->hdr.headersize = \

+ cpu_to_le32(sizeof(struct efi_system_table_##type)); \

+ systab->fw_revision = \

+ cpu_to_le32(FW_VERSION << 16 | FW_PATCHLEVEL << 8); \

+ systab->runtime = 0; \

+ systab->boottime = 0; \

+ systab->nr_tables = 0; \

+ \

+ p += sizeof(struct efi_system_table_##type); \

+ systab->fw_vendor = cpu_to_le##type(p - start); \

+ init_efi_vendor_string(&p); \

+ \

+ p = BOOTP_ALIGN_PTR_UP(p, start, EFI_TABLE_ALIGN); \

+ systab->tables = cpu_to_le##type(p - start); \

+ cfg_tabs = p; \

+ p += sizeof(struct efi_configuration_table_##type) * 3; \

+ \

+ p = BOOTP_ALIGN_PTR_UP(p, start, EFI_TABLE_ALIGN); \

+ cfg_tabs[nr_tables].table = cpu_to_le##type(p - start); \

+ init_efi_boot_memmap_##type(&cfg_tabs[nr_tables].guid, &p); \

+ nr_tables++; \

+ \

+ if (initrd_size > 0) { \

+ cfg_tabs[nr_tables].table = cpu_to_le##type(p - start); \

+ init_efi_initrd_table_##type(&cfg_tabs[nr_tables].guid, &p); \

+ nr_tables++; \

+ } \

+ \

+ guidcpy(&cfg_tabs[nr_tables].guid, &fdt_guid); \

+ cfg_tabs[nr_tables].table = cpu_to_le##type(FDT_BASE); \

+ nr_tables++; \

+ \

+ systab->nr_tables = cpu_to_le32(nr_tables); \

+ efi_hdr_crc32(&systab->hdr); \

}

+EFI_INIT_SYSTAB_GEN(32)

+EFI_INIT_SYSTAB_GEN(64)

+

static void init_cmdline(struct loongarch_boot_info *info, void *p, void *start)

{

hwaddr cmdline_addr = p - start;

@@ -XXX,XX +XXX,XX @@ static void reset_load_elf(void *opaque)

cpu_reset(CPU(cpu));

if (env->load_elf) {

-    if (cpu == LOONGARCH_CPU(first_cpu)) {

+ 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;

@@ -XXX,XX +XXX,XX @@ static void loongarch_firmware_boot(LoongArchVirtMachineState *lvms,

fw_cfg_add_kernel_info(info, lvms->fw_cfg);

}

-static void init_boot_rom(struct loongarch_boot_info *info, void *p)

+static void init_boot_rom(struct loongarch_boot_info *info, void *p,

+ bool is_64bit)

{

void *start = p;

init_cmdline(info, p, start);

p += COMMAND_LINE_SIZE;

- init_systab(info, p, start);

+ if (is_64bit)

+ init_systab_64(info, p, start);

+ else

+ init_systab_32(info, p, start);

}

static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info)

{

void *p, *bp;

int64_t kernel_addr = 0;

- LoongArchCPU *lacpu;

+ LoongArchCPU *lacpu = LOONGARCH_CPU(first_cpu);

CPUState *cs;

if (info->kernel_filename) {

@@ -XXX,XX +XXX,XX @@ static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info)

/* Load cmdline and system tables at [0 - 1 MiB] */

p = g_malloc0(1 * MiB);

bp = p;

- init_boot_rom(info, p);

+ init_boot_rom(info, p, is_la64(&lacpu->env));

rom_add_blob_fixed_as("boot_info", bp, 1 * MiB, 0, &address_space_memory);

/* Load slave boot code at pflash0 . */

diff --git a/include/hw/loongarch/boot.h b/include/hw/loongarch/boot.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/loongarch/boot.h

+++ b/include/hw/loongarch/boot.h

@@ -XXX,XX +XXX,XX @@ typedef struct {

EFI_GUID(0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, \

0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0)

+/* Memory types: */

+#define EFI_RESERVED_TYPE 0

+#define EFI_LOADER_CODE 1

+#define EFI_LOADER_DATA 2

+#define EFI_BOOT_SERVICES_CODE 3

+#define EFI_BOOT_SERVICES_DATA 4

+#define EFI_RUNTIME_SERVICES_CODE 5

+#define EFI_RUNTIME_SERVICES_DATA 6

+#define EFI_CONVENTIONAL_MEMORY 7

+#define EFI_UNUSABLE_MEMORY 8

+#define EFI_ACPI_RECLAIM_MEMORY 9

+#define EFI_ACPI_MEMORY_NVS 10

+#define EFI_MEMORY_MAPPED_IO 11

+#define EFI_MEMORY_MAPPED_IO_PORT_SPACE 12

+#define EFI_PAL_CODE 13

+#define EFI_PERSISTENT_MEMORY 14

+#define EFI_UNACCEPTED_MEMORY 15

+#define EFI_MAX_MEMORY_TYPE 16

+

+#define EFI_PAGE_SHIFT 12

+#define EFI_PAGE_SIZE (1UL << EFI_PAGE_SHIFT)

+

+#define EFI_TABLE_ALIGN (64 * KiB)

+

struct efi_config_table {

efi_guid_t guid;

uint64_t *ptr;

const char name[16];

-};

+} QEMU_PACKED;

typedef struct {

uint64_t signature;

@@ -XXX,XX +XXX,XX @@ typedef struct {

uint32_t headersize;

uint32_t crc32;

uint32_t reserved;

-} efi_table_hdr_t;

+} QEMU_PACKED efi_table_hdr_t;

-struct efi_configuration_table {

+struct efi_configuration_table_32 {

efi_guid_t guid;

- void *table;

-};

+ uint32_t table;

+} QEMU_PACKED;

-struct efi_system_table {

+struct efi_configuration_table_64 {

+ efi_guid_t guid;

+ uint64_t table;

+} QEMU_PACKED;

+

+struct efi_system_table_32 {

+ efi_table_hdr_t hdr;

+ uint32_t fw_vendor; /* physical addr of CHAR16 vendor string */

+ uint32_t fw_revision;

+ uint32_t con_in_handle;

+ uint32_t con_in;

+ uint32_t con_out_handle;

+ uint32_t con_out;

+ uint32_t stderr_handle;

+ uint32_t stderr_placeholder;

+ uint32_t runtime;

+ uint32_t boottime;

+ uint32_t nr_tables;

+ uint32_t tables;

+} QEMU_PACKED;

+

+struct efi_system_table_64 {

efi_table_hdr_t hdr;

uint64_t fw_vendor; /* physical addr of CHAR16 vendor string */

uint32_t fw_revision;

+ uint32_t __pad1;

uint64_t con_in_handle;

- uint64_t *con_in;

+ uint64_t con_in;

uint64_t con_out_handle;

- uint64_t *con_out;

+ uint64_t con_out;

uint64_t stderr_handle;

uint64_t stderr_placeholder;

- uint64_t *runtime;

- uint64_t *boottime;

- uint64_t nr_tables;

- struct efi_configuration_table *tables;

-};

+ uint64_t runtime;

+ uint64_t boottime;

+ uint32_t nr_tables;

+ uint32_t __pad2;

+ uint64_t tables;

+} QEMU_PACKED;

typedef struct {

uint32_t type;

- uint32_t pad;

+ uint32_t __pad;

uint64_t phys_addr;