Series comparison

-[PULL 00/17] loongarch-to-apply queue
+[PULL v2 0/6] loongarch-to-apply queue
-The following changes since commit 8f6330a807f2642dc2a3cdf33347aa28a4c00a87:
+The following changes since commit 38d0939b86e2eef6f6a622c6f1f7befda0146595:
-  Merge tag 'pull-maintainer-updates-060324-1' of https://gitlab.com/stsquad/qemu into staging (2024-03-06 16:56:20 +0000)
+  Merge tag 'pull-vfio-20241226' of https://github.com/legoater/qemu into staging (2024-12-26 04:38:38 -0500)
 are available in the Git repository at:
-  https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20240307
+  https://gitlab.com/bibo-mao/qemu.git tags/pull-loongarch-20241227
-for you to fetch changes up to 4dc2edfd6f8abfc38f0ba110502790aa5051b1b5:
+for you to fetch changes up to 5e360dabedb1ab1f15cce27a134ccbe4b8e18424:
-  hw/loongarch: Add cells missing from rtc node (2024-03-07 21:58:00 +0800)
+  target/loongarch: Use auto method with LASX feature (2024-12-27 11:33:06 +0800)
 ----------------------------------------------------------------
-pull-loongarch-20240307
+pull-loongarch-20241227
 v1 ... v2
 . Modify patch auther inconsistent with SOB
 ----------------------------------------------------------------
-Song Gao (17):
+Bibo Mao (5):
-      hw/loongarch: Move boot fucntions to boot.c
+      target/loongarch: Use actual operand size with vbsrl check
-      hw/loongarch: Add load initrd
+      hw/loongarch/virt: Create fdt table on machine creation done notification
-      hw/loongarch: Add slave cpu boot_code
+      hw/loongarch/virt: Improve fdt table creation for CPU object
-      hw/loongarch: Add init_cmdline
+      target/loongarch: Use auto method with LSX feature
-      hw/loongarch: Init efi_system_table
+      target/loongarch: Use auto method with LASX feature
       hw/loongarch: Init efi_boot_memmap table
       hw/loongarch: Init efi_initrd table
       hw/loongarch: Init efi_fdt table
       hw/loongarch: Fix fdt memory node wrong 'reg'
       hw/loongarch: fdt adds cpu interrupt controller node
       hw/loongarch: fdt adds Extend I/O Interrupt Controller
       hw/loongarch: fdt adds pch_pic Controller
       hw/loongarch: fdt adds pch_msi Controller
       hw/loongarch: fdt adds pcie irq_map node
       hw/loongarch: fdt remove unused irqchip node
       hw/loongarch: Add cells missing from uart node
       hw/loongarch: Add cells missing from rtc node
- hw/loongarch/boot.c                | 330 +++++++++++++++++++++++++++++++++
+Guo Hongyu (1):
- hw/loongarch/meson.build           |   1 +
+      target/loongarch: Fix vldi inst
- hw/loongarch/virt.c                | 363 +++++++++++++++++++++----------------
- include/hw/intc/loongarch_extioi.h |   1 +
+ hw/loongarch/virt.c                             | 142 ++++++++++++++----------
- include/hw/loongarch/boot.h        | 109 +++++++++++
+ target/loongarch/cpu.c                          |  86 ++++++++------
- include/hw/loongarch/virt.h        |  14 ++
+ target/loongarch/cpu.h                          |   4 +
- include/hw/pci-host/ls7a.h         |   2 +
+ target/loongarch/kvm/kvm.c                      | 107 ++++++++++++++++++
- target/loongarch/cpu.h             |   2 +
+ target/loongarch/tcg/insn_trans/trans_vec.c.inc |   4 +-
-files changed, 662 insertions(+), 160 deletions(-)
+files changed, 249 insertions(+), 94 deletions(-)
  create mode 100644 hw/loongarch/boot.c
  create mode 100644 include/hw/loongarch/boot.h

-[PULL 01/17] hw/loongarch: Move boot fucntions to boot.c
+Deleted patch
-Move some boot functions to boot.c and struct
-loongarch_boot_info into struct LoongArchMachineState.
-Signed-off-by: Song Gao <gaosong@loongson.cn>
-Message-Id: <20240301093839.663947-2-gaosong@loongson.cn>
----
- hw/loongarch/boot.c         | 125 ++++++++++++++++++++++++++++++++++++
- hw/loongarch/meson.build    |   1 +
- hw/loongarch/virt.c         | 121 +++-------------------------------
- include/hw/loongarch/boot.h |  21 ++++++
- include/hw/loongarch/virt.h |   2 +
-files changed, 157 insertions(+), 113 deletions(-)
- create mode 100644 hw/loongarch/boot.c
- create mode 100644 include/hw/loongarch/boot.h
-diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
-new file mode 100644
-index XXXXXXX..XXXXXXX
---- /dev/null
-+++ b/hw/loongarch/boot.c
-@@ -XXX,XX +XXX,XX @@
-+/* SPDX-License-Identifier: GPL-2.0-or-later */
-+/*
-+ * LoongArch boot helper functions.
-+ *
-+ * Copyright (c) 2023 Loongson Technology Corporation Limited
-+ */
-+
-+#include "qemu/osdep.h"
-+#include "qemu/units.h"
-+#include "target/loongarch/cpu.h"
-+#include "hw/loongarch/virt.h"
-+#include "hw/loader.h"
-+#include "elf.h"
-+#include "qemu/error-report.h"
-+#include "sysemu/reset.h"
-+
-+static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
-+{
-+    return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
-+}
-+
-+static int64_t load_kernel_info(struct loongarch_boot_info *info)
-+{
-+    uint64_t kernel_entry, kernel_low, kernel_high;
-+    ssize_t kernel_size;
-+
-+    kernel_size = load_elf(info->kernel_filename, NULL,
-+                           cpu_loongarch_virt_to_phys, NULL,
-+                           &kernel_entry, &kernel_low,
-+                           &kernel_high, NULL, 0,
-+                           EM_LOONGARCH, 1, 0);
-+
-+    if (kernel_size < 0) {
-+        error_report("could not load kernel '%s': %s",
-+                     info->kernel_filename,
-+                     load_elf_strerror(kernel_size));
-+        exit(1);
-+    }
-+    return kernel_entry;
-+}
-+
-+static void reset_load_elf(void *opaque)
-+{
-+    LoongArchCPU *cpu = opaque;
-+    CPULoongArchState *env = &cpu->env;
-+
-+    cpu_reset(CPU(cpu));
-+    if (env->load_elf) {
-+        cpu_set_pc(CPU(cpu), env->elf_address);
-+    }
-+}
-+
-+static void fw_cfg_add_kernel_info(struct loongarch_boot_info *info,
-+                                   FWCfgState *fw_cfg)
-+{
-+    /*
-+     * Expose the kernel, the command line, and the initrd in fw_cfg.
-+     * We don't process them here at all, it's all left to the
-+     * firmware.
-+     */
-+    load_image_to_fw_cfg(fw_cfg,
-+                         FW_CFG_KERNEL_SIZE, FW_CFG_KERNEL_DATA,
-+                         info->kernel_filename,
-+                         false);
-+
-+    if (info->initrd_filename) {
-+        load_image_to_fw_cfg(fw_cfg,
-+                             FW_CFG_INITRD_SIZE, FW_CFG_INITRD_DATA,
-+                             info->initrd_filename, false);
-+    }
-+
-+    if (info->kernel_cmdline) {
-+        fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE,
-+                       strlen(info->kernel_cmdline) + 1);
-+        fw_cfg_add_string(fw_cfg, FW_CFG_CMDLINE_DATA,
-+                          info->kernel_cmdline);
-+    }
-+}
-+
-+static void loongarch_firmware_boot(LoongArchMachineState *lams,
-+                                    struct loongarch_boot_info *info)
-+{
-+    fw_cfg_add_kernel_info(info, lams->fw_cfg);
-+}
-+
-+static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info)
-+{
-+    int64_t kernel_addr = 0;
-+    LoongArchCPU *lacpu;
-+    CPUState *cs;
-+
-+    if (info->kernel_filename) {
-+        kernel_addr = load_kernel_info(info);
-+    } else {
-+        error_report("Need kernel filename\n");
-+        exit(1);
-+    }
-+
-+    CPU_FOREACH(cs) {
-+        lacpu = LOONGARCH_CPU(cs);
-+        lacpu->env.load_elf = true;
-+        lacpu->env.elf_address = kernel_addr;
-+    }
-+}
-+
-+void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info)
-+{
-+    LoongArchMachineState *lams = LOONGARCH_MACHINE(ms);
-+    int i;
-+
-+    /* register reset function */
-+    for (i = 0; i < ms->smp.cpus; i++) {
-+        qemu_register_reset(reset_load_elf, LOONGARCH_CPU(qemu_get_cpu(i)));
-+    }
-+
-+    info->kernel_filename = ms->kernel_filename;
-+    info->kernel_cmdline = ms->kernel_cmdline;
-+    info->initrd_filename = ms->initrd_filename;
-+
-+    if (lams->bios_loaded) {
-+        loongarch_firmware_boot(lams, info);
-+    } else {
-+        loongarch_direct_kernel_boot(info);
-+    }
-+}
-diff --git a/hw/loongarch/meson.build b/hw/loongarch/meson.build
-index XXXXXXX..XXXXXXX 100644
---- 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',
- ))
- loongarch_ss.add(when: 'CONFIG_LOONGARCH_VIRT', if_true: [files('virt.c'), fdt])
- loongarch_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-build.c'))
-diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/loongarch/virt.c
-+++ b/hw/loongarch/virt.c
-@@ -XXX,XX +XXX,XX @@
- #include "hw/block/flash.h"
- #include "qemu/error-report.h"
--
--struct loaderparams {
--    uint64_t ram_size;
--    const char *kernel_filename;
--    const char *kernel_cmdline;
--    const char *initrd_filename;
--};
--
- static PFlashCFI01 *virt_flash_create1(LoongArchMachineState *lams,
-                                        const char *name,
-                                        const char *alias_prop_name)
-@@ -XXX,XX +XXX,XX @@ static void memmap_add_entry(uint64_t address, uint64_t length, uint32_t type)
-     memmap_entries++;
- }
--static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
--{
--    return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
--}
--
--static int64_t load_kernel_info(const struct loaderparams *loaderparams)
--{
--    uint64_t kernel_entry, kernel_low, kernel_high;
--    ssize_t kernel_size;
--
--    kernel_size = load_elf(loaderparams->kernel_filename, NULL,
--                           cpu_loongarch_virt_to_phys, NULL,
--                           &kernel_entry, &kernel_low,
--                           &kernel_high, NULL, 0,
--                           EM_LOONGARCH, 1, 0);
--
--    if (kernel_size < 0) {
--        error_report("could not load kernel '%s': %s",
--                     loaderparams->kernel_filename,
--                     load_elf_strerror(kernel_size));
--        exit(1);
--    }
--    return kernel_entry;
--}
--
- static DeviceState *create_acpi_ged(DeviceState *pch_pic, LoongArchMachineState *lams)
- {
-     DeviceState *dev;
-@@ -XXX,XX +XXX,XX @@ static void loongarch_firmware_init(LoongArchMachineState *lams)
-     }
- }
--static void reset_load_elf(void *opaque)
--{
--    LoongArchCPU *cpu = opaque;
--    CPULoongArchState *env = &cpu->env;
--
--    cpu_reset(CPU(cpu));
--    if (env->load_elf) {
--        cpu_set_pc(CPU(cpu), env->elf_address);
--    }
--}
--
--static void fw_cfg_add_kernel_info(const struct loaderparams *loaderparams,
--                                   FWCfgState *fw_cfg)
--{
--    /*
--     * Expose the kernel, the command line, and the initrd in fw_cfg.
--     * We don't process them here at all, it's all left to the
--     * firmware.
--     */
--    load_image_to_fw_cfg(fw_cfg,
--                         FW_CFG_KERNEL_SIZE, FW_CFG_KERNEL_DATA,
--                         loaderparams->kernel_filename,
--                         false);
--
--    if (loaderparams->initrd_filename) {
--        load_image_to_fw_cfg(fw_cfg,
--                             FW_CFG_INITRD_SIZE, FW_CFG_INITRD_DATA,
--                             loaderparams->initrd_filename, false);
--    }
--
--    if (loaderparams->kernel_cmdline) {
--        fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE,
--                       strlen(loaderparams->kernel_cmdline) + 1);
--        fw_cfg_add_string(fw_cfg, FW_CFG_CMDLINE_DATA,
--                          loaderparams->kernel_cmdline);
--    }
--}
--
--static void loongarch_firmware_boot(LoongArchMachineState *lams,
--                                    const struct loaderparams *loaderparams)
--{
--    fw_cfg_add_kernel_info(loaderparams, lams->fw_cfg);
--}
--
--static void loongarch_direct_kernel_boot(LoongArchMachineState *lams,
--                                         const struct loaderparams *loaderparams)
--{
--    MachineState *machine = MACHINE(lams);
--    int64_t kernel_addr = 0;
--    LoongArchCPU *lacpu;
--    int i;
--
--    kernel_addr = load_kernel_info(loaderparams);
--    if (!machine->firmware) {
--        for (i = 0; i < machine->smp.cpus; i++) {
--            lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
--            lacpu->env.load_elf = true;
--            lacpu->env.elf_address = kernel_addr;
--        }
--    }
--}
- static void loongarch_qemu_write(void *opaque, hwaddr addr,
-                                  uint64_t val, unsigned size)
-@@ -XXX,XX +XXX,XX @@ static void loongarch_init(MachineState *machine)
-     MachineClass *mc = MACHINE_GET_CLASS(machine);
-     CPUState *cpu;
-     char *ramName = NULL;
--    struct loaderparams loaderparams = { };
-     if (!cpu_model) {
-         cpu_model = LOONGARCH_CPU_TYPE_NAME("la464");
-@@ -XXX,XX +XXX,XX @@ static void loongarch_init(MachineState *machine)
-                         sizeof(struct memmap_entry) * (memmap_entries));
-     }
-     fdt_add_fw_cfg_node(lams);
--    loaderparams.ram_size = ram_size;
--    loaderparams.kernel_filename = machine->kernel_filename;
--    loaderparams.kernel_cmdline = machine->kernel_cmdline;
--    loaderparams.initrd_filename = machine->initrd_filename;
--    /* load the kernel. */
--    if (loaderparams.kernel_filename) {
--        if (lams->bios_loaded) {
--            loongarch_firmware_boot(lams, &loaderparams);
--        } else {
--            loongarch_direct_kernel_boot(lams, &loaderparams);
--        }
--    }
-     fdt_add_flash_node(lams);
--    /* register reset function */
--    for (i = 0; i < machine->smp.cpus; i++) {
--        lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
--        qemu_register_reset(reset_load_elf, lacpu);
--    }
-+
-     /* Initialize the IO interrupt subsystem */
-     loongarch_irq_init(lams);
-     fdt_add_irqchip_node(lams);
-@@ -XXX,XX +XXX,XX @@ static void loongarch_init(MachineState *machine)
-      */
-     fdt_base = 1 * MiB;
-     qemu_fdt_dumpdtb(machine->fdt, lams->fdt_size);
--    rom_add_blob_fixed("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));
-+
-+    lams->bootinfo.ram_size = ram_size;
-+    loongarch_load_kernel(machine, &lams->bootinfo);
- }
- bool loongarch_is_acpi_enabled(LoongArchMachineState *lams)
-diff --git a/include/hw/loongarch/boot.h b/include/hw/loongarch/boot.h
-new file mode 100644
-index XXXXXXX..XXXXXXX
---- /dev/null
-+++ b/include/hw/loongarch/boot.h
-@@ -XXX,XX +XXX,XX @@
-+/* SPDX-License-Identifier: GPL-2.0-or-later */
-+/*
-+ * Definitions for LoongArch boot.
-+ *
-+ * Copyright (C) 2023 Loongson Technology Corporation Limited
-+ */
-+
-+#ifndef HW_LOONGARCH_BOOT_H
-+#define HW_LOONGARCH_BOOT_H
-+
-+struct loongarch_boot_info {
-+    uint64_t ram_size;
-+    const char *kernel_filename;
-+    const char *kernel_cmdline;
-+    const char *initrd_filename;
-+    uint64_t a0, a1, a2;
-+};
-+
-+void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info);
-+
-+#endif /* HW_LOONGARCH_BOOT_H */
-diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/hw/loongarch/virt.h
-+++ b/include/hw/loongarch/virt.h
-@@ -XXX,XX +XXX,XX @@
- #include "qemu/queue.h"
- #include "hw/intc/loongarch_ipi.h"
- #include "hw/block/flash.h"
-+#include "hw/loongarch/boot.h"
- #define LOONGARCH_MAX_CPUS      256
-@@ -XXX,XX +XXX,XX @@ struct LoongArchMachineState {
-     MemoryRegion system_iocsr;
-     MemoryRegion iocsr_mem;
-     AddressSpace as_iocsr;
-+    struct loongarch_boot_info bootinfo;
- };
- #define TYPE_LOONGARCH_MACHINE  MACHINE_TYPE_NAME("virt")
---
-.34.1

-[PULL 09/17] hw/loongarch: Fix fdt memory node wrong 'reg'
+[PULL v2 1/6] target/loongarch: Fix vldi inst
-The right fdt memory node like [1], not [2]
+From: Guo Hongyu <guohongyu24@mails.ucas.ac.cn>
-  [1]
+Refer to the link below for a description of the vldi instructions:
-        memory@0 {
+https://jia.je/unofficial-loongarch-intrinsics-guide/lsx/misc/#synopsis_88
-                device_type = "memory";
+Fixed errors in vldi instruction implementation.
                 reg = <0x00 0x00 0x00 0x10000000>;
         };
   [2]
         memory@0 {
                 device_type = "memory";
                 reg = <0x02 0x00 0x02 0x10000000>;
         };
+Signed-off-by: Guo Hongyu <guohongyu24@mails.ucas.ac.cn>
+Tested-by: Xianglai Li <lixianglai@loongson.cn>
+Signed-off-by: Xianglai Li <lixianglai@loongson.cn>
 Reviewed-by: Bibo Mao <maobibo@loongson.cn>
-Signed-off-by: Song Gao <gaosong@loongson.cn>
+Signed-off-by: Bibo Mao <maobibo@loongson.cn>
 Message-Id: <20240301093839.663947-10-gaosong@loongson.cn>
 ---
- hw/loongarch/virt.c | 2 +-
+ target/loongarch/tcg/insn_trans/trans_vec.c.inc | 2 +-
 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
+diff --git a/target/loongarch/tcg/insn_trans/trans_vec.c.inc b/target/loongarch/tcg/insn_trans/trans_vec.c.inc
 index XXXXXXX..XXXXXXX 100644
---- a/hw/loongarch/virt.c
+--- a/target/loongarch/tcg/insn_trans/trans_vec.c.inc
-+++ b/hw/loongarch/virt.c
++++ b/target/loongarch/tcg/insn_trans/trans_vec.c.inc
-@@ -XXX,XX +XXX,XX @@ static void fdt_add_memory_node(MachineState *ms,
+@@ -XXX,XX +XXX,XX @@ static uint64_t vldi_get_value(DisasContext *ctx, uint32_t imm)
-     char *nodename = g_strdup_printf("/memory@%" PRIx64, base);
+         break;
+     case 1:
-     qemu_fdt_add_subnode(ms->fdt, nodename);
+         /* data: {2{16'0, imm[7:0], 8'0}} */
--    qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 2, base, 2, size);
+-        data = (t << 24) | (t << 8);
-+    qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 0, base, 0, size);
++        data = (t << 40) | (t << 8);
-     qemu_fdt_setprop_string(ms->fdt, nodename, "device_type", "memory");
+         break;
+     case 2:
-     if (ms->numa_state && ms->numa_state->num_nodes) {
+         /* data: {2{8'0, imm[7:0], 16'0}} */
 --
-.34.1
+.43.5

-[PULL 14/17] hw/loongarch: fdt adds pcie irq_map node
+[PULL v2 2/6] target/loongarch: Use actual operand size with vbsrl check
-Signed-off-by: Song Gao <gaosong@loongson.cn>
+Hardcoded 32 bytes is used for vbsrl emulation check, there is
-Message-Id: <20240301093839.663947-15-gaosong@loongson.cn>
+problem when options lsx=on,lasx=off is used for vbsrl.v instruction
 in TCG mode. It injects LASX exception rather LSX exception.
 Here actual operand size is used.
 Cc: qemu-stable@nongnu.org
 Fixes: df97f338076 ("target/loongarch: Implement xvreplve xvinsve0 xvpickve")
 Signed-off-by: Bibo Mao <maobibo@loongson.cn>
 Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
 Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
 ---
- hw/loongarch/virt.c | 73 ++++++++++++++++++++++++++++++++++++++++++---
+ target/loongarch/tcg/insn_trans/trans_vec.c.inc | 2 +-
-file changed, 69 insertions(+), 4 deletions(-)
+file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
+diff --git a/target/loongarch/tcg/insn_trans/trans_vec.c.inc b/target/loongarch/tcg/insn_trans/trans_vec.c.inc
 index XXXXXXX..XXXXXXX 100644
---- a/hw/loongarch/virt.c
+--- a/target/loongarch/tcg/insn_trans/trans_vec.c.inc
-+++ b/hw/loongarch/virt.c
++++ b/target/loongarch/tcg/insn_trans/trans_vec.c.inc
-@@ -XXX,XX +XXX,XX @@ static void fdt_add_fw_cfg_node(const LoongArchMachineState *lams)
+@@ -XXX,XX +XXX,XX @@ static bool do_vbsrl_v(DisasContext *ctx, arg_vv_i *a, uint32_t oprsz)
      g_free(nodename);
  }
 -static void fdt_add_pcie_node(const LoongArchMachineState *lams)
 +static void fdt_add_pcie_irq_map_node(const LoongArchMachineState *lams,
 +                                      char *nodename,
 +                                      uint32_t *pch_pic_phandle)
 +{
 +    int pin, dev;
 +    uint32_t irq_map_stride = 0;
 +    uint32_t full_irq_map[GPEX_NUM_IRQS *GPEX_NUM_IRQS * 10] = {};
 +    uint32_t *irq_map = full_irq_map;
 +    const MachineState *ms = MACHINE(lams);
 +
 +    /* This code creates a standard swizzle of interrupts such that
 +     * each device's first interrupt is based on it's PCI_SLOT number.
 +     * (See pci_swizzle_map_irq_fn())
 +     *
 +     * We only need one entry per interrupt in the table (not one per
 +     * possible slot) seeing the interrupt-map-mask will allow the table
 +     * to wrap to any number of devices.
 +     */
 +
 +    for (dev = 0; dev < GPEX_NUM_IRQS; dev++) {
 +        int devfn = dev * 0x8;
 +
 +        for (pin = 0; pin  < GPEX_NUM_IRQS; pin++) {
 +            int irq_nr = 16 + ((pin + PCI_SLOT(devfn)) % GPEX_NUM_IRQS);
 +            int i = 0;
 +
 +            /* Fill PCI address cells */
 +            irq_map[i] = cpu_to_be32(devfn << 8);
 +            i += 3;
 +
 +            /* Fill PCI Interrupt cells */
 +            irq_map[i] = cpu_to_be32(pin + 1);
 +            i += 1;
 +
 +            /* Fill interrupt controller phandle and cells */
 +            irq_map[i++] = cpu_to_be32(*pch_pic_phandle);
 +            irq_map[i++] = cpu_to_be32(irq_nr);
 +
 +            if (!irq_map_stride) {
 +                irq_map_stride = i;
 +            }
 +            irq_map += irq_map_stride;
 +        }
 +    }
 +
 +
 +    qemu_fdt_setprop(ms->fdt, nodename, "interrupt-map", full_irq_map,
 +                     GPEX_NUM_IRQS * GPEX_NUM_IRQS *
 +                     irq_map_stride * sizeof(uint32_t));
 +    qemu_fdt_setprop_cells(ms->fdt, nodename, "interrupt-map-mask",
 +                     0x1800, 0, 0, 0x7);
 +}
 +
 +static void fdt_add_pcie_node(const LoongArchMachineState *lams,
 +                              uint32_t *pch_pic_phandle,
 +                              uint32_t *pch_msi_phandle)
  {
-     char *nodename;
+     int i, ofs;
-     hwaddr base_mmio = VIRT_PCI_MEM_BASE;
-@@ -XXX,XX +XXX,XX @@ static void fdt_add_pcie_node(const LoongArchMachineState *lams)
+-    if (!check_vec(ctx, 32)) {
-, base_pio, 2, size_pio,
++    if (!check_vec(ctx, oprsz)) {
-, FDT_PCI_RANGE_MMIO, 2, base_mmio,
+         return true;
 , base_mmio, 2, size_mmio);
 +    qemu_fdt_setprop_cells(ms->fdt, nodename, "msi-map",
 +                           0, *pch_msi_phandle, 0, 0x10000);
 +
 +    fdt_add_pcie_irq_map_node(lams, nodename, pch_pic_phandle);
 +
      g_free(nodename);
  }
@@ -XXX,XX +XXX,XX @@ static DeviceState *create_platform_bus(DeviceState *pch_pic)
      return dev;
  }
 -static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState *lams)
 +static void loongarch_devices_init(DeviceState *pch_pic,
 +                                   LoongArchMachineState *lams,
 +                                   uint32_t *pch_pic_phandle,
 +                                   uint32_t *pch_msi_phandle)
  {
      MachineClass *mc = MACHINE_GET_CLASS(lams);
      DeviceState *gpex_dev;
@@ -XXX,XX +XXX,XX @@ static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState *
          gpex_set_irq_num(GPEX_HOST(gpex_dev), i, 16 + i);
      }
-+    /* Add pcie node */
-+    fdt_add_pcie_node(lams, pch_pic_phandle, pch_msi_phandle);
-+
-     serial_mm_init(get_system_memory(), VIRT_UART_BASE, 0,
-                    qdev_get_gpio_in(pch_pic,
-                                     VIRT_UART_IRQ - VIRT_GSI_BASE),
-@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
-     /* Add PCH MSI node */
-     fdt_add_pch_msi_node(lams, &eiointc_phandle, &pch_msi_phandle);
--    loongarch_devices_init(pch_pic, lams);
-+    loongarch_devices_init(pch_pic, lams, &pch_pic_phandle, &pch_msi_phandle);
- }
- static void loongarch_firmware_init(LoongArchMachineState *lams)
-@@ -XXX,XX +XXX,XX @@ static void loongarch_init(MachineState *machine)
-     lams->powerdown_notifier.notify = virt_powerdown_req;
-     qemu_register_powerdown_notifier(&lams->powerdown_notifier);
--    fdt_add_pcie_node(lams);
-     /*
-      * Since lowmem region starts from 0 and Linux kernel legacy start address
-      * at 2 MiB, FDT base address is located at 1 MiB to avoid NULL pointer
 --
-.34.1
+.43.5

-[PULL 12/17] hw/loongarch: fdt adds pch_pic Controller
+[PULL v2 3/6] hw/loongarch/virt: Create fdt table on machine creation done notification
-fdt adds pch pic controller, we use 'loongson,pch-pic-1.0'
+The same with ACPI table, fdt table is created on machine done
 notification. Some objects like CPU objects can be created with cold-plug
 method with command such as -smp x, -device la464-loongarch-cpu, so all
 objects finish to create when machine is done.
-See:
+Signed-off-by: Bibo Mao <maobibo@loongson.cn>
-https://github.com/torvalds/linux/blob/v6.7/drivers/irqchip/irq-loongson-pch-pic.c
+Reviewed-by: Bibo Mao <maobibo@loongson.cn>
 https://lore.kernel.org/r/20200528152757.1028711-4-jiaxun.yang@flygoat.com
 Signed-off-by: Song Gao <gaosong@loongson.cn>
 Message-Id: <20240301093839.663947-13-gaosong@loongson.cn>
 ---
- hw/loongarch/virt.c        | 30 +++++++++++++++++++++++++++++-
+ hw/loongarch/virt.c | 103 ++++++++++++++++++++++++--------------------
- include/hw/pci-host/ls7a.h |  1 +
+file changed, 57 insertions(+), 46 deletions(-)
 files changed, 30 insertions(+), 1 deletion(-)
 diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/loongarch/virt.c
 +++ b/hw/loongarch/virt.c
-@@ -XXX,XX +XXX,XX @@ static void fdt_add_eiointc_node(LoongArchMachineState *lams,
+@@ -XXX,XX +XXX,XX @@ static void virt_build_smbios(LoongArchVirtMachineState *lvms)
-     g_free(nodename);
+     }
  }
-+static void fdt_add_pch_pic_node(LoongArchMachineState *lams,
++static void virt_fdt_setup(LoongArchVirtMachineState *lvms)
 +                                 uint32_t *eiointc_phandle,
 +                                 uint32_t *pch_pic_phandle)
 +{
-+    MachineState *ms = MACHINE(lams);
++    MachineState *machine = MACHINE(lvms);
-+    char *nodename;
++    uint32_t cpuintc_phandle, eiointc_phandle, pch_pic_phandle, pch_msi_phandle;
-+    hwaddr pch_pic_base = VIRT_PCH_REG_BASE;
++    int i;
-+    hwaddr pch_pic_size = VIRT_PCH_REG_SIZE;
++
-+
++    create_fdt(lvms);
-+    *pch_pic_phandle = qemu_fdt_alloc_phandle(ms->fdt);
++    fdt_add_cpu_nodes(lvms);
-+    nodename = g_strdup_printf("/platic@%" PRIx64, pch_pic_base);
++    fdt_add_memory_nodes(machine);
-+    qemu_fdt_add_subnode(ms->fdt, nodename);
++    fdt_add_fw_cfg_node(lvms);
-+    qemu_fdt_setprop_cell(ms->fdt,  nodename, "phandle", *pch_pic_phandle);
++    fdt_add_flash_node(lvms);
-+    qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
++
-+                            "loongson,pch-pic-1.0");
++    /* Add cpu interrupt-controller */
-+    qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 0,
++    fdt_add_cpuic_node(lvms, &cpuintc_phandle);
-+                           pch_pic_base, 0, pch_pic_size);
++    /* Add Extend I/O Interrupt Controller node */
-+    qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0);
++    fdt_add_eiointc_node(lvms, &cpuintc_phandle, &eiointc_phandle);
-+    qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 2);
++    /* Add PCH PIC node */
-+    qemu_fdt_setprop_cell(ms->fdt, nodename, "interrupt-parent",
++    fdt_add_pch_pic_node(lvms, &eiointc_phandle, &pch_pic_phandle);
-+                          *eiointc_phandle);
++    /* Add PCH MSI node */
-+    qemu_fdt_setprop_cell(ms->fdt, nodename, "loongson,pic-base-vec", 0);
++    fdt_add_pch_msi_node(lvms, &eiointc_phandle, &pch_msi_phandle);
-+    g_free(nodename);
++    /* Add pcie node */
 +    fdt_add_pcie_node(lvms, &pch_pic_phandle, &pch_msi_phandle);
 +
 +    /*
 +     * Create uart fdt node in reverse order so that they appear
 +     * in the finished device tree lowest address first
 +     */
 +    for (i = VIRT_UART_COUNT; i-- > 0;) {
 +        hwaddr base = VIRT_UART_BASE + i * VIRT_UART_SIZE;
 +        int irq = VIRT_UART_IRQ + i - VIRT_GSI_BASE;
 +        fdt_add_uart_node(lvms, &pch_pic_phandle, base, irq, i == 0);
 +    }
 +
 +    fdt_add_rtc_node(lvms, &pch_pic_phandle);
 +    fdt_add_ged_reset(lvms);
 +    platform_bus_add_all_fdt_nodes(machine->fdt, "/platic",
 +                                   VIRT_PLATFORM_BUS_BASEADDRESS,
 +                                   VIRT_PLATFORM_BUS_SIZE,
 +                                   VIRT_PLATFORM_BUS_IRQ);
 +
 +    /*
 +     * Since lowmem region starts from 0 and Linux kernel legacy start address
 +     * at 2 MiB, FDT base address is located at 1 MiB to avoid NULL pointer
 +     * access. FDT size limit with 1 MiB.
 +     * 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.
 +     */
 +    qemu_fdt_dumpdtb(machine->fdt, lvms->fdt_size);
 +    rom_add_blob_fixed_as("fdt", machine->fdt, lvms->fdt_size, FDT_BASE,
 +                          &address_space_memory);
 +    qemu_register_reset_nosnapshotload(qemu_fdt_randomize_seeds,
 +            rom_ptr_for_as(&address_space_memory, FDT_BASE, lvms->fdt_size));
 +}
 +
- static void fdt_add_flash_node(LoongArchMachineState *lams)
+ static void virt_done(Notifier *notifier, void *data)
  {
-     MachineState *ms = MACHINE(lams);
+     LoongArchVirtMachineState *lvms = container_of(notifier,
-@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
+                                       LoongArchVirtMachineState, machine_done);
      virt_build_smbios(lvms);
      loongarch_acpi_setup(lvms);
 +    virt_fdt_setup(lvms);
  }
  static void virt_powerdown_req(Notifier *notifier, void *opaque)
@@ -XXX,XX +XXX,XX @@ static DeviceState *create_platform_bus(DeviceState *pch_pic)
  }
  static void virt_devices_init(DeviceState *pch_pic,
 -                                   LoongArchVirtMachineState *lvms,
 -                                   uint32_t *pch_pic_phandle,
 -                                   uint32_t *pch_msi_phandle)
 +                                   LoongArchVirtMachineState *lvms)
  {
      MachineClass *mc = MACHINE_GET_CLASS(lvms);
      DeviceState *gpex_dev;
@@ -XXX,XX +XXX,XX @@ static void virt_devices_init(DeviceState *pch_pic,
          gpex_set_irq_num(GPEX_HOST(gpex_dev), i, 16 + i);
      }
 -    /* Add pcie node */
 -    fdt_add_pcie_node(lvms, pch_pic_phandle, pch_msi_phandle);
 -
      /*
       * Create uart fdt node in reverse order so that they appear
       * in the finished device tree lowest address first
@@ -XXX,XX +XXX,XX @@ static void virt_devices_init(DeviceState *pch_pic,
          serial_mm_init(get_system_memory(), base, 0,
                         qdev_get_gpio_in(pch_pic, irq),
 , serial_hd(i), DEVICE_LITTLE_ENDIAN);
 -        fdt_add_uart_node(lvms, pch_pic_phandle, base, irq, i == 0);
      }
      /* Network init */
@@ -XXX,XX +XXX,XX @@ static void virt_devices_init(DeviceState *pch_pic,
      sysbus_create_simple("ls7a_rtc", VIRT_RTC_REG_BASE,
                           qdev_get_gpio_in(pch_pic,
                           VIRT_RTC_IRQ - VIRT_GSI_BASE));
 -    fdt_add_rtc_node(lvms, pch_pic_phandle);
 -    fdt_add_ged_reset(lvms);
      /* acpi ged */
      lvms->acpi_ged = create_acpi_ged(pch_pic, lvms);
@@ -XXX,XX +XXX,XX @@ static void virt_irq_init(LoongArchVirtMachineState *lvms)
      CPULoongArchState *env;
      CPUState *cpu_state;
      int cpu, pin, i, start, num;
--    uint32_t cpuintc_phandle, eiointc_phandle;
+-    uint32_t cpuintc_phandle, eiointc_phandle, pch_pic_phandle, pch_msi_phandle;
 +    uint32_t cpuintc_phandle, eiointc_phandle, pch_pic_phandle;
      /*
-      * The connection of interrupts:
+      * Extended IRQ model.
-@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
+@@ -XXX,XX +XXX,XX @@ static void virt_irq_init(LoongArchVirtMachineState *lvms)
      memory_region_add_subregion(&lvms->system_iocsr, MAIL_SEND_ADDR,
                     sysbus_mmio_get_region(SYS_BUS_DEVICE(ipi), 1));
 -    /* Add cpu interrupt-controller */
 -    fdt_add_cpuic_node(lvms, &cpuintc_phandle);
 -
      for (cpu = 0; cpu < ms->smp.cpus; cpu++) {
          cpu_state = qemu_get_cpu(cpu);
          cpudev = DEVICE(cpu_state);
@@ -XXX,XX +XXX,XX @@ static void virt_irq_init(LoongArchVirtMachineState *lvms)
          }
      }
 -    /* Add Extend I/O Interrupt Controller node */
 -    fdt_add_eiointc_node(lvms, &cpuintc_phandle, &eiointc_phandle);
 -
      pch_pic = qdev_new(TYPE_LOONGARCH_PIC);
      num = VIRT_PCH_PIC_IRQ_NUM;
      qdev_prop_set_uint32(pch_pic, "pch_pic_irq_num", num);
@@ -XXX,XX +XXX,XX @@ static void virt_irq_init(LoongArchVirtMachineState *lvms)
          qdev_connect_gpio_out(DEVICE(d), i, qdev_get_gpio_in(extioi, i));
      }
-+    /* Add PCH PIC node */
+-    /* Add PCH PIC node */
-+    fdt_add_pch_pic_node(lams, &eiointc_phandle, &pch_pic_phandle);
+-    fdt_add_pch_pic_node(lvms, &eiointc_phandle, &pch_pic_phandle);
-+
+-
      pch_msi = qdev_new(TYPE_LOONGARCH_PCH_MSI);
      start   =  num;
      num = EXTIOI_IRQS - start;
-diff --git a/include/hw/pci-host/ls7a.h b/include/hw/pci-host/ls7a.h
+@@ -XXX,XX +XXX,XX @@ static void virt_irq_init(LoongArchVirtMachineState *lvms)
-index XXXXXXX..XXXXXXX 100644
+                               qdev_get_gpio_in(extioi, i + start));
---- a/include/hw/pci-host/ls7a.h
+     }
-+++ b/include/hw/pci-host/ls7a.h
-@@ -XXX,XX +XXX,XX @@
+-    /* Add PCH MSI node */
- #define VIRT_PCH_REG_BASE        0x10000000UL
+-    fdt_add_pch_msi_node(lvms, &eiointc_phandle, &pch_msi_phandle);
- #define VIRT_IOAPIC_REG_BASE     (VIRT_PCH_REG_BASE)
+-
- #define VIRT_PCH_MSI_ADDR_LOW    0x2FF00000UL
+-    virt_devices_init(pch_pic, lvms, &pch_pic_phandle, &pch_msi_phandle);
-+#define VIRT_PCH_REG_SIZE        0x400
++    virt_devices_init(pch_pic, lvms);
+ }
- /*
-  * GSI_BASE is hard-coded with 64 in linux kernel, else kernel fails to boot
+ static void virt_firmware_init(LoongArchVirtMachineState *lvms)
@@ -XXX,XX +XXX,XX @@ static void virt_init(MachineState *machine)
          cpu_model = LOONGARCH_CPU_TYPE_NAME("la464");
      }
 -    create_fdt(lvms);
 -
      /* Create IOCSR space */
      memory_region_init_io(&lvms->system_iocsr, OBJECT(machine), NULL,
                            machine, "iocsr", UINT64_MAX);
@@ -XXX,XX +XXX,XX @@ static void virt_init(MachineState *machine)
          lacpu = LOONGARCH_CPU(cpu);
          lacpu->phy_id = machine->possible_cpus->cpus[i].arch_id;
      }
 -    fdt_add_cpu_nodes(lvms);
 -    fdt_add_memory_nodes(machine);
      fw_cfg_add_memory(machine);
      /* Node0 memory */
@@ -XXX,XX +XXX,XX @@ static void virt_init(MachineState *machine)
                          memmap_table,
                          sizeof(struct memmap_entry) * (memmap_entries));
      }
 -    fdt_add_fw_cfg_node(lvms);
 -    fdt_add_flash_node(lvms);
      /* Initialize the IO interrupt subsystem */
      virt_irq_init(lvms);
 -    platform_bus_add_all_fdt_nodes(machine->fdt, "/platic",
 -                                   VIRT_PLATFORM_BUS_BASEADDRESS,
 -                                   VIRT_PLATFORM_BUS_SIZE,
 -                                   VIRT_PLATFORM_BUS_IRQ);
      lvms->machine_done.notify = virt_done;
      qemu_add_machine_init_done_notifier(&lvms->machine_done);
       /* connect powerdown request */
      lvms->powerdown_notifier.notify = virt_powerdown_req;
      qemu_register_powerdown_notifier(&lvms->powerdown_notifier);
 -    /*
 -     * Since lowmem region starts from 0 and Linux kernel legacy start address
 -     * at 2 MiB, FDT base address is located at 1 MiB to avoid NULL pointer
 -     * access. FDT size limit with 1 MiB.
 -     * 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.
 -     */
 -    qemu_fdt_dumpdtb(machine->fdt, lvms->fdt_size);
 -    rom_add_blob_fixed_as("fdt", machine->fdt, lvms->fdt_size, FDT_BASE,
 -                          &address_space_memory);
 -    qemu_register_reset_nosnapshotload(qemu_fdt_randomize_seeds,
 -            rom_ptr_for_as(&address_space_memory, FDT_BASE, lvms->fdt_size));
 -
      lvms->bootinfo.ram_size = ram_size;
      loongarch_load_kernel(machine, &lvms->bootinfo);
  }
 --
-.34.1
+.43.5

-[PULL 15/17] hw/loongarch: fdt remove unused irqchip node
+[PULL v2 4/6] hw/loongarch/virt: Improve fdt table creation for CPU object
-Signed-off-by: Song Gao <gaosong@loongson.cn>
+For CPU object, possible_cpu_arch_ids() function is used rather than
-Message-Id: <20240301093839.663947-16-gaosong@loongson.cn>
+smp.cpus. With command -smp x, -device la464-loongarch-cpu, smp.cpus
 is not accurate for all possible CPU objects, possible_cpu_arch_ids()
 is used here.
 Signed-off-by: Bibo Mao <maobibo@loongson.cn>
 Reviewed-by: Bibo Mao <maobibo@loongson.cn>
 ---
- hw/loongarch/virt.c | 31 +------------------------------
+ hw/loongarch/virt.c | 39 +++++++++++++++++++++++++--------------
-file changed, 1 insertion(+), 30 deletions(-)
+file changed, 25 insertions(+), 14 deletions(-)
 diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/loongarch/virt.c
 +++ b/hw/loongarch/virt.c
-@@ -XXX,XX +XXX,XX @@ static void fdt_add_pcie_node(const LoongArchMachineState *lams,
+@@ -XXX,XX +XXX,XX @@ static void create_fdt(LoongArchVirtMachineState *lvms)
-     g_free(nodename);
+ static void fdt_add_cpu_nodes(const LoongArchVirtMachineState *lvms)
  {
      int num;
 -    const MachineState *ms = MACHINE(lvms);
 -    int smp_cpus = ms->smp.cpus;
 +    MachineState *ms = MACHINE(lvms);
 +    MachineClass *mc = MACHINE_GET_CLASS(ms);
 +    const CPUArchIdList *possible_cpus;
 +    LoongArchCPU *cpu;
 +    CPUState *cs;
 +    char *nodename, *map_path;
      qemu_fdt_add_subnode(ms->fdt, "/cpus");
      qemu_fdt_setprop_cell(ms->fdt, "/cpus", "#address-cells", 0x1);
      qemu_fdt_setprop_cell(ms->fdt, "/cpus", "#size-cells", 0x0);
      /* cpu nodes */
 -    for (num = smp_cpus - 1; num >= 0; num--) {
 -        char *nodename = g_strdup_printf("/cpus/cpu@%d", num);
 -        LoongArchCPU *cpu = LOONGARCH_CPU(qemu_get_cpu(num));
 -        CPUState *cs = CPU(cpu);
 +    possible_cpus = mc->possible_cpu_arch_ids(ms);
 +    for (num = 0; num < possible_cpus->len; num++) {
 +        cs = possible_cpus->cpus[num].cpu;
 +        if (cs == NULL) {
 +            continue;
 +        }
 +
 +        nodename = g_strdup_printf("/cpus/cpu@%d", num);
 +        cpu = LOONGARCH_CPU(cs);
          qemu_fdt_add_subnode(ms->fdt, nodename);
          qemu_fdt_setprop_string(ms->fdt, nodename, "device_type", "cpu");
          qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
                                  cpu->dtb_compatible);
 -        if (ms->possible_cpus->cpus[cs->cpu_index].props.has_node_id) {
 +        if (possible_cpus->cpus[num].props.has_node_id) {
              qemu_fdt_setprop_cell(ms->fdt, nodename, "numa-node-id",
 -                ms->possible_cpus->cpus[cs->cpu_index].props.node_id);
 +                possible_cpus->cpus[num].props.node_id);
          }
          qemu_fdt_setprop_cell(ms->fdt, nodename, "reg", num);
          qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle",
@@ -XXX,XX +XXX,XX @@ static void fdt_add_cpu_nodes(const LoongArchVirtMachineState *lvms)
      /*cpu map */
      qemu_fdt_add_subnode(ms->fdt, "/cpus/cpu-map");
 +    for (num = 0; num < possible_cpus->len; num++) {
 +        cs = possible_cpus->cpus[num].cpu;
 +        if (cs == NULL) {
 +            continue;
 +        }
 -    for (num = smp_cpus - 1; num >= 0; num--) {
 -        char *cpu_path = g_strdup_printf("/cpus/cpu@%d", num);
 -        char *map_path;
 -
 +        nodename = g_strdup_printf("/cpus/cpu@%d", num);
          if (ms->smp.threads > 1) {
              map_path = g_strdup_printf(
                  "/cpus/cpu-map/socket%d/core%d/thread%d",
@@ -XXX,XX +XXX,XX @@ static void fdt_add_cpu_nodes(const LoongArchVirtMachineState *lvms)
                  num % ms->smp.cores);
          }
          qemu_fdt_add_path(ms->fdt, map_path);
 -        qemu_fdt_setprop_phandle(ms->fdt, map_path, "cpu", cpu_path);
 +        qemu_fdt_setprop_phandle(ms->fdt, map_path, "cpu", nodename);
          g_free(map_path);
 -        g_free(cpu_path);
 +        g_free(nodename);
      }
  }
--static void fdt_add_irqchip_node(LoongArchMachineState *lams)
--{
--    MachineState *ms = MACHINE(lams);
--    char *nodename;
--    uint32_t irqchip_phandle;
--
--    irqchip_phandle = qemu_fdt_alloc_phandle(ms->fdt);
--    qemu_fdt_setprop_cell(ms->fdt, "/", "interrupt-parent", irqchip_phandle);
--
--    nodename = g_strdup_printf("/intc@%lx", VIRT_IOAPIC_REG_BASE);
--    qemu_fdt_add_subnode(ms->fdt, nodename);
--    qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 3);
--    qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0);
--    qemu_fdt_setprop_cell(ms->fdt, nodename, "#address-cells", 0x2);
--    qemu_fdt_setprop_cell(ms->fdt, nodename, "#size-cells", 0x2);
--    qemu_fdt_setprop(ms->fdt, nodename, "ranges", NULL, 0);
--
--    qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
--                            "loongarch,ls7a");
--
--    qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg",
--                                 2, VIRT_IOAPIC_REG_BASE,
--                                 2, PCH_PIC_ROUTE_ENTRY_OFFSET);
--
--    qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", irqchip_phandle);
--    g_free(nodename);
--}
--
- static void fdt_add_memory_node(MachineState *ms,
-                                 uint64_t base, uint64_t size, int node_id)
- {
-@@ -XXX,XX +XXX,XX @@ static void loongarch_init(MachineState *machine)
-     /* Initialize the IO interrupt subsystem */
-     loongarch_irq_init(lams);
--    fdt_add_irqchip_node(lams);
--    platform_bus_add_all_fdt_nodes(machine->fdt, "/intc",
-+    platform_bus_add_all_fdt_nodes(machine->fdt, "/platic",
-                                    VIRT_PLATFORM_BUS_BASEADDRESS,
-                                    VIRT_PLATFORM_BUS_SIZE,
-                                    VIRT_PLATFORM_BUS_IRQ);
 --
-.34.1
+.43.5

-[PULL 02/17] hw/loongarch: Add load initrd
+[PULL v2 5/6] target/loongarch: Use auto method with LSX feature
-we load initrd ramdisk after kernel_high address
+Like LBT feature, add type OnOffAuto for LSX feature setting. Also
 add LSX feature detection with new VM ioctl command, fallback to old
 method if it is not supported.
-Signed-off-by: Song Gao <gaosong@loongson.cn>
+Signed-off-by: Bibo Mao <maobibo@loongson.cn>
-Message-Id: <20240301093839.663947-3-gaosong@loongson.cn>
+Reviewed-by: Bibo Mao <maobibo@loongson.cn>
 ---
- hw/loongarch/boot.c | 29 ++++++++++++++++++++++++++++-
+ target/loongarch/cpu.c     | 38 +++++++++++++++------------
-file changed, 28 insertions(+), 1 deletion(-)
+ target/loongarch/cpu.h     |  2 ++
  target/loongarch/kvm/kvm.c | 54 ++++++++++++++++++++++++++++++++++++++
 files changed, 77 insertions(+), 17 deletions(-)
-diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
+diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
 index XXXXXXX..XXXXXXX 100644
---- a/hw/loongarch/boot.c
+--- a/target/loongarch/cpu.c
-+++ b/hw/loongarch/boot.c
++++ b/target/loongarch/cpu.c
-@@ -XXX,XX +XXX,XX @@ static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
+@@ -XXX,XX +XXX,XX @@ static void loongarch_la464_initfn(Object *obj)
+ {
- static int64_t load_kernel_info(struct loongarch_boot_info *info)
+     LoongArchCPU *cpu = LOONGARCH_CPU(obj);
- {
+     CPULoongArchState *env = &cpu->env;
--    uint64_t kernel_entry, kernel_low, kernel_high;
++    uint32_t data = 0;
-+    uint64_t kernel_entry, kernel_low, kernel_high, initrd_size;
+     int i;
-+    ram_addr_t initrd_offset;
-     ssize_t kernel_size;
+     for (i = 0; i < 21; i++) {
+@@ -XXX,XX +XXX,XX @@ static void loongarch_la464_initfn(Object *obj)
-     kernel_size = load_elf(info->kernel_filename, NULL,
+     cpu->dtb_compatible = "loongarch,Loongson-3A5000";
-@@ -XXX,XX +XXX,XX @@ static int64_t load_kernel_info(struct loongarch_boot_info *info)
+     env->cpucfg[0] = 0x14c010;  /* PRID */
-                      load_elf_strerror(kernel_size));
-         exit(1);
+-    uint32_t data = 0;
      data = FIELD_DP32(data, CPUCFG1, ARCH, 2);
      data = FIELD_DP32(data, CPUCFG1, PGMMU, 1);
      data = FIELD_DP32(data, CPUCFG1, IOCSR, 1);
@@ -XXX,XX +XXX,XX @@ static void loongarch_la132_initfn(Object *obj)
  {
      LoongArchCPU *cpu = LOONGARCH_CPU(obj);
      CPULoongArchState *env = &cpu->env;
 -
 +    uint32_t data = 0;
      int i;
      for (i = 0; i < 21; i++) {
@@ -XXX,XX +XXX,XX @@ static void loongarch_la132_initfn(Object *obj)
      cpu->dtb_compatible = "loongarch,Loongson-1C103";
      env->cpucfg[0] = 0x148042;  /* PRID */
 -    uint32_t data = 0;
      data = FIELD_DP32(data, CPUCFG1, ARCH, 1); /* LA32 */
      data = FIELD_DP32(data, CPUCFG1, PGMMU, 1);
      data = FIELD_DP32(data, CPUCFG1, IOCSR, 1);
@@ -XXX,XX +XXX,XX @@ static void loongarch_cpu_realizefn(DeviceState *dev, Error **errp)
  static bool loongarch_get_lsx(Object *obj, Error **errp)
  {
 -    LoongArchCPU *cpu = LOONGARCH_CPU(obj);
 -    bool ret;
 -
 -    if (FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LSX)) {
 -        ret = true;
 -    } else {
 -        ret = false;
 -    }
 -    return ret;
 +    return LOONGARCH_CPU(obj)->lsx != ON_OFF_AUTO_OFF;
  }
  static void loongarch_set_lsx(Object *obj, bool value, Error **errp)
  {
      LoongArchCPU *cpu = LOONGARCH_CPU(obj);
 +    uint32_t val;
 -    if (value) {
 -        cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LSX, 1);
 -    } else {
 -        cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LSX, 0);
 -        cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LASX, 0);
 +    cpu->lsx = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
 +    if (kvm_enabled()) {
 +        /* kvm feature detection in function kvm_arch_init_vcpu */
 +        return;
      }
 +
-+    if (info->initrd_filename) {
++    /* LSX feature detection in TCG mode */
-+        initrd_size = get_image_size(info->initrd_filename);
++    val = cpu->env.cpucfg[2];
-+        if (initrd_size > 0) {
++    if (cpu->lsx == ON_OFF_AUTO_ON) {
-+            initrd_offset = ROUND_UP(kernel_high + 4 * kernel_size, 64 * KiB);
++        if (FIELD_EX32(val, CPUCFG2, LSX) == 0) {
-+
++            error_setg(errp, "Failed to enable LSX in TCG mode");
-+            if (initrd_offset + initrd_size > info->ram_size) {
++            return;
-+                error_report("memory too small for initial ram disk '%s'",
++        }
-+                             info->initrd_filename);
++    }
-+                exit(1);
++
 +    cpu->env.cpucfg[2] = FIELD_DP32(val, CPUCFG2, LSX, value);
  }
  static bool loongarch_get_lasx(Object *obj, Error **errp)
@@ -XXX,XX +XXX,XX @@ void loongarch_cpu_post_init(Object *obj)
  {
      LoongArchCPU *cpu = LOONGARCH_CPU(obj);
 +    cpu->lsx = ON_OFF_AUTO_AUTO;
      object_property_add_bool(obj, "lsx", loongarch_get_lsx,
                               loongarch_set_lsx);
      object_property_add_bool(obj, "lasx", loongarch_get_lasx,
@@ -XXX,XX +XXX,XX @@ void loongarch_cpu_post_init(Object *obj)
      } else {
          cpu->lbt = ON_OFF_AUTO_OFF;
 +        cpu->pmu = ON_OFF_AUTO_OFF;
      }
  }
 diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
 index XXXXXXX..XXXXXXX 100644
 --- a/target/loongarch/cpu.h
 +++ b/target/loongarch/cpu.h
@@ -XXX,XX +XXX,XX @@ typedef struct LoongArchTLB LoongArchTLB;
  #endif
  enum loongarch_features {
 +    LOONGARCH_FEATURE_LSX,
      LOONGARCH_FEATURE_LBT, /* loongson binary translation extension */
      LOONGARCH_FEATURE_PMU,
  };
@@ -XXX,XX +XXX,XX @@ struct ArchCPU {
      uint32_t  phy_id;
      OnOffAuto lbt;
      OnOffAuto pmu;
 +    OnOffAuto lsx;
      /* 'compatible' string for this CPU for Linux device trees */
      const char *dtb_compatible;
 diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
 index XXXXXXX..XXXXXXX 100644
 --- a/target/loongarch/kvm/kvm.c
 +++ b/target/loongarch/kvm/kvm.c
@@ -XXX,XX +XXX,XX @@ static bool kvm_feature_supported(CPUState *cs, enum loongarch_features feature)
  {
      int ret;
      struct kvm_device_attr attr;
 +    uint64_t val;
      switch (feature) {
 +    case LOONGARCH_FEATURE_LSX:
 +        attr.group = KVM_LOONGARCH_VM_FEAT_CTRL;
 +        attr.attr = KVM_LOONGARCH_VM_FEAT_LSX;
 +        ret = kvm_vm_ioctl(kvm_state, KVM_HAS_DEVICE_ATTR, &attr);
 +        if (ret == 0) {
 +            return true;
 +        }
 +
 +        /* Fallback to old kernel detect interface */
 +        val = 0;
 +        attr.group = KVM_LOONGARCH_VCPU_CPUCFG;
 +        /* Cpucfg2 */
 +        attr.attr  = 2;
 +        attr.addr = (uint64_t)&val;
 +        ret = kvm_vcpu_ioctl(cs, KVM_HAS_DEVICE_ATTR, &attr);
 +        if (!ret) {
 +            ret = kvm_vcpu_ioctl(cs, KVM_GET_DEVICE_ATTR, &attr);
 +            if (ret) {
 +                return false;
 +            }
 +
-+            initrd_size = load_image_targphys(info->initrd_filename, initrd_offset,
++            ret = FIELD_EX32((uint32_t)val, CPUCFG2, LSX);
-+                                              info->ram_size - initrd_offset);
++            return (ret != 0);
 +        }
-+
++        return false;
-+        if (initrd_size == (target_ulong)-1) {
++
-+            error_report("could not load initial ram disk '%s'",
+     case LOONGARCH_FEATURE_LBT:
-+                         info->initrd_filename);
+         /*
-+            exit(1);
+          * Return all if all the LBT features are supported such as:
-+        }
+@@ -XXX,XX +XXX,XX @@ static bool kvm_feature_supported(CPUState *cs, enum loongarch_features feature)
-+    } else {
+     return false;
-+        error_report("Need initrd!");
+ }
-+        exit(1);
 +static int kvm_cpu_check_lsx(CPUState *cs, Error **errp)
 +{
 +    CPULoongArchState *env = cpu_env(cs);
 +    LoongArchCPU *cpu = LOONGARCH_CPU(cs);
 +    bool kvm_supported;
 +
 +    kvm_supported = kvm_feature_supported(cs, LOONGARCH_FEATURE_LSX);
 +    env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LSX, 0);
 +    if (cpu->lsx == ON_OFF_AUTO_ON) {
 +        if (kvm_supported) {
 +            env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LSX, 1);
 +        } else {
 +            error_setg(errp, "'lsx' feature not supported by KVM on this host");
 +            return -ENOTSUP;
 +        }
 +    } else if ((cpu->lsx == ON_OFF_AUTO_AUTO) && kvm_supported) {
 +        env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LSX, 1);
 +    }
 +
-     return kernel_entry;
++    return 0;
- }
++}
++
  static int kvm_cpu_check_lbt(CPUState *cs, Error **errp)
  {
      CPULoongArchState *env = cpu_env(cs);
@@ -XXX,XX +XXX,XX @@ int kvm_arch_init_vcpu(CPUState *cs)
          brk_insn = val;
      }
 +    ret = kvm_cpu_check_lsx(cs, &local_err);
 +    if (ret < 0) {
 +        error_report_err(local_err);
 +    }
 +
      ret = kvm_cpu_check_lbt(cs, &local_err);
      if (ret < 0) {
          error_report_err(local_err);
 --
-.34.1
+.43.5

-[PULL 03/17] hw/loongarch: Add slave cpu boot_code
+Deleted patch
-Signed-off-by: Song Gao <gaosong@loongson.cn>
-Message-Id: <20240301093839.663947-4-gaosong@loongson.cn>
----
- hw/loongarch/boot.c | 70 ++++++++++++++++++++++++++++++++++++++++++++-
-file changed, 69 insertions(+), 1 deletion(-)
-diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/loongarch/boot.c
-+++ b/hw/loongarch/boot.c
-@@ -XXX,XX +XXX,XX @@
- #include "qemu/error-report.h"
- #include "sysemu/reset.h"
-+static const unsigned int slave_boot_code[] = {
-+                  /* Configure reset ebase.         */
-+    0x0400302c,   /* csrwr      $r12,0xc            */
-+
-+                  /* Disable interrupt.             */
-+    0x0380100c,   /* ori        $r12,$r0,0x4        */
-+    0x04000180,   /* csrxchg    $r0,$r12,0x0        */
-+
-+                  /* Clear mailbox.                 */
-+    0x1400002d,   /* lu12i.w    $r13,1(0x1)         */
-+    0x038081ad,   /* ori        $r13,$r13,0x20      */
-+    0x06481da0,   /* iocsrwr.d  $r0,$r13            */
-+
-+                  /* Enable IPI interrupt.          */
-+    0x1400002c,   /* lu12i.w    $r12,1(0x1)         */
-+    0x0400118c,   /* csrxchg    $r12,$r12,0x4       */
-+    0x02fffc0c,   /* addi.d     $r12,$r0,-1(0xfff)  */
-+    0x1400002d,   /* lu12i.w    $r13,1(0x1)         */
-+    0x038011ad,   /* ori        $r13,$r13,0x4       */
-+    0x064819ac,   /* iocsrwr.w  $r12,$r13           */
-+    0x1400002d,   /* lu12i.w    $r13,1(0x1)         */
-+    0x038081ad,   /* ori        $r13,$r13,0x20      */
-+
-+                  /* Wait for wakeup  <.L11>:       */
-+    0x06488000,   /* idle       0x0                 */
-+    0x03400000,   /* andi       $r0,$r0,0x0         */
-+    0x064809ac,   /* iocsrrd.w  $r12,$r13           */
-+    0x43fff59f,   /* beqz       $r12,-12(0x7ffff4) # 48 <.L11> */
-+
-+                  /* Read and clear IPI interrupt.  */
-+    0x1400002d,   /* lu12i.w    $r13,1(0x1)         */
-+    0x064809ac,   /* iocsrrd.w  $r12,$r13           */
-+    0x1400002d,   /* lu12i.w    $r13,1(0x1)         */
-+    0x038031ad,   /* ori        $r13,$r13,0xc       */
-+    0x064819ac,   /* iocsrwr.w  $r12,$r13           */
-+
-+                  /* Disable  IPI interrupt.        */
-+    0x1400002c,   /* lu12i.w    $r12,1(0x1)         */
-+    0x04001180,   /* csrxchg    $r0,$r12,0x4        */
-+
-+                  /* Read mail buf and jump to specified entry */
-+    0x1400002d,   /* lu12i.w    $r13,1(0x1)         */
-+    0x038081ad,   /* ori        $r13,$r13,0x20      */
-+    0x06480dac,   /* iocsrrd.d  $r12,$r13           */
-+    0x00150181,   /* move       $r1,$r12            */
-+    0x4c000020,   /* jirl       $r0,$r1,0           */
-+};
-+
- static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
- {
-     return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
-@@ -XXX,XX +XXX,XX @@ static void loongarch_firmware_boot(LoongArchMachineState *lams,
-     fw_cfg_add_kernel_info(info, lams->fw_cfg);
- }
-+static void init_boot_rom(struct loongarch_boot_info *info, void *p)
-+{
-+    memcpy(p, &slave_boot_code, sizeof(slave_boot_code));
-+    p += sizeof(slave_boot_code);
-+}
-+
- static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info)
- {
-+    void  *p, *bp;
-     int64_t kernel_addr = 0;
-     LoongArchCPU *lacpu;
-     CPUState *cs;
-@@ -XXX,XX +XXX,XX @@ static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info)
-         exit(1);
-     }
-+    /* Load 'boot_rom' at [0 - 1MiB] */
-+    p = g_malloc0(1 * MiB);
-+    bp = p;
-+    init_boot_rom(info, p);
-+    rom_add_blob_fixed("boot_rom", bp, 1 * MiB, 0);
-+
-     CPU_FOREACH(cs) {
-         lacpu = LOONGARCH_CPU(cs);
-         lacpu->env.load_elf = true;
--        lacpu->env.elf_address = kernel_addr;
-+        if (cs == first_cpu) {
-+            lacpu->env.elf_address = kernel_addr;
-+        } else {
-+            lacpu->env.elf_address = 0;
-+        }
-+        lacpu->env.boot_info = info;
-     }
-+
-+    g_free(bp);
- }
- void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info)
---
-.34.1

-[PULL 04/17] hw/loongarch: Add init_cmdline
+Deleted patch
-Add init_cmline and set boot_info->a0, a1
-Signed-off-by: Song Gao <gaosong@loongson.cn>
-Message-Id: <20240301093839.663947-5-gaosong@loongson.cn>
----
- hw/loongarch/boot.c         | 19 +++++++++++++++++++
- include/hw/loongarch/virt.h |  2 ++
- target/loongarch/cpu.h      |  2 ++
-files changed, 23 insertions(+)
-diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/loongarch/boot.c
-+++ b/hw/loongarch/boot.c
-@@ -XXX,XX +XXX,XX @@ static const unsigned int slave_boot_code[] = {
-x4c000020,   /* jirl       $r0,$r1,0           */
- };
-+static void init_cmdline(struct loongarch_boot_info *info, void *p, void *start)
-+{
-+    hwaddr cmdline_addr = (hwaddr)p - (hwaddr)start;
-+
-+    info->a0 = 1;
-+    info->a1 = cmdline_addr;
-+
-+    memcpy(p, info->kernel_cmdline, COMMAND_LINE_SIZE);
-+}
-+
- static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
- {
-     return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
-@@ -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)) {
-+            env->gpr[4] = env->boot_info->a0;
-+            env->gpr[5] = env->boot_info->a1;
-+        }
-         cpu_set_pc(CPU(cpu), env->elf_address);
-     }
- }
-@@ -XXX,XX +XXX,XX @@ static void loongarch_firmware_boot(LoongArchMachineState *lams,
- static void init_boot_rom(struct loongarch_boot_info *info, void *p)
- {
-+    void *start = p;
-+
-     memcpy(p, &slave_boot_code, sizeof(slave_boot_code));
-     p += sizeof(slave_boot_code);
-+
-+    init_cmdline(info, p, start);
-+    p += COMMAND_LINE_SIZE;
- }
- static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info)
-diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/hw/loongarch/virt.h
-+++ b/include/hw/loongarch/virt.h
-@@ -XXX,XX +XXX,XX @@
- #define VIRT_GED_MEM_ADDR       (VIRT_GED_EVT_ADDR + ACPI_GED_EVT_SEL_LEN)
- #define VIRT_GED_REG_ADDR       (VIRT_GED_MEM_ADDR + MEMORY_HOTPLUG_IO_LEN)
-+#define COMMAND_LINE_SIZE       512
-+
- struct LoongArchMachineState {
-     /*< private >*/
-     MachineState parent_obj;
-diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
-index XXXXXXX..XXXXXXX 100644
---- a/target/loongarch/cpu.h
-+++ b/target/loongarch/cpu.h
-@@ -XXX,XX +XXX,XX @@ typedef struct CPUArchState {
-     uint32_t mp_state;
-     /* Store ipistate to access from this struct */
-     DeviceState *ipistate;
-+
-+    struct loongarch_boot_info *boot_info;
- #endif
- } CPULoongArchState;
---
-.34.1

-[PULL 05/17] hw/loongarch: Init efi_system_table
+Deleted patch
-Add init_systab and set boot_info->a2
-Signed-off-by: Song Gao <gaosong@loongson.cn>
-Message-Id: <20240301093839.663947-6-gaosong@loongson.cn>
----
- hw/loongarch/boot.c         | 22 +++++++++++++++++
- include/hw/loongarch/boot.h | 48 +++++++++++++++++++++++++++++++++++++
-files changed, 70 insertions(+)
-diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/loongarch/boot.c
-+++ b/hw/loongarch/boot.c
-@@ -XXX,XX +XXX,XX @@ static const unsigned int slave_boot_code[] = {
-x4c000020,   /* jirl       $r0,$r1,0           */
- };
-+static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
-+{
-+    struct efi_system_table *systab = p;
-+
-+    info->a2 = (uint64_t)p - (uint64_t)start;
-+
-+    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;
-+
-+    p += ROUND_UP(sizeof(struct efi_system_table), 64);
-+
-+    systab->tables = p;
-+}
-+
- static void init_cmdline(struct loongarch_boot_info *info, void *p, void *start)
- {
-     hwaddr cmdline_addr = (hwaddr)p - (hwaddr)start;
-@@ -XXX,XX +XXX,XX @@ 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);
-     }
-@@ -XXX,XX +XXX,XX @@ static void init_boot_rom(struct loongarch_boot_info *info, void *p)
-     init_cmdline(info, p, start);
-     p += COMMAND_LINE_SIZE;
-+
-+    init_systab(info, p, start);
- }
- static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info)
-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 @@
- #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
-+
-+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;
---
-.34.1

-[PULL 06/17] hw/loongarch: Init efi_boot_memmap table
+Deleted patch
-Signed-off-by: Song Gao <gaosong@loongson.cn>
-Message-Id: <20240301093839.663947-7-gaosong@loongson.cn>
----
- hw/loongarch/boot.c         | 39 +++++++++++++++++++++++++++++++++++++
- hw/loongarch/virt.c         | 11 ++---------
- include/hw/loongarch/boot.h | 27 +++++++++++++++++++++++++
- include/hw/loongarch/virt.h | 10 ++++++++++
-files changed, 78 insertions(+), 9 deletions(-)
-diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/loongarch/boot.c
-+++ b/hw/loongarch/boot.c
-@@ -XXX,XX +XXX,XX @@ static const unsigned int slave_boot_code[] = {
-x4c000020,   /* 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,
-+                                 void *p, void *start)
-+{
-+    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 = memmap_table[i].address;
-+        map[i].num_pages = memmap_table[i].length >> 16; /* 64KB align*/
-+        p += sizeof(efi_memory_desc_t);
-+    }
-+}
-+
- static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
- {
-+    void *bp_tables_start;
-     struct efi_system_table *systab = p;
-     info->a2 = (uint64_t)p - (uint64_t)start;
-@@ -XXX,XX +XXX,XX @@ static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
-     p += ROUND_UP(sizeof(struct efi_system_table), 64);
-     systab->tables = p;
-+    bp_tables_start = p;
-+
-+    init_efi_boot_memmap(systab, p, start);
-+    p += ROUND_UP(sizeof(struct efi_boot_memmap) +
-+                  sizeof(efi_memory_desc_t) * memmap_entries, 64);
-+
-+    systab->tables = (struct efi_configuration_table *)(bp_tables_start - start);
- }
- static void init_cmdline(struct loongarch_boot_info *info, void *p, void *start)
-diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/loongarch/virt.c
-+++ b/hw/loongarch/virt.c
-@@ -XXX,XX +XXX,XX @@ 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 XXXXXXX..XXXXXXX 100644
---- a/include/hw/loongarch/boot.h
-+++ b/include/hw/loongarch/boot.h
-@@ -XXX,XX +XXX,XX @@ 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;
-@@ -XXX,XX +XXX,XX @@ 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 XXXXXXX..XXXXXXX 100644
---- a/include/hw/loongarch/virt.h
-+++ b/include/hw/loongarch/virt.h
-@@ -XXX,XX +XXX,XX @@
- #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;
---
-.34.1

-[PULL 07/17] hw/loongarch: Init efi_initrd table
+Deleted patch
-Signed-off-by: Song Gao <gaosong@loongson.cn>
-Message-Id: <20240301093839.663947-8-gaosong@loongson.cn>
----
- hw/loongarch/boot.c         | 23 +++++++++++++++++++++--
- include/hw/loongarch/boot.h |  9 +++++++++
-files changed, 30 insertions(+), 2 deletions(-)
-diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/loongarch/boot.c
-+++ b/hw/loongarch/boot.c
-@@ -XXX,XX +XXX,XX @@
- #include "qemu/error-report.h"
- #include "sysemu/reset.h"
-+ram_addr_t initrd_offset;
-+uint64_t initrd_size;
-+
- static const unsigned int slave_boot_code[] = {
-                   /* Configure reset ebase.         */
-x0400302c,   /* csrwr      $r12,0xc            */
-@@ -XXX,XX +XXX,XX @@ static void init_efi_boot_memmap(struct efi_system_table *systab,
-     }
- }
-+static void init_efi_initrd_table(struct efi_system_table *systab,
-+                                  void *p, void *start)
-+{
-+    efi_guid_t tbl_guid = LINUX_EFI_INITRD_MEDIA_GUID;
-+    struct efi_initrd *initrd_table  = 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;
-+
-+    initrd_table->base = initrd_offset;
-+    initrd_table->size = initrd_size;
-+}
-+
- static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
- {
-     void *bp_tables_start;
-@@ -XXX,XX +XXX,XX @@ static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
-     init_efi_boot_memmap(systab, p, start);
-     p += ROUND_UP(sizeof(struct efi_boot_memmap) +
-                   sizeof(efi_memory_desc_t) * memmap_entries, 64);
-+    init_efi_initrd_table(systab, p, start);
-+    p += ROUND_UP(sizeof(struct efi_initrd), 64);
-     systab->tables = (struct efi_configuration_table *)(bp_tables_start - start);
- }
-@@ -XXX,XX +XXX,XX @@ static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
- static int64_t load_kernel_info(struct loongarch_boot_info *info)
- {
--    uint64_t kernel_entry, kernel_low, kernel_high, initrd_size;
--    ram_addr_t initrd_offset;
-+    uint64_t kernel_entry, kernel_low, kernel_high;
-     ssize_t kernel_size;
-     kernel_size = load_elf(info->kernel_filename, NULL,
-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(0x800f683f, 0xd08b, 0x423a,  0xa2, 0x93, \
-x96, 0x5c, 0x3c, 0x6f, 0xe2, 0xb4)
-+#define LINUX_EFI_INITRD_MEDIA_GUID \
-+        EFI_GUID(0x5568e427, 0x68fc, 0x4f3d,  0xac, 0x74, \
-+                 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68)
-+
- struct efi_config_table {
-     efi_guid_t guid;
-     uint64_t *ptr;
-@@ -XXX,XX +XXX,XX @@ struct efi_boot_memmap {
-     efi_memory_desc_t map[32];
- };
-+struct efi_initrd {
-+    uint64_t base;
-+    uint64_t size;
-+};
-+
- struct loongarch_boot_info {
-     uint64_t ram_size;
-     const char *kernel_filename;
---
-.34.1

-[PULL 08/17] hw/loongarch: Init efi_fdt table
+Deleted patch
-Signed-off-by: Song Gao <gaosong@loongson.cn>
-Message-Id: <20240301093839.663947-9-gaosong@loongson.cn>
----
- hw/loongarch/boot.c         | 11 +++++++++++
- include/hw/loongarch/boot.h |  4 ++++
-files changed, 15 insertions(+)
-diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/loongarch/boot.c
-+++ b/hw/loongarch/boot.c
-@@ -XXX,XX +XXX,XX @@ 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 *)0x100000; /* fdt_base 1MiB */
-+    systab->nr_tables = 3;
-+}
-+
- static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
- {
-     void *bp_tables_start;
-@@ -XXX,XX +XXX,XX @@ static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
-                   sizeof(efi_memory_desc_t) * memmap_entries, 64);
-     init_efi_initrd_table(systab, p, start);
-     p += ROUND_UP(sizeof(struct efi_initrd), 64);
-+    init_efi_fdt_table(systab);
-     systab->tables = (struct efi_configuration_table *)(bp_tables_start - start);
- }
-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(0x5568e427, 0x68fc, 0x4f3d,  0xac, 0x74, \
-xca, 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;
---
-.34.1

-[PULL 10/17] hw/loongarch: fdt adds cpu interrupt controller node
+Deleted patch
-fdt adds cpu interrupt controller node,
-we use 'loongson,cpu-interrupt-controller'.
-See:
-https://github.com/torvalds/linux/blob/v6.7/drivers/irqchip/irq-loongarch-cpu.c
-https://lore.kernel.org/r/20221114113824.1880-2-liupeibao@loongson.cn
-Signed-off-by: Song Gao <gaosong@loongson.cn>
-Message-Id: <20240301093839.663947-11-gaosong@loongson.cn>
----
- hw/loongarch/virt.c | 21 +++++++++++++++++++++
-file changed, 21 insertions(+)
-diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/loongarch/virt.c
-+++ b/hw/loongarch/virt.c
-@@ -XXX,XX +XXX,XX @@ static void virt_flash_map(LoongArchMachineState *lams,
-     virt_flash_map1(flash1, VIRT_FLASH1_BASE, VIRT_FLASH1_SIZE, sysmem);
- }
-+static void fdt_add_cpuic_node(LoongArchMachineState *lams,
-+                               uint32_t *cpuintc_phandle)
-+{
-+    MachineState *ms = MACHINE(lams);
-+    char *nodename;
-+
-+    *cpuintc_phandle = qemu_fdt_alloc_phandle(ms->fdt);
-+    nodename = g_strdup_printf("/cpuic");
-+    qemu_fdt_add_subnode(ms->fdt, nodename);
-+    qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", *cpuintc_phandle);
-+    qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
-+                            "loongson,cpu-interrupt-controller");
-+    qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0);
-+    qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 1);
-+    g_free(nodename);
-+}
-+
- static void fdt_add_flash_node(LoongArchMachineState *lams)
- {
-     MachineState *ms = MACHINE(lams);
-@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
-     CPULoongArchState *env;
-     CPUState *cpu_state;
-     int cpu, pin, i, start, num;
-+    uint32_t cpuintc_phandle;
-     /*
-      * The connection of interrupts:
-@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
-     memory_region_add_subregion(&lams->system_iocsr, MAIL_SEND_ADDR,
-                    sysbus_mmio_get_region(SYS_BUS_DEVICE(ipi), 1));
-+    /* Add cpu interrupt-controller */
-+    fdt_add_cpuic_node(lams, &cpuintc_phandle);
-+
-     for (cpu = 0; cpu < ms->smp.cpus; cpu++) {
-         cpu_state = qemu_get_cpu(cpu);
-         cpudev = DEVICE(cpu_state);
---
-.34.1

-[PULL 11/17] hw/loongarch: fdt adds Extend I/O Interrupt Controller
+Deleted patch
-fdt adds Extend I/O Interrupt Controller,
-we use 'loongson,ls2k2000-eiointc'.
-See:
-https://github.com/torvalds/linux/blob/v6.7/drivers/irqchip/irq-loongson-eiointc.c
-https://lore.kernel.org/r/764e02d924094580ac0f1d15535f4b98308705c6.1683279769.git.zhoubinbin@loongson.cn
-Signed-off-by: Song Gao <gaosong@loongson.cn>
-Message-Id: <20240301093839.663947-12-gaosong@loongson.cn>
----
- hw/loongarch/virt.c                | 30 +++++++++++++++++++++++++++++-
- include/hw/intc/loongarch_extioi.h |  1 +
-files changed, 30 insertions(+), 1 deletion(-)
-diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/loongarch/virt.c
-+++ b/hw/loongarch/virt.c
-@@ -XXX,XX +XXX,XX @@ static void fdt_add_cpuic_node(LoongArchMachineState *lams,
-     g_free(nodename);
- }
-+static void fdt_add_eiointc_node(LoongArchMachineState *lams,
-+                                  uint32_t *cpuintc_phandle,
-+                                  uint32_t *eiointc_phandle)
-+{
-+    MachineState *ms = MACHINE(lams);
-+    char *nodename;
-+    hwaddr extioi_base = APIC_BASE;
-+    hwaddr extioi_size = EXTIOI_SIZE;
-+
-+    *eiointc_phandle = qemu_fdt_alloc_phandle(ms->fdt);
-+    nodename = g_strdup_printf("/eiointc@%" PRIx64, extioi_base);
-+    qemu_fdt_add_subnode(ms->fdt, nodename);
-+    qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", *eiointc_phandle);
-+    qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
-+                            "loongson,ls2k2000-eiointc");
-+    qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0);
-+    qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 1);
-+    qemu_fdt_setprop_cell(ms->fdt, nodename, "interrupt-parent",
-+                          *cpuintc_phandle);
-+    qemu_fdt_setprop_cell(ms->fdt, nodename, "interrupts", 3);
-+    qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 0x0,
-+                           extioi_base, 0x0, extioi_size);
-+    g_free(nodename);
-+}
-+
- static void fdt_add_flash_node(LoongArchMachineState *lams)
- {
-     MachineState *ms = MACHINE(lams);
-@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
-     CPULoongArchState *env;
-     CPUState *cpu_state;
-     int cpu, pin, i, start, num;
--    uint32_t cpuintc_phandle;
-+    uint32_t cpuintc_phandle, eiointc_phandle;
-     /*
-      * The connection of interrupts:
-@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
-         }
-     }
-+    /* Add Extend I/O Interrupt Controller node */
-+    fdt_add_eiointc_node(lams, &cpuintc_phandle, &eiointc_phandle);
-+
-     pch_pic = qdev_new(TYPE_LOONGARCH_PCH_PIC);
-     num = VIRT_PCH_PIC_IRQ_NUM;
-     qdev_prop_set_uint32(pch_pic, "pch_pic_irq_num", num);
-diff --git a/include/hw/intc/loongarch_extioi.h b/include/hw/intc/loongarch_extioi.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/hw/intc/loongarch_extioi.h
-+++ b/include/hw/intc/loongarch_extioi.h
-@@ -XXX,XX +XXX,XX @@
- #define EXTIOI_COREISR_END           (0xB20 - APIC_OFFSET)
- #define EXTIOI_COREMAP_START         (0xC00 - APIC_OFFSET)
- #define EXTIOI_COREMAP_END           (0xD00 - APIC_OFFSET)
-+#define EXTIOI_SIZE                  0x800
- typedef struct ExtIOICore {
-     uint32_t coreisr[EXTIOI_IRQS_GROUP_COUNT];
---
-.34.1

-[PULL 13/17] hw/loongarch: fdt adds pch_msi Controller
+[PULL v2 6/6] target/loongarch: Use auto method with LASX feature
-fdt adds pch msi controller, we use 'loongson,pch-msi-1.0'.
+Like LSX feature, add type OnOffAuto for LASX feature setting.
-See:
+Signed-off-by: Bibo Mao <maobibo@loongson.cn>
-https://github.com/torvalds/linux/blob/v6.7/drivers/irqchip/irq-loongson-pch-msi.c
+Reviewed-by: Bibo Mao <maobibo@loongson.cn>
-https://lore.kernel.org/r/20200528152757.1028711-6-jiaxun.yang@flygoat.com
+---
  target/loongarch/cpu.c     | 50 +++++++++++++++++++++++------------
  target/loongarch/cpu.h     |  2 ++
  target/loongarch/kvm/kvm.c | 53 ++++++++++++++++++++++++++++++++++++++
 files changed, 89 insertions(+), 16 deletions(-)
-Signed-off-by: Song Gao <gaosong@loongson.cn>
+diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
 Message-Id: <20240301093839.663947-14-gaosong@loongson.cn>
 ---
  hw/loongarch/virt.c        | 33 ++++++++++++++++++++++++++++++++-
  include/hw/pci-host/ls7a.h |  1 +
 files changed, 33 insertions(+), 1 deletion(-)
 diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
 index XXXXXXX..XXXXXXX 100644
---- a/hw/loongarch/virt.c
+--- a/target/loongarch/cpu.c
-+++ b/hw/loongarch/virt.c
++++ b/target/loongarch/cpu.c
-@@ -XXX,XX +XXX,XX @@ static void fdt_add_pch_pic_node(LoongArchMachineState *lams,
+@@ -XXX,XX +XXX,XX @@ static void loongarch_set_lsx(Object *obj, bool value, Error **errp)
-     g_free(nodename);
+     uint32_t val;
      cpu->lsx = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
 +    if (cpu->lsx == ON_OFF_AUTO_OFF) {
 +        cpu->lasx = ON_OFF_AUTO_OFF;
 +        if (cpu->lasx == ON_OFF_AUTO_ON) {
 +            error_setg(errp, "Failed to disable LSX since LASX is enabled");
 +            return;
 +        }
 +    }
 +
      if (kvm_enabled()) {
          /* kvm feature detection in function kvm_arch_init_vcpu */
          return;
@@ -XXX,XX +XXX,XX @@ static void loongarch_set_lsx(Object *obj, bool value, Error **errp)
              error_setg(errp, "Failed to enable LSX in TCG mode");
              return;
          }
 +    } else {
 +        cpu->env.cpucfg[2] = FIELD_DP32(val, CPUCFG2, LASX, 0);
 +        val = cpu->env.cpucfg[2];
      }
      cpu->env.cpucfg[2] = FIELD_DP32(val, CPUCFG2, LSX, value);
@@ -XXX,XX +XXX,XX @@ static void loongarch_set_lsx(Object *obj, bool value, Error **errp)
  static bool loongarch_get_lasx(Object *obj, Error **errp)
  {
 -    LoongArchCPU *cpu = LOONGARCH_CPU(obj);
 -    bool ret;
 -
 -    if (FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LASX)) {
 -        ret = true;
 -    } else {
 -        ret = false;
 -    }
 -    return ret;
 +    return LOONGARCH_CPU(obj)->lasx != ON_OFF_AUTO_OFF;
  }
-+static void fdt_add_pch_msi_node(LoongArchMachineState *lams,
+ static void loongarch_set_lasx(Object *obj, bool value, Error **errp)
-+                                 uint32_t *eiointc_phandle,
+ {
-+                                 uint32_t *pch_msi_phandle)
+     LoongArchCPU *cpu = LOONGARCH_CPU(obj);
 +    uint32_t val;
 -    if (value) {
 -    if (!FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LSX)) {
 -            cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LSX, 1);
 -    }
 -        cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LASX, 1);
 -    } else {
 -        cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LASX, 0);
 +    cpu->lasx = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
 +    if ((cpu->lsx == ON_OFF_AUTO_OFF) && (cpu->lasx == ON_OFF_AUTO_ON)) {
 +        error_setg(errp, "Failed to enable LASX since lSX is disabled");
 +        return;
 +    }
 +
 +    if (kvm_enabled()) {
 +        /* kvm feature detection in function kvm_arch_init_vcpu */
 +        return;
      }
 +
 +    /* LASX feature detection in TCG mode */
 +    val = cpu->env.cpucfg[2];
 +    if (cpu->lasx == ON_OFF_AUTO_ON) {
 +        if (FIELD_EX32(val, CPUCFG2, LASX) == 0) {
 +            error_setg(errp, "Failed to enable LASX in TCG mode");
 +            return;
 +        }
 +    }
 +
 +    cpu->env.cpucfg[2] = FIELD_DP32(val, CPUCFG2, LASX, value);
  }
  static bool loongarch_get_lbt(Object *obj, Error **errp)
@@ -XXX,XX +XXX,XX @@ void loongarch_cpu_post_init(Object *obj)
      LoongArchCPU *cpu = LOONGARCH_CPU(obj);
      cpu->lsx = ON_OFF_AUTO_AUTO;
 +    cpu->lasx = ON_OFF_AUTO_AUTO;
      object_property_add_bool(obj, "lsx", loongarch_get_lsx,
                               loongarch_set_lsx);
      object_property_add_bool(obj, "lasx", loongarch_get_lasx,
 diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
 index XXXXXXX..XXXXXXX 100644
 --- a/target/loongarch/cpu.h
 +++ b/target/loongarch/cpu.h
@@ -XXX,XX +XXX,XX @@ typedef struct LoongArchTLB LoongArchTLB;
  enum loongarch_features {
      LOONGARCH_FEATURE_LSX,
 +    LOONGARCH_FEATURE_LASX,
      LOONGARCH_FEATURE_LBT, /* loongson binary translation extension */
      LOONGARCH_FEATURE_PMU,
  };
@@ -XXX,XX +XXX,XX @@ struct ArchCPU {
      OnOffAuto lbt;
      OnOffAuto pmu;
      OnOffAuto lsx;
 +    OnOffAuto lasx;
      /* 'compatible' string for this CPU for Linux device trees */
      const char *dtb_compatible;
 diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
 index XXXXXXX..XXXXXXX 100644
 --- a/target/loongarch/kvm/kvm.c
 +++ b/target/loongarch/kvm/kvm.c
@@ -XXX,XX +XXX,XX @@ static bool kvm_feature_supported(CPUState *cs, enum loongarch_features feature)
          }
          return false;
 +    case LOONGARCH_FEATURE_LASX:
 +        attr.group = KVM_LOONGARCH_VM_FEAT_CTRL;
 +        attr.attr = KVM_LOONGARCH_VM_FEAT_LASX;
 +        ret = kvm_vm_ioctl(kvm_state, KVM_HAS_DEVICE_ATTR, &attr);
 +        if (ret == 0) {
 +            return true;
 +        }
 +
 +        /* Fallback to old kernel detect interface */
 +        val = 0;
 +        attr.group = KVM_LOONGARCH_VCPU_CPUCFG;
 +        /* Cpucfg2 */
 +        attr.attr  = 2;
 +        attr.addr = (uint64_t)&val;
 +        ret = kvm_vcpu_ioctl(cs, KVM_HAS_DEVICE_ATTR, &attr);
 +        if (!ret) {
 +            ret = kvm_vcpu_ioctl(cs, KVM_GET_DEVICE_ATTR, &attr);
 +            if (ret) {
 +                return false;
 +            }
 +
 +            ret = FIELD_EX32((uint32_t)val, CPUCFG2, LASX);
 +            return (ret != 0);
 +        }
 +        return false;
 +
      case LOONGARCH_FEATURE_LBT:
          /*
           * Return all if all the LBT features are supported such as:
@@ -XXX,XX +XXX,XX @@ static int kvm_cpu_check_lsx(CPUState *cs, Error **errp)
      return 0;
  }
 +static int kvm_cpu_check_lasx(CPUState *cs, Error **errp)
 +{
-+    MachineState *ms = MACHINE(lams);
++    CPULoongArchState *env = cpu_env(cs);
-+    char *nodename;
++    LoongArchCPU *cpu = LOONGARCH_CPU(cs);
-+    hwaddr pch_msi_base = VIRT_PCH_MSI_ADDR_LOW;
++    bool kvm_supported;
 +    hwaddr pch_msi_size = VIRT_PCH_MSI_SIZE;
 +
-+    *pch_msi_phandle = qemu_fdt_alloc_phandle(ms->fdt);
++    kvm_supported = kvm_feature_supported(cs, LOONGARCH_FEATURE_LASX);
-+    nodename = g_strdup_printf("/msi@%" PRIx64, pch_msi_base);
++    env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LASX, 0);
-+    qemu_fdt_add_subnode(ms->fdt, nodename);
++    if (cpu->lasx == ON_OFF_AUTO_ON) {
-+    qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", *pch_msi_phandle);
++        if (kvm_supported) {
-+    qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
++            env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LASX, 1);
-+                            "loongson,pch-msi-1.0");
++        } else {
-+    qemu_fdt_setprop_cells(ms->fdt, nodename, "reg",
++            error_setg(errp, "'lasx' feature not supported by KVM on host");
-+                           0, pch_msi_base,
++            return -ENOTSUP;
-+                           0, pch_msi_size);
++        }
-+    qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0);
++    } else if ((cpu->lasx == ON_OFF_AUTO_AUTO) && kvm_supported) {
-+    qemu_fdt_setprop_cell(ms->fdt, nodename, "interrupt-parent",
++        env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LASX, 1);
-+                          *eiointc_phandle);
++    }
-+    qemu_fdt_setprop_cell(ms->fdt, nodename, "loongson,msi-base-vec",
++
-+                          VIRT_PCH_PIC_IRQ_NUM);
++    return 0;
 +    qemu_fdt_setprop_cell(ms->fdt, nodename, "loongson,msi-num-vecs",
 +                          EXTIOI_IRQS - VIRT_PCH_PIC_IRQ_NUM);
 +    g_free(nodename);
 +}
 +
- static void fdt_add_flash_node(LoongArchMachineState *lams)
+ static int kvm_cpu_check_lbt(CPUState *cs, Error **errp)
  {
-     MachineState *ms = MACHINE(lams);
+     CPULoongArchState *env = cpu_env(cs);
-@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
+@@ -XXX,XX +XXX,XX @@ int kvm_arch_init_vcpu(CPUState *cs)
-     CPULoongArchState *env;
+         error_report_err(local_err);
      CPUState *cpu_state;
      int cpu, pin, i, start, num;
 -    uint32_t cpuintc_phandle, eiointc_phandle, pch_pic_phandle;
 +    uint32_t cpuintc_phandle, eiointc_phandle, pch_pic_phandle, pch_msi_phandle;
      /*
       * The connection of interrupts:
@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
                                qdev_get_gpio_in(extioi, i + start));
      }
-+    /* Add PCH MSI node */
++    ret = kvm_cpu_check_lasx(cs, &local_err);
-+    fdt_add_pch_msi_node(lams, &eiointc_phandle, &pch_msi_phandle);
++    if (ret < 0) {
 +        error_report_err(local_err);
 +    }
 +
-     loongarch_devices_init(pch_pic, lams);
+     ret = kvm_cpu_check_lbt(cs, &local_err);
- }
+     if (ret < 0) {
+         error_report_err(local_err);
 diff --git a/include/hw/pci-host/ls7a.h b/include/hw/pci-host/ls7a.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/hw/pci-host/ls7a.h
 +++ b/include/hw/pci-host/ls7a.h
@@ -XXX,XX +XXX,XX @@
  #define VIRT_IOAPIC_REG_BASE     (VIRT_PCH_REG_BASE)
  #define VIRT_PCH_MSI_ADDR_LOW    0x2FF00000UL
  #define VIRT_PCH_REG_SIZE        0x400
 +#define VIRT_PCH_MSI_SIZE        0x8
  /*
   * GSI_BASE is hard-coded with 64 in linux kernel, else kernel fails to boot
 --
-.34.1
+.43.5

The following changes since commit 8f6330a807f2642dc2a3cdf33347aa28a4c00a87:

Merge tag 'pull-maintainer-updates-060324-1' of https://gitlab.com/stsquad/qemu into staging (2024-03-06 16:56:20 +0000)

are available in the Git repository at:

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

for you to fetch changes up to 4dc2edfd6f8abfc38f0ba110502790aa5051b1b5:

hw/loongarch: Add cells missing from rtc node (2024-03-07 21:58:00 +0800)

----------------------------------------------------------------
pull-loongarch-20240307

----------------------------------------------------------------
Song Gao (17):
      hw/loongarch: Move boot fucntions to boot.c
      hw/loongarch: Add load initrd
      hw/loongarch: Add slave cpu boot_code
      hw/loongarch: Add init_cmdline
      hw/loongarch: Init efi_system_table
      hw/loongarch: Init efi_boot_memmap table
      hw/loongarch: Init efi_initrd table
      hw/loongarch: Init efi_fdt table
      hw/loongarch: Fix fdt memory node wrong 'reg'
      hw/loongarch: fdt adds cpu interrupt controller node
      hw/loongarch: fdt adds Extend I/O Interrupt Controller
      hw/loongarch: fdt adds pch_pic Controller
      hw/loongarch: fdt adds pch_msi Controller
      hw/loongarch: fdt adds pcie irq_map node
      hw/loongarch: fdt remove unused irqchip node
      hw/loongarch: Add cells missing from uart node
      hw/loongarch: Add cells missing from rtc node

hw/loongarch/boot.c                | 330 +++++++++++++++++++++++++++++++++
 hw/loongarch/meson.build           |   1 +
 hw/loongarch/virt.c                | 363 +++++++++++++++++++++----------------
 include/hw/intc/loongarch_extioi.h |   1 +
 include/hw/loongarch/boot.h        | 109 +++++++++++
 include/hw/loongarch/virt.h        |  14 ++
 include/hw/pci-host/ls7a.h         |   2 +
 target/loongarch/cpu.h             |   2 +
 8 files changed, 662 insertions(+), 160 deletions(-)
 create mode 100644 hw/loongarch/boot.c
 create mode 100644 include/hw/loongarch/boot.h

Move some boot functions to boot.c and struct
loongarch_boot_info into struct LoongArchMachineState.

Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-2-gaosong@loongson.cn>
---
 hw/loongarch/boot.c         | 125 ++++++++++++++++++++++++++++++++++++
 hw/loongarch/meson.build    |   1 +
 hw/loongarch/virt.c         | 121 +++-------------------------------
 include/hw/loongarch/boot.h |  21 ++++++
 include/hw/loongarch/virt.h |   2 +
 5 files changed, 157 insertions(+), 113 deletions(-)
 create mode 100644 hw/loongarch/boot.c
 create mode 100644 include/hw/loongarch/boot.h

diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/loongarch/boot.c
@@ -XXX,XX +XXX,XX @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * LoongArch boot helper functions.
+ *
+ * Copyright (c) 2023 Loongson Technology Corporation Limited
+ */
+
+#include "qemu/osdep.h"
+#include "qemu/units.h"
+#include "target/loongarch/cpu.h"
+#include "hw/loongarch/virt.h"
+#include "hw/loader.h"
+#include "elf.h"
+#include "qemu/error-report.h"
+#include "sysemu/reset.h"
+
+static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
+{
+    return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
+}
+
+static int64_t load_kernel_info(struct loongarch_boot_info *info)
+{
+    uint64_t kernel_entry, kernel_low, kernel_high;
+    ssize_t kernel_size;
+
+    kernel_size = load_elf(info->kernel_filename, NULL,
+                           cpu_loongarch_virt_to_phys, NULL,
+                           &kernel_entry, &kernel_low,
+                           &kernel_high, NULL, 0,
+                           EM_LOONGARCH, 1, 0);
+
+    if (kernel_size < 0) {
+        error_report("could not load kernel '%s': %s",
+                     info->kernel_filename,
+                     load_elf_strerror(kernel_size));
+        exit(1);
+    }
+    return kernel_entry;
+}
+
+static void reset_load_elf(void *opaque)
+{
+    LoongArchCPU *cpu = opaque;
+    CPULoongArchState *env = &cpu->env;
+
+    cpu_reset(CPU(cpu));
+    if (env->load_elf) {
+        cpu_set_pc(CPU(cpu), env->elf_address);
+    }
+}
+
+static void fw_cfg_add_kernel_info(struct loongarch_boot_info *info,
+                                   FWCfgState *fw_cfg)
+{
+    /*
+     * Expose the kernel, the command line, and the initrd in fw_cfg.
+     * We don't process them here at all, it's all left to the
+     * firmware.
+     */
+    load_image_to_fw_cfg(fw_cfg,
+                         FW_CFG_KERNEL_SIZE, FW_CFG_KERNEL_DATA,
+                         info->kernel_filename,
+                         false);
+
+    if (info->initrd_filename) {
+        load_image_to_fw_cfg(fw_cfg,
+                             FW_CFG_INITRD_SIZE, FW_CFG_INITRD_DATA,
+                             info->initrd_filename, false);
+    }
+
+    if (info->kernel_cmdline) {
+        fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE,
+                       strlen(info->kernel_cmdline) + 1);
+        fw_cfg_add_string(fw_cfg, FW_CFG_CMDLINE_DATA,
+                          info->kernel_cmdline);
+    }
+}
+
+static void loongarch_firmware_boot(LoongArchMachineState *lams,
+                                    struct loongarch_boot_info *info)
+{
+    fw_cfg_add_kernel_info(info, lams->fw_cfg);
+}
+
+static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info)
+{
+    int64_t kernel_addr = 0;
+    LoongArchCPU *lacpu;
+    CPUState *cs;
+
+    if (info->kernel_filename) {
+        kernel_addr = load_kernel_info(info);
+    } else {
+        error_report("Need kernel filename\n");
+        exit(1);
+    }
+
+    CPU_FOREACH(cs) {
+        lacpu = LOONGARCH_CPU(cs);
+        lacpu->env.load_elf = true;
+        lacpu->env.elf_address = kernel_addr;
+    }
+}
+
+void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info)
+{
+    LoongArchMachineState *lams = LOONGARCH_MACHINE(ms);
+    int i;
+
+    /* register reset function */
+    for (i = 0; i < ms->smp.cpus; i++) {
+        qemu_register_reset(reset_load_elf, LOONGARCH_CPU(qemu_get_cpu(i)));
+    }
+
+    info->kernel_filename = ms->kernel_filename;
+    info->kernel_cmdline = ms->kernel_cmdline;
+    info->initrd_filename = ms->initrd_filename;
+
+    if (lams->bios_loaded) {
+        loongarch_firmware_boot(lams, info);
+    } else {
+        loongarch_direct_kernel_boot(info);
+    }
+}
diff --git a/hw/loongarch/meson.build b/hw/loongarch/meson.build
index XXXXXXX..XXXXXXX 100644
--- 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',
 ))
 loongarch_ss.add(when: 'CONFIG_LOONGARCH_VIRT', if_true: [files('virt.c'), fdt])
 loongarch_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-build.c'))
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -XXX,XX +XXX,XX @@
 #include "hw/block/flash.h"
 #include "qemu/error-report.h"
 
-
-struct loaderparams {
-    uint64_t ram_size;
-    const char *kernel_filename;
-    const char *kernel_cmdline;
-    const char *initrd_filename;
-};
-
 static PFlashCFI01 *virt_flash_create1(LoongArchMachineState *lams,
                                        const char *name,
                                        const char *alias_prop_name)
@@ -XXX,XX +XXX,XX @@ static void memmap_add_entry(uint64_t address, uint64_t length, uint32_t type)
     memmap_entries++;
 }
 
-static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
-{
-    return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
-}
-
-static int64_t load_kernel_info(const struct loaderparams *loaderparams)
-{
-    uint64_t kernel_entry, kernel_low, kernel_high;
-    ssize_t kernel_size;
-
-    kernel_size = load_elf(loaderparams->kernel_filename, NULL,
-                           cpu_loongarch_virt_to_phys, NULL,
-                           &kernel_entry, &kernel_low,
-                           &kernel_high, NULL, 0,
-                           EM_LOONGARCH, 1, 0);
-
-    if (kernel_size < 0) {
-        error_report("could not load kernel '%s': %s",
-                     loaderparams->kernel_filename,
-                     load_elf_strerror(kernel_size));
-        exit(1);
-    }
-    return kernel_entry;
-}
-
 static DeviceState *create_acpi_ged(DeviceState *pch_pic, LoongArchMachineState *lams)
 {
     DeviceState *dev;
@@ -XXX,XX +XXX,XX @@ static void loongarch_firmware_init(LoongArchMachineState *lams)
     }
 }
 
-static void reset_load_elf(void *opaque)
-{
-    LoongArchCPU *cpu = opaque;
-    CPULoongArchState *env = &cpu->env;
-
-    cpu_reset(CPU(cpu));
-    if (env->load_elf) {
-        cpu_set_pc(CPU(cpu), env->elf_address);
-    }
-}
-
-static void fw_cfg_add_kernel_info(const struct loaderparams *loaderparams,
-                                   FWCfgState *fw_cfg)
-{
-    /*
-     * Expose the kernel, the command line, and the initrd in fw_cfg.
-     * We don't process them here at all, it's all left to the
-     * firmware.
-     */
-    load_image_to_fw_cfg(fw_cfg,
-                         FW_CFG_KERNEL_SIZE, FW_CFG_KERNEL_DATA,
-                         loaderparams->kernel_filename,
-                         false);
-
-    if (loaderparams->initrd_filename) {
-        load_image_to_fw_cfg(fw_cfg,
-                             FW_CFG_INITRD_SIZE, FW_CFG_INITRD_DATA,
-                             loaderparams->initrd_filename, false);
-    }
-
-    if (loaderparams->kernel_cmdline) {
-        fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE,
-                       strlen(loaderparams->kernel_cmdline) + 1);
-        fw_cfg_add_string(fw_cfg, FW_CFG_CMDLINE_DATA,
-                          loaderparams->kernel_cmdline);
-    }
-}
-
-static void loongarch_firmware_boot(LoongArchMachineState *lams,
-                                    const struct loaderparams *loaderparams)
-{
-    fw_cfg_add_kernel_info(loaderparams, lams->fw_cfg);
-}
-
-static void loongarch_direct_kernel_boot(LoongArchMachineState *lams,
-                                         const struct loaderparams *loaderparams)
-{
-    MachineState *machine = MACHINE(lams);
-    int64_t kernel_addr = 0;
-    LoongArchCPU *lacpu;
-    int i;
-
-    kernel_addr = load_kernel_info(loaderparams);
-    if (!machine->firmware) {
-        for (i = 0; i < machine->smp.cpus; i++) {
-            lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
-            lacpu->env.load_elf = true;
-            lacpu->env.elf_address = kernel_addr;
-        }
-    }
-}
 
 static void loongarch_qemu_write(void *opaque, hwaddr addr,
                                  uint64_t val, unsigned size)
@@ -XXX,XX +XXX,XX @@ static void loongarch_init(MachineState *machine)
     MachineClass *mc = MACHINE_GET_CLASS(machine);
     CPUState *cpu;
     char *ramName = NULL;
-    struct loaderparams loaderparams = { };
 
     if (!cpu_model) {
         cpu_model = LOONGARCH_CPU_TYPE_NAME("la464");
@@ -XXX,XX +XXX,XX @@ static void loongarch_init(MachineState *machine)
                         sizeof(struct memmap_entry) * (memmap_entries));
     }
     fdt_add_fw_cfg_node(lams);
-    loaderparams.ram_size = ram_size;
-    loaderparams.kernel_filename = machine->kernel_filename;
-    loaderparams.kernel_cmdline = machine->kernel_cmdline;
-    loaderparams.initrd_filename = machine->initrd_filename;
-    /* load the kernel. */
-    if (loaderparams.kernel_filename) {
-        if (lams->bios_loaded) {
-            loongarch_firmware_boot(lams, &loaderparams);
-        } else {
-            loongarch_direct_kernel_boot(lams, &loaderparams);
-        }
-    }
     fdt_add_flash_node(lams);
-    /* register reset function */
-    for (i = 0; i < machine->smp.cpus; i++) {
-        lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
-        qemu_register_reset(reset_load_elf, lacpu);
-    }
+
     /* Initialize the IO interrupt subsystem */
     loongarch_irq_init(lams);
     fdt_add_irqchip_node(lams);
@@ -XXX,XX +XXX,XX @@ static void loongarch_init(MachineState *machine)
      */
     fdt_base = 1 * MiB;
     qemu_fdt_dumpdtb(machine->fdt, lams->fdt_size);
-    rom_add_blob_fixed("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));
+
+    lams->bootinfo.ram_size = ram_size;
+    loongarch_load_kernel(machine, &lams->bootinfo);
 }
 
 bool loongarch_is_acpi_enabled(LoongArchMachineState *lams)
diff --git a/include/hw/loongarch/boot.h b/include/hw/loongarch/boot.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/include/hw/loongarch/boot.h
@@ -XXX,XX +XXX,XX @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Definitions for LoongArch boot.
+ *
+ * Copyright (C) 2023 Loongson Technology Corporation Limited
+ */
+
+#ifndef HW_LOONGARCH_BOOT_H
+#define HW_LOONGARCH_BOOT_H
+
+struct loongarch_boot_info {
+    uint64_t ram_size;
+    const char *kernel_filename;
+    const char *kernel_cmdline;
+    const char *initrd_filename;
+    uint64_t a0, a1, a2;
+};
+
+void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info);
+
+#endif /* HW_LOONGARCH_BOOT_H */
diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/loongarch/virt.h
+++ b/include/hw/loongarch/virt.h
@@ -XXX,XX +XXX,XX @@
 #include "qemu/queue.h"
 #include "hw/intc/loongarch_ipi.h"
 #include "hw/block/flash.h"
+#include "hw/loongarch/boot.h"
 
 #define LOONGARCH_MAX_CPUS      256
 
@@ -XXX,XX +XXX,XX @@ struct LoongArchMachineState {
     MemoryRegion system_iocsr;
     MemoryRegion iocsr_mem;
     AddressSpace as_iocsr;
+    struct loongarch_boot_info bootinfo;
 };
 
 #define TYPE_LOONGARCH_MACHINE  MACHINE_TYPE_NAME("virt")
-- 
2.34.1

we load initrd ramdisk after kernel_high address

Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-3-gaosong@loongson.cn>
---
 hw/loongarch/boot.c | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -XXX,XX +XXX,XX @@ static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
 
 static int64_t load_kernel_info(struct loongarch_boot_info *info)
 {
-    uint64_t kernel_entry, kernel_low, kernel_high;
+    uint64_t kernel_entry, kernel_low, kernel_high, initrd_size;
+    ram_addr_t initrd_offset;
     ssize_t kernel_size;
 
     kernel_size = load_elf(info->kernel_filename, NULL,
@@ -XXX,XX +XXX,XX @@ static int64_t load_kernel_info(struct loongarch_boot_info *info)
                      load_elf_strerror(kernel_size));
         exit(1);
     }
+
+    if (info->initrd_filename) {
+        initrd_size = get_image_size(info->initrd_filename);
+        if (initrd_size > 0) {
+            initrd_offset = ROUND_UP(kernel_high + 4 * kernel_size, 64 * KiB);
+
+            if (initrd_offset + initrd_size > info->ram_size) {
+                error_report("memory too small for initial ram disk '%s'",
+                             info->initrd_filename);
+                exit(1);
+            }
+
+            initrd_size = load_image_targphys(info->initrd_filename, initrd_offset,
+                                              info->ram_size - initrd_offset);
+        }
+
+        if (initrd_size == (target_ulong)-1) {
+            error_report("could not load initial ram disk '%s'",
+                         info->initrd_filename);
+            exit(1);
+        }
+    } else {
+        error_report("Need initrd!");
+        exit(1);
+    }
+
     return kernel_entry;
 }
 
-- 
2.34.1

Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-4-gaosong@loongson.cn>
---
 hw/loongarch/boot.c | 70 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 1 deletion(-)

diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -XXX,XX +XXX,XX @@
 #include "qemu/error-report.h"
 #include "sysemu/reset.h"
 
+static const unsigned int slave_boot_code[] = {
+                  /* Configure reset ebase.         */
+    0x0400302c,   /* csrwr      $r12,0xc            */
+
+                  /* Disable interrupt.             */
+    0x0380100c,   /* ori        $r12,$r0,0x4        */
+    0x04000180,   /* csrxchg    $r0,$r12,0x0        */
+
+                  /* Clear mailbox.                 */
+    0x1400002d,   /* lu12i.w    $r13,1(0x1)         */
+    0x038081ad,   /* ori        $r13,$r13,0x20      */
+    0x06481da0,   /* iocsrwr.d  $r0,$r13            */
+
+                  /* Enable IPI interrupt.          */
+    0x1400002c,   /* lu12i.w    $r12,1(0x1)         */
+    0x0400118c,   /* csrxchg    $r12,$r12,0x4       */
+    0x02fffc0c,   /* addi.d     $r12,$r0,-1(0xfff)  */
+    0x1400002d,   /* lu12i.w    $r13,1(0x1)         */
+    0x038011ad,   /* ori        $r13,$r13,0x4       */
+    0x064819ac,   /* iocsrwr.w  $r12,$r13           */
+    0x1400002d,   /* lu12i.w    $r13,1(0x1)         */
+    0x038081ad,   /* ori        $r13,$r13,0x20      */
+
+                  /* Wait for wakeup  <.L11>:       */
+    0x06488000,   /* idle       0x0                 */
+    0x03400000,   /* andi       $r0,$r0,0x0         */
+    0x064809ac,   /* iocsrrd.w  $r12,$r13           */
+    0x43fff59f,   /* beqz       $r12,-12(0x7ffff4) # 48 <.L11> */
+
+                  /* Read and clear IPI interrupt.  */
+    0x1400002d,   /* lu12i.w    $r13,1(0x1)         */
+    0x064809ac,   /* iocsrrd.w  $r12,$r13           */
+    0x1400002d,   /* lu12i.w    $r13,1(0x1)         */
+    0x038031ad,   /* ori        $r13,$r13,0xc       */
+    0x064819ac,   /* iocsrwr.w  $r12,$r13           */
+
+                  /* Disable  IPI interrupt.        */
+    0x1400002c,   /* lu12i.w    $r12,1(0x1)         */
+    0x04001180,   /* csrxchg    $r0,$r12,0x4        */
+
+                  /* Read mail buf and jump to specified entry */
+    0x1400002d,   /* lu12i.w    $r13,1(0x1)         */
+    0x038081ad,   /* ori        $r13,$r13,0x20      */
+    0x06480dac,   /* iocsrrd.d  $r12,$r13           */
+    0x00150181,   /* move       $r1,$r12            */
+    0x4c000020,   /* jirl       $r0,$r1,0           */
+};
+
 static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
 {
     return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
@@ -XXX,XX +XXX,XX @@ static void loongarch_firmware_boot(LoongArchMachineState *lams,
     fw_cfg_add_kernel_info(info, lams->fw_cfg);
 }
 
+static void init_boot_rom(struct loongarch_boot_info *info, void *p)
+{
+    memcpy(p, &slave_boot_code, sizeof(slave_boot_code));
+    p += sizeof(slave_boot_code);
+}
+
 static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info)
 {
+    void  *p, *bp;
     int64_t kernel_addr = 0;
     LoongArchCPU *lacpu;
     CPUState *cs;
@@ -XXX,XX +XXX,XX @@ static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info)
         exit(1);
     }
 
+    /* Load 'boot_rom' at [0 - 1MiB] */
+    p = g_malloc0(1 * MiB);
+    bp = p;
+    init_boot_rom(info, p);
+    rom_add_blob_fixed("boot_rom", bp, 1 * MiB, 0);
+
     CPU_FOREACH(cs) {
         lacpu = LOONGARCH_CPU(cs);
         lacpu->env.load_elf = true;
-        lacpu->env.elf_address = kernel_addr;
+        if (cs == first_cpu) {
+            lacpu->env.elf_address = kernel_addr;
+        } else {
+            lacpu->env.elf_address = 0;
+        }
+        lacpu->env.boot_info = info;
     }
+
+    g_free(bp);
 }
 
 void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info)
-- 
2.34.1

Add init_cmline and set boot_info->a0, a1

Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-5-gaosong@loongson.cn>
---
 hw/loongarch/boot.c         | 19 +++++++++++++++++++
 include/hw/loongarch/virt.h |  2 ++
 target/loongarch/cpu.h      |  2 ++
 3 files changed, 23 insertions(+)

Add init_systab and set boot_info->a2

Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-6-gaosong@loongson.cn>
---
 hw/loongarch/boot.c         | 22 +++++++++++++++++
 include/hw/loongarch/boot.h | 48 +++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-7-gaosong@loongson.cn>
---
 hw/loongarch/boot.c         | 39 +++++++++++++++++++++++++++++++++++++
 hw/loongarch/virt.c         | 11 ++---------
 include/hw/loongarch/boot.h | 27 +++++++++++++++++++++++++
 include/hw/loongarch/virt.h | 10 ++++++++++
 4 files changed, 78 insertions(+), 9 deletions(-)

diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -XXX,XX +XXX,XX @@ static const 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,
+                                 void *p, void *start)
+{
+    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 = memmap_table[i].address;
+        map[i].num_pages = memmap_table[i].length >> 16; /* 64KB align*/
+        p += sizeof(efi_memory_desc_t);
+    }
+}
+
 static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
 {
+    void *bp_tables_start;
     struct efi_system_table *systab = p;
 
     info->a2 = (uint64_t)p - (uint64_t)start;
@@ -XXX,XX +XXX,XX @@ static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
     p += ROUND_UP(sizeof(struct efi_system_table), 64);
 
     systab->tables = p;
+    bp_tables_start = p;
+
+    init_efi_boot_memmap(systab, p, start);
+    p += ROUND_UP(sizeof(struct efi_boot_memmap) +
+                  sizeof(efi_memory_desc_t) * memmap_entries, 64);
+
+    systab->tables = (struct efi_configuration_table *)(bp_tables_start - start);
 }
 
 static void init_cmdline(struct loongarch_boot_info *info, void *p, void *start)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -XXX,XX +XXX,XX @@ 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 XXXXXXX..XXXXXXX 100644
--- a/include/hw/loongarch/boot.h
+++ b/include/hw/loongarch/boot.h
@@ -XXX,XX +XXX,XX @@ 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;
@@ -XXX,XX +XXX,XX @@ 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 XXXXXXX..XXXXXXX 100644
--- a/include/hw/loongarch/virt.h
+++ b/include/hw/loongarch/virt.h
@@ -XXX,XX +XXX,XX @@
 
 #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.34.1

Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-8-gaosong@loongson.cn>
---
 hw/loongarch/boot.c         | 23 +++++++++++++++++++++--
 include/hw/loongarch/boot.h |  9 +++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -XXX,XX +XXX,XX @@
 #include "qemu/error-report.h"
 #include "sysemu/reset.h"
 
+ram_addr_t initrd_offset;
+uint64_t initrd_size;
+
 static const unsigned int slave_boot_code[] = {
                   /* Configure reset ebase.         */
     0x0400302c,   /* csrwr      $r12,0xc            */
@@ -XXX,XX +XXX,XX @@ static void init_efi_boot_memmap(struct efi_system_table *systab,
     }
 }
 
+static void init_efi_initrd_table(struct efi_system_table *systab,
+                                  void *p, void *start)
+{
+    efi_guid_t tbl_guid = LINUX_EFI_INITRD_MEDIA_GUID;
+    struct efi_initrd *initrd_table  = 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;
+
+    initrd_table->base = initrd_offset;
+    initrd_table->size = initrd_size;
+}
+
 static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
 {
     void *bp_tables_start;
@@ -XXX,XX +XXX,XX @@ static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
     init_efi_boot_memmap(systab, p, start);
     p += ROUND_UP(sizeof(struct efi_boot_memmap) +
                   sizeof(efi_memory_desc_t) * memmap_entries, 64);
+    init_efi_initrd_table(systab, p, start);
+    p += ROUND_UP(sizeof(struct efi_initrd), 64);
 
     systab->tables = (struct efi_configuration_table *)(bp_tables_start - start);
 }
@@ -XXX,XX +XXX,XX @@ static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
 
 static int64_t load_kernel_info(struct loongarch_boot_info *info)
 {
-    uint64_t kernel_entry, kernel_low, kernel_high, initrd_size;
-    ram_addr_t initrd_offset;
+    uint64_t kernel_entry, kernel_low, kernel_high;
     ssize_t kernel_size;
 
     kernel_size = load_elf(info->kernel_filename, NULL,
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(0x800f683f, 0xd08b, 0x423a,  0xa2, 0x93, \
                  0x96, 0x5c, 0x3c, 0x6f, 0xe2, 0xb4)
 
+#define LINUX_EFI_INITRD_MEDIA_GUID \
+        EFI_GUID(0x5568e427, 0x68fc, 0x4f3d,  0xac, 0x74, \
+                 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68)
+
 struct efi_config_table {
     efi_guid_t guid;
     uint64_t *ptr;
@@ -XXX,XX +XXX,XX @@ struct efi_boot_memmap {
     efi_memory_desc_t map[32];
 };
 
+struct efi_initrd {
+    uint64_t base;
+    uint64_t size;
+};
+
 struct loongarch_boot_info {
     uint64_t ram_size;
     const char *kernel_filename;
-- 
2.34.1

Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-9-gaosong@loongson.cn>
---
 hw/loongarch/boot.c         | 11 +++++++++++
 include/hw/loongarch/boot.h |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -XXX,XX +XXX,XX @@ 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 *)0x100000; /* fdt_base 1MiB */
+    systab->nr_tables = 3;
+}
+
 static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
 {
     void *bp_tables_start;
@@ -XXX,XX +XXX,XX @@ static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
                   sizeof(efi_memory_desc_t) * memmap_entries, 64);
     init_efi_initrd_table(systab, p, start);
     p += ROUND_UP(sizeof(struct efi_initrd), 64);
+    init_efi_fdt_table(systab);
 
     systab->tables = (struct efi_configuration_table *)(bp_tables_start - start);
 }
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(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.34.1

The right fdt memory node like [1], not [2]

[1]
        memory@0 {
                device_type = "memory";
                reg = <0x00 0x00 0x00 0x10000000>;
        };
  [2]
        memory@0 {
                device_type = "memory";
                reg = <0x02 0x00 0x02 0x10000000>;
        };

Reviewed-by: Bibo Mao <maobibo@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-10-gaosong@loongson.cn>
---
 hw/loongarch/virt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -XXX,XX +XXX,XX @@ static void fdt_add_memory_node(MachineState *ms,
     char *nodename = g_strdup_printf("/memory@%" PRIx64, base);
 
     qemu_fdt_add_subnode(ms->fdt, nodename);
-    qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 2, base, 2, size);
+    qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 0, base, 0, size);
     qemu_fdt_setprop_string(ms->fdt, nodename, "device_type", "memory");
 
     if (ms->numa_state && ms->numa_state->num_nodes) {
-- 
2.34.1

fdt adds cpu interrupt controller node,
we use 'loongson,cpu-interrupt-controller'.

See:
https://github.com/torvalds/linux/blob/v6.7/drivers/irqchip/irq-loongarch-cpu.c
https://lore.kernel.org/r/20221114113824.1880-2-liupeibao@loongson.cn

Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-11-gaosong@loongson.cn>
---
 hw/loongarch/virt.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -XXX,XX +XXX,XX @@ static void virt_flash_map(LoongArchMachineState *lams,
     virt_flash_map1(flash1, VIRT_FLASH1_BASE, VIRT_FLASH1_SIZE, sysmem);
 }
 
+static void fdt_add_cpuic_node(LoongArchMachineState *lams,
+                               uint32_t *cpuintc_phandle)
+{
+    MachineState *ms = MACHINE(lams);
+    char *nodename;
+
+    *cpuintc_phandle = qemu_fdt_alloc_phandle(ms->fdt);
+    nodename = g_strdup_printf("/cpuic");
+    qemu_fdt_add_subnode(ms->fdt, nodename);
+    qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", *cpuintc_phandle);
+    qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
+                            "loongson,cpu-interrupt-controller");
+    qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0);
+    qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 1);
+    g_free(nodename);
+}
+
 static void fdt_add_flash_node(LoongArchMachineState *lams)
 {
     MachineState *ms = MACHINE(lams);
@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
     CPULoongArchState *env;
     CPUState *cpu_state;
     int cpu, pin, i, start, num;
+    uint32_t cpuintc_phandle;
 
     /*
      * The connection of interrupts:
@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
     memory_region_add_subregion(&lams->system_iocsr, MAIL_SEND_ADDR,
                    sysbus_mmio_get_region(SYS_BUS_DEVICE(ipi), 1));
 
+    /* Add cpu interrupt-controller */
+    fdt_add_cpuic_node(lams, &cpuintc_phandle);
+
     for (cpu = 0; cpu < ms->smp.cpus; cpu++) {
         cpu_state = qemu_get_cpu(cpu);
         cpudev = DEVICE(cpu_state);
-- 
2.34.1

fdt adds Extend I/O Interrupt Controller,
we use 'loongson,ls2k2000-eiointc'.

See:
https://github.com/torvalds/linux/blob/v6.7/drivers/irqchip/irq-loongson-eiointc.c
https://lore.kernel.org/r/764e02d924094580ac0f1d15535f4b98308705c6.1683279769.git.zhoubinbin@loongson.cn

Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-12-gaosong@loongson.cn>
---
 hw/loongarch/virt.c                | 30 +++++++++++++++++++++++++++++-
 include/hw/intc/loongarch_extioi.h |  1 +
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -XXX,XX +XXX,XX @@ static void fdt_add_cpuic_node(LoongArchMachineState *lams,
     g_free(nodename);
 }
 
+static void fdt_add_eiointc_node(LoongArchMachineState *lams,
+                                  uint32_t *cpuintc_phandle,
+                                  uint32_t *eiointc_phandle)
+{
+    MachineState *ms = MACHINE(lams);
+    char *nodename;
+    hwaddr extioi_base = APIC_BASE;
+    hwaddr extioi_size = EXTIOI_SIZE;
+
+    *eiointc_phandle = qemu_fdt_alloc_phandle(ms->fdt);
+    nodename = g_strdup_printf("/eiointc@%" PRIx64, extioi_base);
+    qemu_fdt_add_subnode(ms->fdt, nodename);
+    qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", *eiointc_phandle);
+    qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
+                            "loongson,ls2k2000-eiointc");
+    qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0);
+    qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 1);
+    qemu_fdt_setprop_cell(ms->fdt, nodename, "interrupt-parent",
+                          *cpuintc_phandle);
+    qemu_fdt_setprop_cell(ms->fdt, nodename, "interrupts", 3);
+    qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 0x0,
+                           extioi_base, 0x0, extioi_size);
+    g_free(nodename);
+}
+
 static void fdt_add_flash_node(LoongArchMachineState *lams)
 {
     MachineState *ms = MACHINE(lams);
@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
     CPULoongArchState *env;
     CPUState *cpu_state;
     int cpu, pin, i, start, num;
-    uint32_t cpuintc_phandle;
+    uint32_t cpuintc_phandle, eiointc_phandle;
 
     /*
      * The connection of interrupts:
@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
         }
     }
 
+    /* Add Extend I/O Interrupt Controller node */
+    fdt_add_eiointc_node(lams, &cpuintc_phandle, &eiointc_phandle);
+
     pch_pic = qdev_new(TYPE_LOONGARCH_PCH_PIC);
     num = VIRT_PCH_PIC_IRQ_NUM;
     qdev_prop_set_uint32(pch_pic, "pch_pic_irq_num", num);
diff --git a/include/hw/intc/loongarch_extioi.h b/include/hw/intc/loongarch_extioi.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/intc/loongarch_extioi.h
+++ b/include/hw/intc/loongarch_extioi.h
@@ -XXX,XX +XXX,XX @@
 #define EXTIOI_COREISR_END           (0xB20 - APIC_OFFSET)
 #define EXTIOI_COREMAP_START         (0xC00 - APIC_OFFSET)
 #define EXTIOI_COREMAP_END           (0xD00 - APIC_OFFSET)
+#define EXTIOI_SIZE                  0x800
 
 typedef struct ExtIOICore {
     uint32_t coreisr[EXTIOI_IRQS_GROUP_COUNT];
-- 
2.34.1

fdt adds pch pic controller, we use 'loongson,pch-pic-1.0'

See:
https://github.com/torvalds/linux/blob/v6.7/drivers/irqchip/irq-loongson-pch-pic.c
https://lore.kernel.org/r/20200528152757.1028711-4-jiaxun.yang@flygoat.com

Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-13-gaosong@loongson.cn>
---
 hw/loongarch/virt.c        | 30 +++++++++++++++++++++++++++++-
 include/hw/pci-host/ls7a.h |  1 +
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -XXX,XX +XXX,XX @@ static void fdt_add_eiointc_node(LoongArchMachineState *lams,
     g_free(nodename);
 }
 
+static void fdt_add_pch_pic_node(LoongArchMachineState *lams,
+                                 uint32_t *eiointc_phandle,
+                                 uint32_t *pch_pic_phandle)
+{
+    MachineState *ms = MACHINE(lams);
+    char *nodename;
+    hwaddr pch_pic_base = VIRT_PCH_REG_BASE;
+    hwaddr pch_pic_size = VIRT_PCH_REG_SIZE;
+
+    *pch_pic_phandle = qemu_fdt_alloc_phandle(ms->fdt);
+    nodename = g_strdup_printf("/platic@%" PRIx64, pch_pic_base);
+    qemu_fdt_add_subnode(ms->fdt, nodename);
+    qemu_fdt_setprop_cell(ms->fdt,  nodename, "phandle", *pch_pic_phandle);
+    qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
+                            "loongson,pch-pic-1.0");
+    qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 0,
+                           pch_pic_base, 0, pch_pic_size);
+    qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0);
+    qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 2);
+    qemu_fdt_setprop_cell(ms->fdt, nodename, "interrupt-parent",
+                          *eiointc_phandle);
+    qemu_fdt_setprop_cell(ms->fdt, nodename, "loongson,pic-base-vec", 0);
+    g_free(nodename);
+}
+
 static void fdt_add_flash_node(LoongArchMachineState *lams)
 {
     MachineState *ms = MACHINE(lams);
@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
     CPULoongArchState *env;
     CPUState *cpu_state;
     int cpu, pin, i, start, num;
-    uint32_t cpuintc_phandle, eiointc_phandle;
+    uint32_t cpuintc_phandle, eiointc_phandle, pch_pic_phandle;
 
     /*
      * The connection of interrupts:
@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
         qdev_connect_gpio_out(DEVICE(d), i, qdev_get_gpio_in(extioi, i));
     }
 
+    /* Add PCH PIC node */
+    fdt_add_pch_pic_node(lams, &eiointc_phandle, &pch_pic_phandle);
+
     pch_msi = qdev_new(TYPE_LOONGARCH_PCH_MSI);
     start   =  num;
     num = EXTIOI_IRQS - start;
diff --git a/include/hw/pci-host/ls7a.h b/include/hw/pci-host/ls7a.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/pci-host/ls7a.h
+++ b/include/hw/pci-host/ls7a.h
@@ -XXX,XX +XXX,XX @@
 #define VIRT_PCH_REG_BASE        0x10000000UL
 #define VIRT_IOAPIC_REG_BASE     (VIRT_PCH_REG_BASE)
 #define VIRT_PCH_MSI_ADDR_LOW    0x2FF00000UL
+#define VIRT_PCH_REG_SIZE        0x400
 
 /*
  * GSI_BASE is hard-coded with 64 in linux kernel, else kernel fails to boot
-- 
2.34.1

fdt adds pch msi controller, we use 'loongson,pch-msi-1.0'.

See:
https://github.com/torvalds/linux/blob/v6.7/drivers/irqchip/irq-loongson-pch-msi.c
https://lore.kernel.org/r/20200528152757.1028711-6-jiaxun.yang@flygoat.com

Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-14-gaosong@loongson.cn>
---
 hw/loongarch/virt.c        | 33 ++++++++++++++++++++++++++++++++-
 include/hw/pci-host/ls7a.h |  1 +
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -XXX,XX +XXX,XX @@ static void fdt_add_pch_pic_node(LoongArchMachineState *lams,
     g_free(nodename);
 }
 
+static void fdt_add_pch_msi_node(LoongArchMachineState *lams,
+                                 uint32_t *eiointc_phandle,
+                                 uint32_t *pch_msi_phandle)
+{
+    MachineState *ms = MACHINE(lams);
+    char *nodename;
+    hwaddr pch_msi_base = VIRT_PCH_MSI_ADDR_LOW;
+    hwaddr pch_msi_size = VIRT_PCH_MSI_SIZE;
+
+    *pch_msi_phandle = qemu_fdt_alloc_phandle(ms->fdt);
+    nodename = g_strdup_printf("/msi@%" PRIx64, pch_msi_base);
+    qemu_fdt_add_subnode(ms->fdt, nodename);
+    qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", *pch_msi_phandle);
+    qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
+                            "loongson,pch-msi-1.0");
+    qemu_fdt_setprop_cells(ms->fdt, nodename, "reg",
+                           0, pch_msi_base,
+                           0, pch_msi_size);
+    qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0);
+    qemu_fdt_setprop_cell(ms->fdt, nodename, "interrupt-parent",
+                          *eiointc_phandle);
+    qemu_fdt_setprop_cell(ms->fdt, nodename, "loongson,msi-base-vec",
+                          VIRT_PCH_PIC_IRQ_NUM);
+    qemu_fdt_setprop_cell(ms->fdt, nodename, "loongson,msi-num-vecs",
+                          EXTIOI_IRQS - VIRT_PCH_PIC_IRQ_NUM);
+    g_free(nodename);
+}
+
 static void fdt_add_flash_node(LoongArchMachineState *lams)
 {
     MachineState *ms = MACHINE(lams);
@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
     CPULoongArchState *env;
     CPUState *cpu_state;
     int cpu, pin, i, start, num;
-    uint32_t cpuintc_phandle, eiointc_phandle, pch_pic_phandle;
+    uint32_t cpuintc_phandle, eiointc_phandle, pch_pic_phandle, pch_msi_phandle;
 
     /*
      * The connection of interrupts:
@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
                               qdev_get_gpio_in(extioi, i + start));
     }
 
+    /* Add PCH MSI node */
+    fdt_add_pch_msi_node(lams, &eiointc_phandle, &pch_msi_phandle);
+
     loongarch_devices_init(pch_pic, lams);
 }
 
diff --git a/include/hw/pci-host/ls7a.h b/include/hw/pci-host/ls7a.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/pci-host/ls7a.h
+++ b/include/hw/pci-host/ls7a.h
@@ -XXX,XX +XXX,XX @@
 #define VIRT_IOAPIC_REG_BASE     (VIRT_PCH_REG_BASE)
 #define VIRT_PCH_MSI_ADDR_LOW    0x2FF00000UL
 #define VIRT_PCH_REG_SIZE        0x400
+#define VIRT_PCH_MSI_SIZE        0x8
 
 /*
  * GSI_BASE is hard-coded with 64 in linux kernel, else kernel fails to boot
-- 
2.34.1

Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-15-gaosong@loongson.cn>
---
 hw/loongarch/virt.c | 73 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 69 insertions(+), 4 deletions(-)

diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -XXX,XX +XXX,XX @@ static void fdt_add_fw_cfg_node(const LoongArchMachineState *lams)
     g_free(nodename);
 }
 
-static void fdt_add_pcie_node(const LoongArchMachineState *lams)
+static void fdt_add_pcie_irq_map_node(const LoongArchMachineState *lams,
+                                      char *nodename,
+                                      uint32_t *pch_pic_phandle)
+{
+    int pin, dev;
+    uint32_t irq_map_stride = 0;
+    uint32_t full_irq_map[GPEX_NUM_IRQS *GPEX_NUM_IRQS * 10] = {};
+    uint32_t *irq_map = full_irq_map;
+    const MachineState *ms = MACHINE(lams);
+
+    /* This code creates a standard swizzle of interrupts such that
+     * each device's first interrupt is based on it's PCI_SLOT number.
+     * (See pci_swizzle_map_irq_fn())
+     *
+     * We only need one entry per interrupt in the table (not one per
+     * possible slot) seeing the interrupt-map-mask will allow the table
+     * to wrap to any number of devices.
+     */
+
+    for (dev = 0; dev < GPEX_NUM_IRQS; dev++) {
+        int devfn = dev * 0x8;
+
+        for (pin = 0; pin  < GPEX_NUM_IRQS; pin++) {
+            int irq_nr = 16 + ((pin + PCI_SLOT(devfn)) % GPEX_NUM_IRQS);
+            int i = 0;
+
+            /* Fill PCI address cells */
+            irq_map[i] = cpu_to_be32(devfn << 8);
+            i += 3;
+
+            /* Fill PCI Interrupt cells */
+            irq_map[i] = cpu_to_be32(pin + 1);
+            i += 1;
+
+            /* Fill interrupt controller phandle and cells */
+            irq_map[i++] = cpu_to_be32(*pch_pic_phandle);
+            irq_map[i++] = cpu_to_be32(irq_nr);
+
+            if (!irq_map_stride) {
+                irq_map_stride = i;
+            }
+            irq_map += irq_map_stride;
+        }
+    }
+
+
+    qemu_fdt_setprop(ms->fdt, nodename, "interrupt-map", full_irq_map,
+                     GPEX_NUM_IRQS * GPEX_NUM_IRQS *
+                     irq_map_stride * sizeof(uint32_t));
+    qemu_fdt_setprop_cells(ms->fdt, nodename, "interrupt-map-mask",
+                     0x1800, 0, 0, 0x7);
+}
+
+static void fdt_add_pcie_node(const LoongArchMachineState *lams,
+                              uint32_t *pch_pic_phandle,
+                              uint32_t *pch_msi_phandle)
 {
     char *nodename;
     hwaddr base_mmio = VIRT_PCI_MEM_BASE;
@@ -XXX,XX +XXX,XX @@ static void fdt_add_pcie_node(const LoongArchMachineState *lams)
                                  2, base_pio, 2, size_pio,
                                  1, FDT_PCI_RANGE_MMIO, 2, base_mmio,
                                  2, base_mmio, 2, size_mmio);
+    qemu_fdt_setprop_cells(ms->fdt, nodename, "msi-map",
+                           0, *pch_msi_phandle, 0, 0x10000);
+
+    fdt_add_pcie_irq_map_node(lams, nodename, pch_pic_phandle);
+
     g_free(nodename);
 }
 
@@ -XXX,XX +XXX,XX @@ static DeviceState *create_platform_bus(DeviceState *pch_pic)
     return dev;
 }
 
-static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState *lams)
+static void loongarch_devices_init(DeviceState *pch_pic,
+                                   LoongArchMachineState *lams,
+                                   uint32_t *pch_pic_phandle,
+                                   uint32_t *pch_msi_phandle)
 {
     MachineClass *mc = MACHINE_GET_CLASS(lams);
     DeviceState *gpex_dev;
@@ -XXX,XX +XXX,XX @@ static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState *
         gpex_set_irq_num(GPEX_HOST(gpex_dev), i, 16 + i);
     }
 
+    /* Add pcie node */
+    fdt_add_pcie_node(lams, pch_pic_phandle, pch_msi_phandle);
+
     serial_mm_init(get_system_memory(), VIRT_UART_BASE, 0,
                    qdev_get_gpio_in(pch_pic,
                                     VIRT_UART_IRQ - VIRT_GSI_BASE),
@@ -XXX,XX +XXX,XX @@ static void loongarch_irq_init(LoongArchMachineState *lams)
     /* Add PCH MSI node */
     fdt_add_pch_msi_node(lams, &eiointc_phandle, &pch_msi_phandle);
 
-    loongarch_devices_init(pch_pic, lams);
+    loongarch_devices_init(pch_pic, lams, &pch_pic_phandle, &pch_msi_phandle);
 }
 
 static void loongarch_firmware_init(LoongArchMachineState *lams)
@@ -XXX,XX +XXX,XX @@ static void loongarch_init(MachineState *machine)
     lams->powerdown_notifier.notify = virt_powerdown_req;
     qemu_register_powerdown_notifier(&lams->powerdown_notifier);
 
-    fdt_add_pcie_node(lams);
     /*
      * Since lowmem region starts from 0 and Linux kernel legacy start address
      * at 2 MiB, FDT base address is located at 1 MiB to avoid NULL pointer
-- 
2.34.1

Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-16-gaosong@loongson.cn>
---
 hw/loongarch/virt.c | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -XXX,XX +XXX,XX @@ static void fdt_add_pcie_node(const LoongArchMachineState *lams,
     g_free(nodename);
 }
 
-static void fdt_add_irqchip_node(LoongArchMachineState *lams)
-{
-    MachineState *ms = MACHINE(lams);
-    char *nodename;
-    uint32_t irqchip_phandle;
-
-    irqchip_phandle = qemu_fdt_alloc_phandle(ms->fdt);
-    qemu_fdt_setprop_cell(ms->fdt, "/", "interrupt-parent", irqchip_phandle);
-
-    nodename = g_strdup_printf("/intc@%lx", VIRT_IOAPIC_REG_BASE);
-    qemu_fdt_add_subnode(ms->fdt, nodename);
-    qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 3);
-    qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0);
-    qemu_fdt_setprop_cell(ms->fdt, nodename, "#address-cells", 0x2);
-    qemu_fdt_setprop_cell(ms->fdt, nodename, "#size-cells", 0x2);
-    qemu_fdt_setprop(ms->fdt, nodename, "ranges", NULL, 0);
-
-    qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
-                            "loongarch,ls7a");
-
-    qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg",
-                                 2, VIRT_IOAPIC_REG_BASE,
-                                 2, PCH_PIC_ROUTE_ENTRY_OFFSET);
-
-    qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", irqchip_phandle);
-    g_free(nodename);
-}
-
 static void fdt_add_memory_node(MachineState *ms,
                                 uint64_t base, uint64_t size, int node_id)
 {
@@ -XXX,XX +XXX,XX @@ static void loongarch_init(MachineState *machine)
 
     /* Initialize the IO interrupt subsystem */
     loongarch_irq_init(lams);
-    fdt_add_irqchip_node(lams);
-    platform_bus_add_all_fdt_nodes(machine->fdt, "/intc",
+    platform_bus_add_all_fdt_nodes(machine->fdt, "/platic",
                                    VIRT_PLATFORM_BUS_BASEADDRESS,
                                    VIRT_PLATFORM_BUS_SIZE,
                                    VIRT_PLATFORM_BUS_IRQ);
-- 
2.34.1

The following changes since commit 38d0939b86e2eef6f6a622c6f1f7befda0146595:

Merge tag 'pull-vfio-20241226' of https://github.com/legoater/qemu into staging (2024-12-26 04:38:38 -0500)

are available in the Git repository at:

https://gitlab.com/bibo-mao/qemu.git tags/pull-loongarch-20241227

for you to fetch changes up to 5e360dabedb1ab1f15cce27a134ccbe4b8e18424:

target/loongarch: Use auto method with LASX feature (2024-12-27 11:33:06 +0800)

----------------------------------------------------------------
pull-loongarch-20241227
v1 ... v2
  1. Modify patch auther inconsistent with SOB

----------------------------------------------------------------
Bibo Mao (5):
      target/loongarch: Use actual operand size with vbsrl check
      hw/loongarch/virt: Create fdt table on machine creation done notification
      hw/loongarch/virt: Improve fdt table creation for CPU object
      target/loongarch: Use auto method with LSX feature
      target/loongarch: Use auto method with LASX feature

Guo Hongyu (1):
      target/loongarch: Fix vldi inst

hw/loongarch/virt.c                             | 142 ++++++++++++++----------
 target/loongarch/cpu.c                          |  86 ++++++++------
 target/loongarch/cpu.h                          |   4 +
 target/loongarch/kvm/kvm.c                      | 107 ++++++++++++++++++
 target/loongarch/tcg/insn_trans/trans_vec.c.inc |   4 +-
 5 files changed, 249 insertions(+), 94 deletions(-)

From: Guo Hongyu <guohongyu24@mails.ucas.ac.cn>

Refer to the link below for a description of the vldi instructions:
https://jia.je/unofficial-loongarch-intrinsics-guide/lsx/misc/#synopsis_88
Fixed errors in vldi instruction implementation.

Signed-off-by: Guo Hongyu <guohongyu24@mails.ucas.ac.cn>
Tested-by: Xianglai Li <lixianglai@loongson.cn>
Signed-off-by: Xianglai Li <lixianglai@loongson.cn>
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 target/loongarch/tcg/insn_trans/trans_vec.c.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/loongarch/tcg/insn_trans/trans_vec.c.inc b/target/loongarch/tcg/insn_trans/trans_vec.c.inc
index XXXXXXX..XXXXXXX 100644
--- a/target/loongarch/tcg/insn_trans/trans_vec.c.inc
+++ b/target/loongarch/tcg/insn_trans/trans_vec.c.inc
@@ -XXX,XX +XXX,XX @@ static uint64_t vldi_get_value(DisasContext *ctx, uint32_t imm)
         break;
     case 1:
         /* data: {2{16'0, imm[7:0], 8'0}} */
-        data = (t << 24) | (t << 8);
+        data = (t << 40) | (t << 8);
         break;
     case 2:
         /* data: {2{8'0, imm[7:0], 16'0}} */
-- 
2.43.5

Hardcoded 32 bytes is used for vbsrl emulation check, there is
problem when options lsx=on,lasx=off is used for vbsrl.v instruction
in TCG mode. It injects LASX exception rather LSX exception.

Here actual operand size is used.

Cc: qemu-stable@nongnu.org
Fixes: df97f338076 ("target/loongarch: Implement xvreplve xvinsve0 xvpickve")
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/loongarch/tcg/insn_trans/trans_vec.c.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/loongarch/tcg/insn_trans/trans_vec.c.inc b/target/loongarch/tcg/insn_trans/trans_vec.c.inc
index XXXXXXX..XXXXXXX 100644
--- a/target/loongarch/tcg/insn_trans/trans_vec.c.inc
+++ b/target/loongarch/tcg/insn_trans/trans_vec.c.inc
@@ -XXX,XX +XXX,XX @@ static bool do_vbsrl_v(DisasContext *ctx, arg_vv_i *a, uint32_t oprsz)
 {
     int i, ofs;
 
-    if (!check_vec(ctx, 32)) {
+    if (!check_vec(ctx, oprsz)) {
         return true;
     }
 
-- 
2.43.5

The same with ACPI table, fdt table is created on machine done
notification. Some objects like CPU objects can be created with cold-plug
method with command such as -smp x, -device la464-loongarch-cpu, so all
objects finish to create when machine is done.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
---
 hw/loongarch/virt.c | 103 ++++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 46 deletions(-)

diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -XXX,XX +XXX,XX @@ static void virt_build_smbios(LoongArchVirtMachineState *lvms)
     }
 }
 
+static void virt_fdt_setup(LoongArchVirtMachineState *lvms)
+{
+    MachineState *machine = MACHINE(lvms);
+    uint32_t cpuintc_phandle, eiointc_phandle, pch_pic_phandle, pch_msi_phandle;
+    int i;
+
+    create_fdt(lvms);
+    fdt_add_cpu_nodes(lvms);
+    fdt_add_memory_nodes(machine);
+    fdt_add_fw_cfg_node(lvms);
+    fdt_add_flash_node(lvms);
+
+    /* Add cpu interrupt-controller */
+    fdt_add_cpuic_node(lvms, &cpuintc_phandle);
+    /* Add Extend I/O Interrupt Controller node */
+    fdt_add_eiointc_node(lvms, &cpuintc_phandle, &eiointc_phandle);
+    /* Add PCH PIC node */
+    fdt_add_pch_pic_node(lvms, &eiointc_phandle, &pch_pic_phandle);
+    /* Add PCH MSI node */
+    fdt_add_pch_msi_node(lvms, &eiointc_phandle, &pch_msi_phandle);
+    /* Add pcie node */
+    fdt_add_pcie_node(lvms, &pch_pic_phandle, &pch_msi_phandle);
+
+    /*
+     * Create uart fdt node in reverse order so that they appear
+     * in the finished device tree lowest address first
+     */
+    for (i = VIRT_UART_COUNT; i-- > 0;) {
+        hwaddr base = VIRT_UART_BASE + i * VIRT_UART_SIZE;
+        int irq = VIRT_UART_IRQ + i - VIRT_GSI_BASE;
+        fdt_add_uart_node(lvms, &pch_pic_phandle, base, irq, i == 0);
+    }
+
+    fdt_add_rtc_node(lvms, &pch_pic_phandle);
+    fdt_add_ged_reset(lvms);
+    platform_bus_add_all_fdt_nodes(machine->fdt, "/platic",
+                                   VIRT_PLATFORM_BUS_BASEADDRESS,
+                                   VIRT_PLATFORM_BUS_SIZE,
+                                   VIRT_PLATFORM_BUS_IRQ);
+
+    /*
+     * Since lowmem region starts from 0 and Linux kernel legacy start address
+     * at 2 MiB, FDT base address is located at 1 MiB to avoid NULL pointer
+     * access. FDT size limit with 1 MiB.
+     * 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.
+     */
+    qemu_fdt_dumpdtb(machine->fdt, lvms->fdt_size);
+    rom_add_blob_fixed_as("fdt", machine->fdt, lvms->fdt_size, FDT_BASE,
+                          &address_space_memory);
+    qemu_register_reset_nosnapshotload(qemu_fdt_randomize_seeds,
+            rom_ptr_for_as(&address_space_memory, FDT_BASE, lvms->fdt_size));
+}
+
 static void virt_done(Notifier *notifier, void *data)
 {
     LoongArchVirtMachineState *lvms = container_of(notifier,
                                       LoongArchVirtMachineState, machine_done);
     virt_build_smbios(lvms);
     loongarch_acpi_setup(lvms);
+    virt_fdt_setup(lvms);
 }
 
 static void virt_powerdown_req(Notifier *notifier, void *opaque)
@@ -XXX,XX +XXX,XX @@ static DeviceState *create_platform_bus(DeviceState *pch_pic)
 }
 
 static void virt_devices_init(DeviceState *pch_pic,
-                                   LoongArchVirtMachineState *lvms,
-                                   uint32_t *pch_pic_phandle,
-                                   uint32_t *pch_msi_phandle)
+                                   LoongArchVirtMachineState *lvms)
 {
     MachineClass *mc = MACHINE_GET_CLASS(lvms);
     DeviceState *gpex_dev;
@@ -XXX,XX +XXX,XX @@ static void virt_devices_init(DeviceState *pch_pic,
         gpex_set_irq_num(GPEX_HOST(gpex_dev), i, 16 + i);
     }
 
-    /* Add pcie node */
-    fdt_add_pcie_node(lvms, pch_pic_phandle, pch_msi_phandle);
-
     /*
      * Create uart fdt node in reverse order so that they appear
      * in the finished device tree lowest address first
@@ -XXX,XX +XXX,XX @@ static void virt_devices_init(DeviceState *pch_pic,
         serial_mm_init(get_system_memory(), base, 0,
                        qdev_get_gpio_in(pch_pic, irq),
                        115200, serial_hd(i), DEVICE_LITTLE_ENDIAN);
-        fdt_add_uart_node(lvms, pch_pic_phandle, base, irq, i == 0);
     }
 
     /* Network init */
@@ -XXX,XX +XXX,XX @@ static void virt_devices_init(DeviceState *pch_pic,
     sysbus_create_simple("ls7a_rtc", VIRT_RTC_REG_BASE,
                          qdev_get_gpio_in(pch_pic,
                          VIRT_RTC_IRQ - VIRT_GSI_BASE));
-    fdt_add_rtc_node(lvms, pch_pic_phandle);
-    fdt_add_ged_reset(lvms);
 
     /* acpi ged */
     lvms->acpi_ged = create_acpi_ged(pch_pic, lvms);
@@ -XXX,XX +XXX,XX @@ static void virt_irq_init(LoongArchVirtMachineState *lvms)
     CPULoongArchState *env;
     CPUState *cpu_state;
     int cpu, pin, i, start, num;
-    uint32_t cpuintc_phandle, eiointc_phandle, pch_pic_phandle, pch_msi_phandle;
 
     /*
      * Extended IRQ model.
@@ -XXX,XX +XXX,XX @@ static void virt_irq_init(LoongArchVirtMachineState *lvms)
     memory_region_add_subregion(&lvms->system_iocsr, MAIL_SEND_ADDR,
                    sysbus_mmio_get_region(SYS_BUS_DEVICE(ipi), 1));
 
-    /* Add cpu interrupt-controller */
-    fdt_add_cpuic_node(lvms, &cpuintc_phandle);
-
     for (cpu = 0; cpu < ms->smp.cpus; cpu++) {
         cpu_state = qemu_get_cpu(cpu);
         cpudev = DEVICE(cpu_state);
@@ -XXX,XX +XXX,XX @@ static void virt_irq_init(LoongArchVirtMachineState *lvms)
         }
     }
 
-    /* Add Extend I/O Interrupt Controller node */
-    fdt_add_eiointc_node(lvms, &cpuintc_phandle, &eiointc_phandle);
-
     pch_pic = qdev_new(TYPE_LOONGARCH_PIC);
     num = VIRT_PCH_PIC_IRQ_NUM;
     qdev_prop_set_uint32(pch_pic, "pch_pic_irq_num", num);
@@ -XXX,XX +XXX,XX @@ static void virt_irq_init(LoongArchVirtMachineState *lvms)
         qdev_connect_gpio_out(DEVICE(d), i, qdev_get_gpio_in(extioi, i));
     }
 
-    /* Add PCH PIC node */
-    fdt_add_pch_pic_node(lvms, &eiointc_phandle, &pch_pic_phandle);
-
     pch_msi = qdev_new(TYPE_LOONGARCH_PCH_MSI);
     start   =  num;
     num = EXTIOI_IRQS - start;
@@ -XXX,XX +XXX,XX @@ static void virt_irq_init(LoongArchVirtMachineState *lvms)
                               qdev_get_gpio_in(extioi, i + start));
     }
 
-    /* Add PCH MSI node */
-    fdt_add_pch_msi_node(lvms, &eiointc_phandle, &pch_msi_phandle);
-
-    virt_devices_init(pch_pic, lvms, &pch_pic_phandle, &pch_msi_phandle);
+    virt_devices_init(pch_pic, lvms);
 }
 
 static void virt_firmware_init(LoongArchVirtMachineState *lvms)
@@ -XXX,XX +XXX,XX @@ static void virt_init(MachineState *machine)
         cpu_model = LOONGARCH_CPU_TYPE_NAME("la464");
     }
 
-    create_fdt(lvms);
-
     /* Create IOCSR space */
     memory_region_init_io(&lvms->system_iocsr, OBJECT(machine), NULL,
                           machine, "iocsr", UINT64_MAX);
@@ -XXX,XX +XXX,XX @@ static void virt_init(MachineState *machine)
         lacpu = LOONGARCH_CPU(cpu);
         lacpu->phy_id = machine->possible_cpus->cpus[i].arch_id;
     }
-    fdt_add_cpu_nodes(lvms);
-    fdt_add_memory_nodes(machine);
     fw_cfg_add_memory(machine);
 
     /* Node0 memory */
@@ -XXX,XX +XXX,XX @@ static void virt_init(MachineState *machine)
                         memmap_table,
                         sizeof(struct memmap_entry) * (memmap_entries));
     }
-    fdt_add_fw_cfg_node(lvms);
-    fdt_add_flash_node(lvms);
 
     /* Initialize the IO interrupt subsystem */
     virt_irq_init(lvms);
-    platform_bus_add_all_fdt_nodes(machine->fdt, "/platic",
-                                   VIRT_PLATFORM_BUS_BASEADDRESS,
-                                   VIRT_PLATFORM_BUS_SIZE,
-                                   VIRT_PLATFORM_BUS_IRQ);
     lvms->machine_done.notify = virt_done;
     qemu_add_machine_init_done_notifier(&lvms->machine_done);
      /* connect powerdown request */
     lvms->powerdown_notifier.notify = virt_powerdown_req;
     qemu_register_powerdown_notifier(&lvms->powerdown_notifier);
 
-    /*
-     * Since lowmem region starts from 0 and Linux kernel legacy start address
-     * at 2 MiB, FDT base address is located at 1 MiB to avoid NULL pointer
-     * access. FDT size limit with 1 MiB.
-     * 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.
-     */
-    qemu_fdt_dumpdtb(machine->fdt, lvms->fdt_size);
-    rom_add_blob_fixed_as("fdt", machine->fdt, lvms->fdt_size, FDT_BASE,
-                          &address_space_memory);
-    qemu_register_reset_nosnapshotload(qemu_fdt_randomize_seeds,
-            rom_ptr_for_as(&address_space_memory, FDT_BASE, lvms->fdt_size));
-
     lvms->bootinfo.ram_size = ram_size;
     loongarch_load_kernel(machine, &lvms->bootinfo);
 }
-- 
2.43.5

For CPU object, possible_cpu_arch_ids() function is used rather than
smp.cpus. With command -smp x, -device la464-loongarch-cpu, smp.cpus
is not accurate for all possible CPU objects, possible_cpu_arch_ids()
is used here.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
---
 hw/loongarch/virt.c | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

Like LBT feature, add type OnOffAuto for LSX feature setting. Also
add LSX feature detection with new VM ioctl command, fallback to old
method if it is not supported.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
---
 target/loongarch/cpu.c     | 38 +++++++++++++++------------
 target/loongarch/cpu.h     |  2 ++
 target/loongarch/kvm/kvm.c | 54 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+), 17 deletions(-)

diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index XXXXXXX..XXXXXXX 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -XXX,XX +XXX,XX @@ static void loongarch_la464_initfn(Object *obj)
 {
     LoongArchCPU *cpu = LOONGARCH_CPU(obj);
     CPULoongArchState *env = &cpu->env;
+    uint32_t data = 0;
     int i;
 
     for (i = 0; i < 21; i++) {
@@ -XXX,XX +XXX,XX @@ static void loongarch_la464_initfn(Object *obj)
     cpu->dtb_compatible = "loongarch,Loongson-3A5000";
     env->cpucfg[0] = 0x14c010;  /* PRID */
 
-    uint32_t data = 0;
     data = FIELD_DP32(data, CPUCFG1, ARCH, 2);
     data = FIELD_DP32(data, CPUCFG1, PGMMU, 1);
     data = FIELD_DP32(data, CPUCFG1, IOCSR, 1);
@@ -XXX,XX +XXX,XX @@ static void loongarch_la132_initfn(Object *obj)
 {
     LoongArchCPU *cpu = LOONGARCH_CPU(obj);
     CPULoongArchState *env = &cpu->env;
-
+    uint32_t data = 0;
     int i;
 
     for (i = 0; i < 21; i++) {
@@ -XXX,XX +XXX,XX @@ static void loongarch_la132_initfn(Object *obj)
     cpu->dtb_compatible = "loongarch,Loongson-1C103";
     env->cpucfg[0] = 0x148042;  /* PRID */
 
-    uint32_t data = 0;
     data = FIELD_DP32(data, CPUCFG1, ARCH, 1); /* LA32 */
     data = FIELD_DP32(data, CPUCFG1, PGMMU, 1);
     data = FIELD_DP32(data, CPUCFG1, IOCSR, 1);
@@ -XXX,XX +XXX,XX @@ static void loongarch_cpu_realizefn(DeviceState *dev, Error **errp)
 
 static bool loongarch_get_lsx(Object *obj, Error **errp)
 {
-    LoongArchCPU *cpu = LOONGARCH_CPU(obj);
-    bool ret;
-
-    if (FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LSX)) {
-        ret = true;
-    } else {
-        ret = false;
-    }
-    return ret;
+    return LOONGARCH_CPU(obj)->lsx != ON_OFF_AUTO_OFF;
 }
 
 static void loongarch_set_lsx(Object *obj, bool value, Error **errp)
 {
     LoongArchCPU *cpu = LOONGARCH_CPU(obj);
+    uint32_t val;
 
-    if (value) {
-        cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LSX, 1);
-    } else {
-        cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LSX, 0);
-        cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LASX, 0);
+    cpu->lsx = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
+    if (kvm_enabled()) {
+        /* kvm feature detection in function kvm_arch_init_vcpu */
+        return;
     }
+
+    /* LSX feature detection in TCG mode */
+    val = cpu->env.cpucfg[2];
+    if (cpu->lsx == ON_OFF_AUTO_ON) {
+        if (FIELD_EX32(val, CPUCFG2, LSX) == 0) {
+            error_setg(errp, "Failed to enable LSX in TCG mode");
+            return;
+        }
+    }
+
+    cpu->env.cpucfg[2] = FIELD_DP32(val, CPUCFG2, LSX, value);
 }
 
 static bool loongarch_get_lasx(Object *obj, Error **errp)
@@ -XXX,XX +XXX,XX @@ void loongarch_cpu_post_init(Object *obj)
 {
     LoongArchCPU *cpu = LOONGARCH_CPU(obj);
 
+    cpu->lsx = ON_OFF_AUTO_AUTO;
     object_property_add_bool(obj, "lsx", loongarch_get_lsx,
                              loongarch_set_lsx);
     object_property_add_bool(obj, "lasx", loongarch_get_lasx,
@@ -XXX,XX +XXX,XX @@ void loongarch_cpu_post_init(Object *obj)
 
     } else {
         cpu->lbt = ON_OFF_AUTO_OFF;
+        cpu->pmu = ON_OFF_AUTO_OFF;
     }
 }
 
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
index XXXXXXX..XXXXXXX 100644
--- a/target/loongarch/cpu.h
+++ b/target/loongarch/cpu.h
@@ -XXX,XX +XXX,XX @@ typedef struct LoongArchTLB LoongArchTLB;
 #endif
 
 enum loongarch_features {
+    LOONGARCH_FEATURE_LSX,
     LOONGARCH_FEATURE_LBT, /* loongson binary translation extension */
     LOONGARCH_FEATURE_PMU,
 };
@@ -XXX,XX +XXX,XX @@ struct ArchCPU {
     uint32_t  phy_id;
     OnOffAuto lbt;
     OnOffAuto pmu;
+    OnOffAuto lsx;
 
     /* 'compatible' string for this CPU for Linux device trees */
     const char *dtb_compatible;
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
index XXXXXXX..XXXXXXX 100644
--- a/target/loongarch/kvm/kvm.c
+++ b/target/loongarch/kvm/kvm.c
@@ -XXX,XX +XXX,XX @@ static bool kvm_feature_supported(CPUState *cs, enum loongarch_features feature)
 {
     int ret;
     struct kvm_device_attr attr;
+    uint64_t val;
 
     switch (feature) {
+    case LOONGARCH_FEATURE_LSX:
+        attr.group = KVM_LOONGARCH_VM_FEAT_CTRL;
+        attr.attr = KVM_LOONGARCH_VM_FEAT_LSX;
+        ret = kvm_vm_ioctl(kvm_state, KVM_HAS_DEVICE_ATTR, &attr);
+        if (ret == 0) {
+            return true;
+        }
+
+        /* Fallback to old kernel detect interface */
+        val = 0;
+        attr.group = KVM_LOONGARCH_VCPU_CPUCFG;
+        /* Cpucfg2 */
+        attr.attr  = 2;
+        attr.addr = (uint64_t)&val;
+        ret = kvm_vcpu_ioctl(cs, KVM_HAS_DEVICE_ATTR, &attr);
+        if (!ret) {
+            ret = kvm_vcpu_ioctl(cs, KVM_GET_DEVICE_ATTR, &attr);
+            if (ret) {
+                return false;
+            }
+
+            ret = FIELD_EX32((uint32_t)val, CPUCFG2, LSX);
+            return (ret != 0);
+        }
+        return false;
+
     case LOONGARCH_FEATURE_LBT:
         /*
          * Return all if all the LBT features are supported such as:
@@ -XXX,XX +XXX,XX @@ static bool kvm_feature_supported(CPUState *cs, enum loongarch_features feature)
     return false;
 }
 
+static int kvm_cpu_check_lsx(CPUState *cs, Error **errp)
+{
+    CPULoongArchState *env = cpu_env(cs);
+    LoongArchCPU *cpu = LOONGARCH_CPU(cs);
+    bool kvm_supported;
+
+    kvm_supported = kvm_feature_supported(cs, LOONGARCH_FEATURE_LSX);
+    env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LSX, 0);
+    if (cpu->lsx == ON_OFF_AUTO_ON) {
+        if (kvm_supported) {
+            env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LSX, 1);
+        } else {
+            error_setg(errp, "'lsx' feature not supported by KVM on this host");
+            return -ENOTSUP;
+        }
+    } else if ((cpu->lsx == ON_OFF_AUTO_AUTO) && kvm_supported) {
+        env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LSX, 1);
+    }
+
+    return 0;
+}
+
 static int kvm_cpu_check_lbt(CPUState *cs, Error **errp)
 {
     CPULoongArchState *env = cpu_env(cs);
@@ -XXX,XX +XXX,XX @@ int kvm_arch_init_vcpu(CPUState *cs)
         brk_insn = val;
     }
 
+    ret = kvm_cpu_check_lsx(cs, &local_err);
+    if (ret < 0) {
+        error_report_err(local_err);
+    }
+
     ret = kvm_cpu_check_lbt(cs, &local_err);
     if (ret < 0) {
         error_report_err(local_err);
-- 
2.43.5

Like LSX feature, add type OnOffAuto for LASX feature setting.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
---
 target/loongarch/cpu.c     | 50 +++++++++++++++++++++++------------
 target/loongarch/cpu.h     |  2 ++
 target/loongarch/kvm/kvm.c | 53 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+), 16 deletions(-)

diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index XXXXXXX..XXXXXXX 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -XXX,XX +XXX,XX @@ static void loongarch_set_lsx(Object *obj, bool value, Error **errp)
     uint32_t val;
 
     cpu->lsx = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
+    if (cpu->lsx == ON_OFF_AUTO_OFF) {
+        cpu->lasx = ON_OFF_AUTO_OFF;
+        if (cpu->lasx == ON_OFF_AUTO_ON) {
+            error_setg(errp, "Failed to disable LSX since LASX is enabled");
+            return;
+        }
+    }
+
     if (kvm_enabled()) {
         /* kvm feature detection in function kvm_arch_init_vcpu */
         return;
@@ -XXX,XX +XXX,XX @@ static void loongarch_set_lsx(Object *obj, bool value, Error **errp)
             error_setg(errp, "Failed to enable LSX in TCG mode");
             return;
         }
+    } else {
+        cpu->env.cpucfg[2] = FIELD_DP32(val, CPUCFG2, LASX, 0);
+        val = cpu->env.cpucfg[2];
     }
 
     cpu->env.cpucfg[2] = FIELD_DP32(val, CPUCFG2, LSX, value);
@@ -XXX,XX +XXX,XX @@ static void loongarch_set_lsx(Object *obj, bool value, Error **errp)
 
 static bool loongarch_get_lasx(Object *obj, Error **errp)
 {
-    LoongArchCPU *cpu = LOONGARCH_CPU(obj);
-    bool ret;
-
-    if (FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LASX)) {
-        ret = true;
-    } else {
-        ret = false;
-    }
-    return ret;
+    return LOONGARCH_CPU(obj)->lasx != ON_OFF_AUTO_OFF;
 }
 
 static void loongarch_set_lasx(Object *obj, bool value, Error **errp)
 {
     LoongArchCPU *cpu = LOONGARCH_CPU(obj);
+    uint32_t val;
 
-    if (value) {
-	if (!FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LSX)) {
-            cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LSX, 1);
-	}
-        cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LASX, 1);
-    } else {
-        cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LASX, 0);
+    cpu->lasx = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
+    if ((cpu->lsx == ON_OFF_AUTO_OFF) && (cpu->lasx == ON_OFF_AUTO_ON)) {
+        error_setg(errp, "Failed to enable LASX since lSX is disabled");
+        return;
+    }
+
+    if (kvm_enabled()) {
+        /* kvm feature detection in function kvm_arch_init_vcpu */
+        return;
     }
+
+    /* LASX feature detection in TCG mode */
+    val = cpu->env.cpucfg[2];
+    if (cpu->lasx == ON_OFF_AUTO_ON) {
+        if (FIELD_EX32(val, CPUCFG2, LASX) == 0) {
+            error_setg(errp, "Failed to enable LASX in TCG mode");
+            return;
+        }
+    }
+
+    cpu->env.cpucfg[2] = FIELD_DP32(val, CPUCFG2, LASX, value);
 }
 
 static bool loongarch_get_lbt(Object *obj, Error **errp)
@@ -XXX,XX +XXX,XX @@ void loongarch_cpu_post_init(Object *obj)
     LoongArchCPU *cpu = LOONGARCH_CPU(obj);
 
     cpu->lsx = ON_OFF_AUTO_AUTO;
+    cpu->lasx = ON_OFF_AUTO_AUTO;
     object_property_add_bool(obj, "lsx", loongarch_get_lsx,
                              loongarch_set_lsx);
     object_property_add_bool(obj, "lasx", loongarch_get_lasx,
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
index XXXXXXX..XXXXXXX 100644
--- a/target/loongarch/cpu.h
+++ b/target/loongarch/cpu.h
@@ -XXX,XX +XXX,XX @@ typedef struct LoongArchTLB LoongArchTLB;
 
 enum loongarch_features {
     LOONGARCH_FEATURE_LSX,
+    LOONGARCH_FEATURE_LASX,
     LOONGARCH_FEATURE_LBT, /* loongson binary translation extension */
     LOONGARCH_FEATURE_PMU,
 };
@@ -XXX,XX +XXX,XX @@ struct ArchCPU {
     OnOffAuto lbt;
     OnOffAuto pmu;
     OnOffAuto lsx;
+    OnOffAuto lasx;
 
     /* 'compatible' string for this CPU for Linux device trees */
     const char *dtb_compatible;
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
index XXXXXXX..XXXXXXX 100644
--- a/target/loongarch/kvm/kvm.c
+++ b/target/loongarch/kvm/kvm.c
@@ -XXX,XX +XXX,XX @@ static bool kvm_feature_supported(CPUState *cs, enum loongarch_features feature)
         }
         return false;
 
+    case LOONGARCH_FEATURE_LASX:
+        attr.group = KVM_LOONGARCH_VM_FEAT_CTRL;
+        attr.attr = KVM_LOONGARCH_VM_FEAT_LASX;
+        ret = kvm_vm_ioctl(kvm_state, KVM_HAS_DEVICE_ATTR, &attr);
+        if (ret == 0) {
+            return true;
+        }
+
+        /* Fallback to old kernel detect interface */
+        val = 0;
+        attr.group = KVM_LOONGARCH_VCPU_CPUCFG;
+        /* Cpucfg2 */
+        attr.attr  = 2;
+        attr.addr = (uint64_t)&val;
+        ret = kvm_vcpu_ioctl(cs, KVM_HAS_DEVICE_ATTR, &attr);
+        if (!ret) {
+            ret = kvm_vcpu_ioctl(cs, KVM_GET_DEVICE_ATTR, &attr);
+            if (ret) {
+                return false;
+            }
+
+            ret = FIELD_EX32((uint32_t)val, CPUCFG2, LASX);
+            return (ret != 0);
+        }
+        return false;
+
     case LOONGARCH_FEATURE_LBT:
         /*
          * Return all if all the LBT features are supported such as:
@@ -XXX,XX +XXX,XX @@ static int kvm_cpu_check_lsx(CPUState *cs, Error **errp)
     return 0;
 }
 
+static int kvm_cpu_check_lasx(CPUState *cs, Error **errp)
+{
+    CPULoongArchState *env = cpu_env(cs);
+    LoongArchCPU *cpu = LOONGARCH_CPU(cs);
+    bool kvm_supported;
+
+    kvm_supported = kvm_feature_supported(cs, LOONGARCH_FEATURE_LASX);
+    env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LASX, 0);
+    if (cpu->lasx == ON_OFF_AUTO_ON) {
+        if (kvm_supported) {
+            env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LASX, 1);
+        } else {
+            error_setg(errp, "'lasx' feature not supported by KVM on host");
+            return -ENOTSUP;
+        }
+    } else if ((cpu->lasx == ON_OFF_AUTO_AUTO) && kvm_supported) {
+        env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LASX, 1);
+    }
+
+    return 0;
+}
+
 static int kvm_cpu_check_lbt(CPUState *cs, Error **errp)
 {
     CPULoongArchState *env = cpu_env(cs);
@@ -XXX,XX +XXX,XX @@ int kvm_arch_init_vcpu(CPUState *cs)
         error_report_err(local_err);
     }
 
+    ret = kvm_cpu_check_lasx(cs, &local_err);
+    if (ret < 0) {
+        error_report_err(local_err);
+    }
+
     ret = kvm_cpu_check_lbt(cs, &local_err);
     if (ret < 0) {
         error_report_err(local_err);
-- 
2.43.5