Series comparison

-[PULL 0/5] loongarch-to-apply queue
+[PULL 00/15] loongarch-to-apply queue
-The following changes since commit 922582ace2df59572a671f5c0c5c6c5c706995e5:
+The following changes since commit 661c2e1ab29cd9c4d268ae3f44712e8d421c0e56:
-  Merge tag 'pull-hppa-20240515' of https://gitlab.com/rth7680/qemu into staging (2024-05-15 11:46:58 +0200)
+  scripts/checkpatch: Fix a typo (2025-03-04 09:30:26 +0800)
 are available in the Git repository at:
-  https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20240516
+  https://gitlab.com/bibo-mao/qemu.git tags/pull-loongarch-20250305
-for you to fetch changes up to d55d16700a2e2b36c7e34724d4d77f4a75c5243a:
+for you to fetch changes up to 0a629c827300d514cc1f61806414d214fcf75051:
-  target/loongarch/kvm: fpu save the vreg registers high 192bit (2024-05-16 16:32:35 +0800)
+  target/loongarch: Adjust the cpu reset action to a proper position (2025-03-05 09:45:52 +0800)
 ----------------------------------------------------------------
-pull-loongarch-20240516
+pull-loongarch-20250305 queue
 ----------------------------------------------------------------
-Bibo Mao (3):
+Bibo Mao (14):
-      hw/loongarch: Add compat machine for 9.1
+      hw/intc/loongarch_ipi: Add basic hotplug framework
-      hw/loongarch: Remove minimum and default memory size
+      hw/intc/loongarch_ipi: Implment cpu hotplug interface
-      tests: Add migration test for loongarch64
+      hw/intc/loongarch_ipi: Notify ipi object when cpu is plugged
       hw/intc/loongarch_extioi: Move gpio irq initial to common code
       hw/intc/loongarch_extioi: Add basic hotplug framework
       hw/intc/loongarch_extioi: Implment cpu hotplug interface
       hw/intc/loongarch_extioi: Use cpu plug notification
       hw/loongarch/virt: Add CPU topology support
       hw/loongarch/virt: Add topo properties on CPU object
       hw/loongarch/virt: Add basic cpu plug interface framework
       hw/loongarch/virt: Implement cpu unplug interface
       hw/loongarch/virt: Implement cpu plug interface
       hw/loongarch/virt: Update the ACPI table for hotplug cpu
       hw/loongarch/virt: Enable cpu hotplug feature on virt machine
-Song Gao (2):
+Xianglai Li (1):
-      target/loongarch/kvm: Fix VM recovery from disk failures
+      target/loongarch: Adjust the cpu reset action to a proper position
       target/loongarch/kvm: fpu save the vreg registers high 192bit
- hw/loongarch/virt.c                      | 66 +++++++++++++++++++++++---------
+ hw/intc/loongarch_extioi.c        |   8 +-
- target/loongarch/kvm/kvm.c               |  6 +++
+ hw/intc/loongarch_extioi_common.c |  84 ++++++++++-
- target/loongarch/machine.c               |  6 ++-
+ hw/intc/loongarch_ipi.c           |  71 +++++++++
- tests/migration/Makefile                 |  2 +-
+ hw/loongarch/Kconfig              |   1 +
- tests/migration/loongarch64/Makefile     | 18 +++++++++
+ hw/loongarch/virt-acpi-build.c    |  35 ++++-
- tests/migration/loongarch64/a-b-kernel.S | 49 ++++++++++++++++++++++++
+ hw/loongarch/virt.c               | 301 ++++++++++++++++++++++++++++++++++----
- tests/migration/loongarch64/a-b-kernel.h | 16 ++++++++
+ include/hw/loongarch/virt.h       |   1 +
- tests/migration/migration-test.h         |  3 ++
+ target/loongarch/cpu.c            |  25 +++-
- tests/qtest/meson.build                  |  2 +-
+ target/loongarch/cpu.h            |  11 ++
- tests/qtest/migration-test.c             | 10 +++++
+files changed, 493 insertions(+), 44 deletions(-)
 files changed, 156 insertions(+), 22 deletions(-)
  create mode 100644 tests/migration/loongarch64/Makefile
  create mode 100644 tests/migration/loongarch64/a-b-kernel.S
  create mode 100644 tests/migration/loongarch64/a-b-kernel.h

-[PULL 3/5] tests: Add migration test for loongarch64
+[PULL 01/15] hw/intc/loongarch_ipi: Add basic hotplug framework
-From: Bibo Mao <maobibo@loongson.cn>
+LoongArch ipi can send interrupt to multiple CPUs, interrupt routing
 to CPU comes from destination physical cpu id. Here hotplug interface
 is added for IPI object, so that parent irq line can be connected, and
 routing table can be added for new created cpu.
-This patch adds migration test support for loongarch64. The test code
+Here only basic hotplug framework is added, it is stub function.
 comes from aarch64 mostly, only that it booted as bios in qemu since
 kernel requires elf format and bios uses binary format.
 In addition to providing the binary, this patch also includes the source
 code and the build script in tests/migration/loongarch64. So users can
 change the source and/or re-compile the binary as they wish.
 Signed-off-by: Bibo Mao <maobibo@loongson.cn>
-Acked-by: Thomas Huth <thuth@redhat.com>
-Acked-by: Peter Xu <peterx@redhat.com>
-Reviewed-by: Fabiano Rosas <farosas@suse.de>
-Reviewed-by: Song Gao <gaosong@loongson.cn>
-Tested-by: Song Gao <gaosong@loongson.cn>
-Message-Id: <20240511034220.3030560-4-maobibo@loongson.cn>
-Signed-off-by: Song Gao <gaosong@loongson.cn>
 ---
- tests/migration/Makefile                 |  2 +-
+ hw/intc/loongarch_ipi.c | 32 ++++++++++++++++++++++++++++++++
- tests/migration/loongarch64/Makefile     | 18 +++++++++
+file changed, 32 insertions(+)
  tests/migration/loongarch64/a-b-kernel.S | 49 ++++++++++++++++++++++++
  tests/migration/loongarch64/a-b-kernel.h | 16 ++++++++
  tests/migration/migration-test.h         |  3 ++
  tests/qtest/meson.build                  |  2 +-
  tests/qtest/migration-test.c             | 10 +++++
 files changed, 98 insertions(+), 2 deletions(-)
  create mode 100644 tests/migration/loongarch64/Makefile
  create mode 100644 tests/migration/loongarch64/a-b-kernel.S
  create mode 100644 tests/migration/loongarch64/a-b-kernel.h
-diff --git a/tests/migration/Makefile b/tests/migration/Makefile
+diff --git a/hw/intc/loongarch_ipi.c b/hw/intc/loongarch_ipi.c
 index XXXXXXX..XXXXXXX 100644
---- a/tests/migration/Makefile
+--- a/hw/intc/loongarch_ipi.c
-+++ b/tests/migration/Makefile
++++ b/hw/intc/loongarch_ipi.c
@@ -XXX,XX +XXX,XX @@
  # See the COPYING file in the top-level directory.
  #
 -TARGET_LIST = i386 aarch64 s390x
 +TARGET_LIST = i386 aarch64 s390x loongarch64
  SRC_PATH = ../..
 diff --git a/tests/migration/loongarch64/Makefile b/tests/migration/loongarch64/Makefile
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/tests/migration/loongarch64/Makefile
@@ -XXX,XX +XXX,XX @@
 +# To specify cross compiler prefix, use CROSS_PREFIX=
 +#   $ make CROSS_PREFIX=loongarch64-linux-gnu-
 +
 +.PHONY: all clean
 +all: a-b-kernel.h
 +
 +a-b-kernel.h: loongarch64.kernel
 +    echo "$$__note" > $@
 +    xxd -i $< | sed -e 's/.*int.*//' >> $@
 +
 +loongarch64.kernel: loongarch64.elf
 +    $(CROSS_PREFIX)objcopy -j .text -O binary $< $@
 +
 +loongarch64.elf: a-b-kernel.S
 +    $(CROSS_PREFIX)gcc -o $@ -nostdlib -Wl,--build-id=none $<
 +
 +clean:
 +    $(RM) *.kernel *.elf
 diff --git a/tests/migration/loongarch64/a-b-kernel.S b/tests/migration/loongarch64/a-b-kernel.S
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/tests/migration/loongarch64/a-b-kernel.S
@@ -XXX,XX +XXX,XX @@
 +/* SPDX-License-Identifier: GPL-2.0-or-later */
 +/*
 + * Copyright (c) 2024 Loongson Technology Corporation Limited
 + */
 +#include "../migration-test.h"
 +
 +#define LOONGARCH_CSR_CRMD          0
 +#define LOONGARCH_VIRT_UART         0x1FE001E0
 +.section .text
 +
 +    .globl  _start
 +_start:
 +    /* output char 'A' to UART16550 */
 +    li.d    $t0, LOONGARCH_VIRT_UART
 +    li.w    $t1, 'A'
 +    st.b    $t1, $t0, 0
 +
 +    /* traverse test memory region */
 +    li.d    $t0, LOONGARCH_TEST_MEM_START
 +    li.d    $t1, LOONGARCH_TEST_MEM_END
 +    li.d    $t2, TEST_MEM_PAGE_SIZE
 +    li.d    $t4, LOONGARCH_VIRT_UART
 +    li.w    $t5, 'B'
 +
 +clean:
 +    st.b    $zero, $t0, 0
 +    add.d   $t0,   $t0, $t2
 +    bne     $t0,   $t1, clean
 +    /* keeps a counter so we can limit the output speed */
 +    addi.d  $t6,   $zero, 0
 +
 +mainloop:
 +    li.d    $t0, LOONGARCH_TEST_MEM_START
 +
 +innerloop:
 +    ld.bu   $t3, $t0, 0
 +    addi.w  $t3, $t3, 1
 +    ext.w.b $t3, $t3
 +    st.b    $t3, $t0, 0
 +    add.d   $t0, $t0, $t2
 +    bne     $t0, $t1, innerloop
 +
 +    addi.d  $t6, $t6, 1
 +    andi    $t6, $t6, 31
 +    bnez    $t6, mainloop
 +
 +    st.b    $t5, $t4, 0
 +    b       mainloop
 +    nop
 diff --git a/tests/migration/loongarch64/a-b-kernel.h b/tests/migration/loongarch64/a-b-kernel.h
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/tests/migration/loongarch64/a-b-kernel.h
@@ -XXX,XX +XXX,XX @@
 +/* This file is automatically generated from the assembly file in
 +* tests/migration/loongarch64. Edit that file and then run "make all"
 +* inside tests/migration to update, and then remember to send both
 +* the header and the assembler differences in your patch submission.
 +*/
 +unsigned char loongarch64_kernel[] = {
 +  0x0c, 0xc0, 0x3f, 0x14, 0x8c, 0x81, 0x87, 0x03, 0x0d, 0x04, 0x81, 0x03,
 +  0x8d, 0x01, 0x00, 0x29, 0x0c, 0x00, 0x04, 0x14, 0x0d, 0x80, 0x0c, 0x14,
 +  0x2e, 0x00, 0x00, 0x14, 0x10, 0xc0, 0x3f, 0x14, 0x10, 0x82, 0x87, 0x03,
 +  0x11, 0x08, 0x81, 0x03, 0x80, 0x01, 0x00, 0x29, 0x8c, 0xb9, 0x10, 0x00,
 +  0x8d, 0xf9, 0xff, 0x5f, 0x12, 0x00, 0xc0, 0x02, 0x0c, 0x00, 0x04, 0x14,
 +  0x8f, 0x01, 0x00, 0x2a, 0xef, 0x05, 0x80, 0x02, 0xef, 0x5d, 0x00, 0x00,
 +  0x8f, 0x01, 0x00, 0x29, 0x8c, 0xb9, 0x10, 0x00, 0x8d, 0xed, 0xff, 0x5f,
 +  0x52, 0x06, 0xc0, 0x02, 0x52, 0x7e, 0x40, 0x03, 0x5f, 0xde, 0xff, 0x47,
 +  0x11, 0x02, 0x00, 0x29, 0xff, 0xd7, 0xff, 0x53, 0x00, 0x00, 0x40, 0x03
 +};
 diff --git a/tests/migration/migration-test.h b/tests/migration/migration-test.h
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/migration/migration-test.h
 +++ b/tests/migration/migration-test.h
 @@ -XXX,XX +XXX,XX @@
   */
- #define ARM_TEST_MAX_KERNEL_SIZE (512 * 1024)
+ #include "qemu/osdep.h"
-+/* LoongArch64 */
++#include "qemu/error-report.h"
-+#define LOONGARCH_TEST_MEM_START (32 * 1024 * 1024)
+ #include "hw/boards.h"
-+#define LOONGARCH_TEST_MEM_END   (100 * 1024 * 1024)
+ #include "qapi/error.h"
- #endif /* MIGRATION_TEST_H */
+ #include "hw/intc/loongarch_ipi.h"
-diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
+@@ -XXX,XX +XXX,XX @@ static void loongarch_ipi_realize(DeviceState *dev, Error **errp)
-index XXXXXXX..XXXXXXX 100644
+     }
---- a/tests/qtest/meson.build
+ }
-+++ b/tests/qtest/meson.build
-@@ -XXX,XX +XXX,XX @@ qtests_hppa = ['boot-serial-test'] + \
++static void loongarch_ipi_cpu_plug(HotplugHandler *hotplug_dev,
-   (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
++                                   DeviceState *dev, Error **errp)
++{
- qtests_loongarch64 = qtests_filter + \
++    Object *obj = OBJECT(dev);
--  ['boot-serial-test']
++
-+  ['boot-serial-test', 'migration-test']
++    if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
++        warn_report("LoongArch extioi: Invalid %s device type",
- qtests_m68k = ['boot-serial-test'] + \
++                                       object_get_typename(obj));
-   qtests_filter
++        return;
-diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
++    }
-index XXXXXXX..XXXXXXX 100644
++}
---- a/tests/qtest/migration-test.c
++
-+++ b/tests/qtest/migration-test.c
++static void loongarch_ipi_cpu_unplug(HotplugHandler *hotplug_dev,
-@@ -XXX,XX +XXX,XX @@ static char *bootpath;
++                                     DeviceState *dev, Error **errp)
- #include "tests/migration/i386/a-b-bootblock.h"
++{
- #include "tests/migration/aarch64/a-b-kernel.h"
++    Object *obj = OBJECT(dev);
- #include "tests/migration/s390x/a-b-bios.h"
++
-+#include "tests/migration/loongarch64/a-b-kernel.h"
++    if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
++        warn_report("LoongArch extioi: Invalid %s device type",
- static void bootfile_create(char *dir, bool suspend_me)
++                                       object_get_typename(obj));
 +        return;
 +    }
 +}
 +
  static void loongarch_ipi_class_init(ObjectClass *klass, void *data)
  {
-@@ -XXX,XX +XXX,XX @@ static void bootfile_create(char *dir, bool suspend_me)
+     LoongsonIPICommonClass *licc = LOONGSON_IPI_COMMON_CLASS(klass);
-         content = aarch64_kernel;
++    HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass);
-         len = sizeof(aarch64_kernel);
+     LoongarchIPIClass *lic = LOONGARCH_IPI_CLASS(klass);
-         g_assert(sizeof(aarch64_kernel) <= ARM_TEST_MAX_KERNEL_SIZE);
+     DeviceClass *dc = DEVICE_CLASS(klass);
-+    } else if (strcmp(arch, "loongarch64") == 0) {
-+        content = loongarch64_kernel;
+@@ -XXX,XX +XXX,XX @@ static void loongarch_ipi_class_init(ObjectClass *klass, void *data)
-+        len = sizeof(loongarch64_kernel);
+                                     &lic->parent_realize);
-     } else {
+     licc->get_iocsr_as = get_iocsr_as;
-         g_assert_not_reached();
+     licc->cpu_by_arch_id = loongarch_cpu_by_arch_id;
 +    hc->plug = loongarch_ipi_cpu_plug;
 +    hc->unplug = loongarch_ipi_cpu_unplug;
  }
  static const TypeInfo loongarch_ipi_types[] = {
@@ -XXX,XX +XXX,XX @@ static const TypeInfo loongarch_ipi_types[] = {
          .instance_size      = sizeof(LoongarchIPIState),
          .class_size         = sizeof(LoongarchIPIClass),
          .class_init         = loongarch_ipi_class_init,
 +        .interfaces         = (InterfaceInfo[]) {
 +            { TYPE_HOTPLUG_HANDLER },
 +            { }
 +        },
      }
-@@ -XXX,XX +XXX,XX @@ static int test_migrate_start(QTestState **from, QTestState **to,
+ };
-         arch_opts = g_strdup_printf("-cpu max -kernel %s", bootpath);
          start_address = ARM_TEST_MEM_START;
          end_address = ARM_TEST_MEM_END;
 +    } else if (strcmp(arch, "loongarch64") == 0) {
 +        memory_size = "256M";
 +        machine_alias = "virt";
 +        arch_opts = g_strdup_printf("-cpu la464 -bios %s", bootpath);
 +        start_address = LOONGARCH_TEST_MEM_START;
 +        end_address = LOONGARCH_TEST_MEM_END;
      } else {
          g_assert_not_reached();
      }
 --
-.34.1
+.43.5

-New patch
+[PULL 02/15] hw/intc/loongarch_ipi: Implment cpu hotplug interface
+Add logic cpu allocation and cpu mapping with cpu hotplug interface.
+When cpu is added, connect ipi gpio irq to CPU IRQ_IPI irq pin.
+Signed-off-by: Bibo Mao <maobibo@loongson.cn>
+---
+ hw/intc/loongarch_ipi.c | 39 +++++++++++++++++++++++++++++++++++++++
+file changed, 39 insertions(+)
+diff --git a/hw/intc/loongarch_ipi.c b/hw/intc/loongarch_ipi.c
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/intc/loongarch_ipi.c
++++ b/hw/intc/loongarch_ipi.c
+@@ -XXX,XX +XXX,XX @@ static int loongarch_cpu_by_arch_id(LoongsonIPICommonState *lics,
+     return MEMTX_ERROR;
+ }
++static IPICore *loongarch_ipi_get_cpu(LoongsonIPICommonState *lics,
++                                      DeviceState *dev)
++{
++    CPUClass *k = CPU_GET_CLASS(dev);
++    uint64_t arch_id = k->get_arch_id(CPU(dev));
++    int i;
++
++    for (i = 0; i < lics->num_cpu; i++) {
++        if (lics->cpu[i].arch_id == arch_id) {
++            return &lics->cpu[i];
++        }
++    }
++
++    return NULL;
++}
++
+ static void loongarch_ipi_realize(DeviceState *dev, Error **errp)
+ {
+     LoongsonIPICommonState *lics = LOONGSON_IPI_COMMON(dev);
+@@ -XXX,XX +XXX,XX @@ static void loongarch_ipi_realize(DeviceState *dev, Error **errp)
+ static void loongarch_ipi_cpu_plug(HotplugHandler *hotplug_dev,
+                                    DeviceState *dev, Error **errp)
+ {
++    LoongsonIPICommonState *lics = LOONGSON_IPI_COMMON(hotplug_dev);
+     Object *obj = OBJECT(dev);
++    IPICore *core;
++    int index;
+     if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
+         warn_report("LoongArch extioi: Invalid %s device type",
+                                        object_get_typename(obj));
+         return;
+     }
++
++    core = loongarch_ipi_get_cpu(lics, dev);
++    if (!core) {
++        return;
++    }
++
++    core->cpu = CPU(dev);
++    index = core - lics->cpu;
++
++    /* connect ipi irq to cpu irq */
++    qdev_connect_gpio_out(DEVICE(lics), index, qdev_get_gpio_in(dev, IRQ_IPI));
+ }
+ static void loongarch_ipi_cpu_unplug(HotplugHandler *hotplug_dev,
+                                      DeviceState *dev, Error **errp)
+ {
++    LoongsonIPICommonState *lics = LOONGSON_IPI_COMMON(hotplug_dev);
+     Object *obj = OBJECT(dev);
++    IPICore *core;
+     if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
+         warn_report("LoongArch extioi: Invalid %s device type",
+                                        object_get_typename(obj));
+         return;
+     }
++
++    core = loongarch_ipi_get_cpu(lics, dev);
++    if (!core) {
++        return;
++    }
++
++    core->cpu = NULL;
+ }
+ static void loongarch_ipi_class_init(ObjectClass *klass, void *data)
+--
+.43.5

-New patch
+[PULL 03/15] hw/intc/loongarch_ipi: Notify ipi object when cpu is plugged
+Use hotplug_handler_plug() to nofity ipi object when cold-plug
+cpu is created, so that ipi can set and configure irq routing
+to new cpu.
+Signed-off-by: Bibo Mao <maobibo@loongson.cn>
+---
+ hw/loongarch/virt.c | 5 ++---
+file changed, 2 insertions(+), 3 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_cpu_irq_init(LoongArchVirtMachineState *lvms)
+     MachineClass *mc = MACHINE_GET_CLASS(ms);
+     const CPUArchIdList *possible_cpus;
+     CPUState *cs;
++    Error *err = NULL;
+     /* cpu nodes */
+     possible_cpus = mc->possible_cpu_arch_ids(ms);
+@@ -XXX,XX +XXX,XX @@ static void virt_cpu_irq_init(LoongArchVirtMachineState *lvms)
+             continue;
+         }
+-        /* connect ipi irq to cpu irq */
+-        qdev_connect_gpio_out(lvms->ipi, num,
+-                              qdev_get_gpio_in(DEVICE(cs), IRQ_IPI));
++        hotplug_handler_plug(HOTPLUG_HANDLER(lvms->ipi), DEVICE(cs), &err);
+         /*
+          * connect ext irq to the cpu irq
+--
+.43.5

-New patch
+[PULL 04/15] hw/intc/loongarch_extioi: Move gpio irq initial to common code
+When cpu is added, it will connect gpio irq line to cpu irq.
+And cpu hot-add is put in common code, move gpio irq initial
+part into common code.
+Signed-off-by: Bibo Mao <maobibo@loongson.cn>
+---
+ hw/intc/loongarch_extioi.c        | 8 +-------
+ hw/intc/loongarch_extioi_common.c | 6 +++++-
+files changed, 6 insertions(+), 8 deletions(-)
+diff --git a/hw/intc/loongarch_extioi.c b/hw/intc/loongarch_extioi.c
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/intc/loongarch_extioi.c
++++ b/hw/intc/loongarch_extioi.c
+@@ -XXX,XX +XXX,XX @@ static void loongarch_extioi_realize(DeviceState *dev, Error **errp)
+     LoongArchExtIOIClass *lec = LOONGARCH_EXTIOI_GET_CLASS(dev);
+     SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
+     Error *local_err = NULL;
+-    int i, pin;
++    int i;
+     lec->parent_realize(dev, &local_err);
+     if (local_err) {
+@@ -XXX,XX +XXX,XX @@ static void loongarch_extioi_realize(DeviceState *dev, Error **errp)
+     } else {
+         s->status |= BIT(EXTIOI_ENABLE);
+     }
+-
+-    for (i = 0; i < s->num_cpu; i++) {
+-        for (pin = 0; pin < LS3A_INTC_IP; pin++) {
+-            qdev_init_gpio_out(dev, &s->cpu[i].parent_irq[pin], 1);
+-        }
+-    }
+ }
+ static void loongarch_extioi_unrealize(DeviceState *dev)
+diff --git a/hw/intc/loongarch_extioi_common.c b/hw/intc/loongarch_extioi_common.c
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/intc/loongarch_extioi_common.c
++++ b/hw/intc/loongarch_extioi_common.c
+@@ -XXX,XX +XXX,XX @@ static void loongarch_extioi_common_realize(DeviceState *dev, Error **errp)
+     MachineState *machine = MACHINE(qdev_get_machine());
+     MachineClass *mc = MACHINE_GET_CLASS(machine);
+     const CPUArchIdList *id_list;
+-    int i;
++    int i, pin;
+     assert(mc->possible_cpu_arch_ids);
+     id_list = mc->possible_cpu_arch_ids(machine);
+@@ -XXX,XX +XXX,XX @@ static void loongarch_extioi_common_realize(DeviceState *dev, Error **errp)
+     for (i = 0; i < s->num_cpu; i++) {
+         s->cpu[i].arch_id = id_list->cpus[i].arch_id;
+         s->cpu[i].cpu = CPU(id_list->cpus[i].cpu);
++
++        for (pin = 0; pin < LS3A_INTC_IP; pin++) {
++            qdev_init_gpio_out(dev, &s->cpu[i].parent_irq[pin], 1);
++        }
+     }
+ }
+--
+.43.5

-New patch
+[PULL 05/15] hw/intc/loongarch_extioi: Add basic hotplug framework
+LoongArch extioi interrupt controller routes peripheral interrupt
+to multiple CPUs, physical cpu id is used in interrupt routing table.
+Here hotplug interface is added for extioi object, so that parent irq
+line can be connected, and routing table can be added for new created
+cpu.
+Here only basic hotplug framework is added, it is stub function.
+Signed-off-by: Bibo Mao <maobibo@loongson.cn>
+---
+ hw/intc/loongarch_extioi_common.c | 33 +++++++++++++++++++++++++++++++
+file changed, 33 insertions(+)
+diff --git a/hw/intc/loongarch_extioi_common.c b/hw/intc/loongarch_extioi_common.c
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/intc/loongarch_extioi_common.c
++++ b/hw/intc/loongarch_extioi_common.c
+@@ -XXX,XX +XXX,XX @@
+  * Copyright (C) 2024 Loongson Technology Corporation Limited
+  */
+ #include "qemu/osdep.h"
++#include "qemu/error-report.h"
+ #include "qemu/module.h"
+ #include "qapi/error.h"
+ #include "hw/qdev-properties.h"
+ #include "hw/intc/loongarch_extioi_common.h"
+ #include "migration/vmstate.h"
++#include "target/loongarch/cpu.h"
++
++static void loongarch_extioi_cpu_plug(HotplugHandler *hotplug_dev,
++                                      DeviceState *dev, Error **errp)
++{
++    Object *obj = OBJECT(dev);
++
++    if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
++        warn_report("LoongArch extioi: Invalid %s device type",
++                                       object_get_typename(obj));
++        return;
++    }
++}
++
++static void loongarch_extioi_cpu_unplug(HotplugHandler *hotplug_dev,
++                                        DeviceState *dev, Error **errp)
++{
++    Object *obj = OBJECT(dev);
++
++    if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
++        warn_report("LoongArch extioi: Invalid %s device type",
++                                       object_get_typename(obj));
++        return;
++    }
++}
+ static void loongarch_extioi_common_realize(DeviceState *dev, Error **errp)
+ {
+@@ -XXX,XX +XXX,XX @@ static void loongarch_extioi_common_class_init(ObjectClass *klass, void *data)
+ {
+     DeviceClass *dc = DEVICE_CLASS(klass);
+     LoongArchExtIOICommonClass *lecc = LOONGARCH_EXTIOI_COMMON_CLASS(klass);
++    HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass);
+     device_class_set_parent_realize(dc, loongarch_extioi_common_realize,
+                                     &lecc->parent_realize);
+     device_class_set_props(dc, extioi_properties);
+     dc->vmsd = &vmstate_loongarch_extioi;
++    hc->plug = loongarch_extioi_cpu_plug;
++    hc->unplug = loongarch_extioi_cpu_unplug;
+ }
+ static const TypeInfo loongarch_extioi_common_types[] = {
+@@ -XXX,XX +XXX,XX @@ static const TypeInfo loongarch_extioi_common_types[] = {
+         .instance_size      = sizeof(LoongArchExtIOICommonState),
+         .class_size         = sizeof(LoongArchExtIOICommonClass),
+         .class_init         = loongarch_extioi_common_class_init,
++        .interfaces         = (InterfaceInfo[]) {
++            { TYPE_HOTPLUG_HANDLER },
++            { }
++        },
+         .abstract           = true,
+     }
+ };
+--
+.43.5

-New patch
+[PULL 06/15] hw/intc/loongarch_extioi: Implment cpu hotplug interface
+When cpu is added, connect extioi gpio irq to CPU irq pin.
+Signed-off-by: Bibo Mao <maobibo@loongson.cn>
+---
+ hw/intc/loongarch_extioi_common.c | 45 +++++++++++++++++++++++++++++++
+file changed, 45 insertions(+)
+diff --git a/hw/intc/loongarch_extioi_common.c b/hw/intc/loongarch_extioi_common.c
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/intc/loongarch_extioi_common.c
++++ b/hw/intc/loongarch_extioi_common.c
+@@ -XXX,XX +XXX,XX @@
+ #include "migration/vmstate.h"
+ #include "target/loongarch/cpu.h"
++static ExtIOICore *loongarch_extioi_get_cpu(LoongArchExtIOICommonState *s,
++                                            DeviceState *dev)
++{
++    CPUClass *k = CPU_GET_CLASS(dev);
++    uint64_t arch_id = k->get_arch_id(CPU(dev));
++    int i;
++
++    for (i = 0; i < s->num_cpu; i++) {
++        if (s->cpu[i].arch_id == arch_id) {
++            return &s->cpu[i];
++        }
++    }
++
++    return NULL;
++}
++
+ static void loongarch_extioi_cpu_plug(HotplugHandler *hotplug_dev,
+                                       DeviceState *dev, Error **errp)
+ {
++    LoongArchExtIOICommonState *s = LOONGARCH_EXTIOI_COMMON(hotplug_dev);
+     Object *obj = OBJECT(dev);
++    ExtIOICore *core;
++    int pin, index;
+     if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
+         warn_report("LoongArch extioi: Invalid %s device type",
+                                        object_get_typename(obj));
+         return;
+     }
++
++    core = loongarch_extioi_get_cpu(s, dev);
++    if (!core) {
++        return;
++    }
++
++    core->cpu = CPU(dev);
++    index = core - s->cpu;
++
++    /*
++     * connect extioi irq to the cpu irq
++     * cpu_pin[LS3A_INTC_IP + 2 : 2] <= intc_pin[LS3A_INTC_IP : 0]
++     */
++    for (pin = 0; pin < LS3A_INTC_IP; pin++) {
++        qdev_connect_gpio_out(DEVICE(s), index * LS3A_INTC_IP + pin,
++                              qdev_get_gpio_in(dev, pin + 2));
++    }
+ }
+ static void loongarch_extioi_cpu_unplug(HotplugHandler *hotplug_dev,
+                                         DeviceState *dev, Error **errp)
+ {
++    LoongArchExtIOICommonState *s = LOONGARCH_EXTIOI_COMMON(hotplug_dev);
+     Object *obj = OBJECT(dev);
++    ExtIOICore *core;
+     if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
+         warn_report("LoongArch extioi: Invalid %s device type",
+                                        object_get_typename(obj));
+         return;
+     }
++
++    core = loongarch_extioi_get_cpu(s, dev);
++    if (!core) {
++        return;
++    }
++
++    core->cpu = NULL;
+ }
+ static void loongarch_extioi_common_realize(DeviceState *dev, Error **errp)
+--
+.43.5

-[PULL 2/5] hw/loongarch: Remove minimum and default memory size
+[PULL 07/15] hw/intc/loongarch_extioi: Use cpu plug notification
-From: Bibo Mao <maobibo@loongson.cn>
+Use hotplug_handler_plug() to nofity extioi object when cold-plug
+cpu is created, so that extioi can set and configure irq routing
-Some qtest test cases such as numa use default memory size of generic
+to new cpu.
 machine class, which is 128M by fault.
 Here generic default memory size is used, and also remove minimum memory
 size which is 1G originally.
 Signed-off-by: Bibo Mao <maobibo@loongson.cn>
-Reviewed-by: Song Gao <gaosong@loongson.cn>
-Message-Id: <20240511034220.3030560-3-maobibo@loongson.cn>
-Signed-off-by: Song Gao <gaosong@loongson.cn>
 ---
- hw/loongarch/virt.c | 5 -----
+ hw/loongarch/virt.c | 12 ++----------
-file changed, 5 deletions(-)
+file changed, 2 insertions(+), 10 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_init(MachineState *machine)
+@@ -XXX,XX +XXX,XX @@ static void virt_devices_init(DeviceState *pch_pic,
-         cpu_model = LOONGARCH_CPU_TYPE_NAME("la464");
  static void virt_cpu_irq_init(LoongArchVirtMachineState *lvms)
  {
 -    int num, pin;
 +    int num;
      MachineState *ms = MACHINE(lvms);
      MachineClass *mc = MACHINE_GET_CLASS(ms);
      const CPUArchIdList *possible_cpus;
@@ -XXX,XX +XXX,XX @@ static void virt_cpu_irq_init(LoongArchVirtMachineState *lvms)
          }
          hotplug_handler_plug(HOTPLUG_HANDLER(lvms->ipi), DEVICE(cs), &err);
 -
 -        /*
 -         * connect ext irq to the cpu irq
 -         * cpu_pin[9:2] <= intc_pin[7:0]
 -         */
 -        for (pin = 0; pin < LS3A_INTC_IP; pin++) {
 -            qdev_connect_gpio_out(lvms->extioi, (num * LS3A_INTC_IP + pin),
 -                                  qdev_get_gpio_in(DEVICE(cs), pin + 2));
 -        }
 +        hotplug_handler_plug(HOTPLUG_HANDLER(lvms->extioi), DEVICE(cs), &err);
      }
+ }
--    if (ram_size < 1 * GiB) {
 -        error_report("ram_size must be greater than 1G.");
 -        exit(1);
 -    }
      create_fdt(lvms);
      /* Create IOCSR space */
@@ -XXX,XX +XXX,XX @@ static void virt_class_init(ObjectClass *oc, void *data)
      HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
      mc->init = virt_init;
 -    mc->default_ram_size = 1 * GiB;
      mc->default_cpu_type = LOONGARCH_CPU_TYPE_NAME("la464");
      mc->default_ram_id = "loongarch.ram";
      mc->max_cpus = LOONGARCH_MAX_CPUS;
 --
-.34.1
+.43.5

-New patch
+[PULL 08/15] hw/loongarch/virt: Add CPU topology support
+Add topological relationships for Loongarch VCPU and initialize
+topology member variables.
+On LoongArch system there is socket/core/thread topo information,
+physical CPU id is calculated from CPU topo, every topo sub-field is
+aligned by power of 2. So it is different from logical cpu index.
+Co-developed-by: Xianglai Li <lixianglai@loongson.cn>
+Signed-off-by: Bibo Mao <maobibo@loongson.cn>
+---
+ hw/loongarch/virt.c    | 59 ++++++++++++++++++++++++++++++++++++------
+ target/loongarch/cpu.h |  6 +++++
+files changed, 57 insertions(+), 8 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_initfn(Object *obj)
+     virt_flash_create(lvms);
+ }
++static void virt_get_topo_from_index(MachineState *ms,
++                                     LoongArchCPUTopo *topo, int index)
++{
++    topo->socket_id = index / (ms->smp.cores * ms->smp.threads);
++    topo->core_id = index / ms->smp.threads % ms->smp.cores;
++    topo->thread_id = index % ms->smp.threads;
++}
++
++static unsigned int topo_align_up(unsigned int count)
++{
++    g_assert(count >= 1);
++    count -= 1;
++    return BIT(count ? 32 - clz32(count) : 0);
++}
++
++/*
++ * LoongArch Reference Manual Vol1, Chapter 7.4.12 CPU Identity
++ *  For CPU architecture, bit0 .. bit8 is valid for CPU id, max cpuid is 512
++ *  However for IPI/Eiointc interrupt controller, max supported cpu id for
++ *  irq routingis 256
++ *
++ *  Here max cpu id is 256 for virt machine
++ */
++static int virt_get_arch_id_from_topo(MachineState *ms, LoongArchCPUTopo *topo)
++{
++    int arch_id, threads, cores, sockets;
++
++    threads = topo_align_up(ms->smp.threads);
++    cores = topo_align_up(ms->smp.cores);
++    sockets = topo_align_up(ms->smp.sockets);
++    if ((threads * cores * sockets) > 256) {
++        error_report("Exceeding max cpuid 256 with sockets[%d] cores[%d]"
++                     " threads[%d]", ms->smp.sockets, ms->smp.cores,
++                     ms->smp.threads);
++        exit(1);
++    }
++
++    arch_id = topo->thread_id + topo->core_id * threads;
++    arch_id += topo->socket_id * threads * cores;
++    return arch_id;
++}
++
+ static bool memhp_type_supported(DeviceState *dev)
+ {
+     /* we only support pc dimm now */
+@@ -XXX,XX +XXX,XX @@ static HotplugHandler *virt_get_hotplug_handler(MachineState *machine,
+ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)
+ {
+-    int n;
++    int n, arch_id;
+     unsigned int max_cpus = ms->smp.max_cpus;
++    LoongArchCPUTopo topo;
+     if (ms->possible_cpus) {
+         assert(ms->possible_cpus->len == max_cpus);
+@@ -XXX,XX +XXX,XX @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)
+                                   sizeof(CPUArchId) * max_cpus);
+     ms->possible_cpus->len = max_cpus;
+     for (n = 0; n < ms->possible_cpus->len; n++) {
++        virt_get_topo_from_index(ms, &topo, n);
++        arch_id = virt_get_arch_id_from_topo(ms, &topo);
+         ms->possible_cpus->cpus[n].type = ms->cpu_type;
+-        ms->possible_cpus->cpus[n].arch_id = n;
+-
++        ms->possible_cpus->cpus[n].arch_id = arch_id;
++        ms->possible_cpus->cpus[n].vcpus_count = 1;
+         ms->possible_cpus->cpus[n].props.has_socket_id = true;
+-        ms->possible_cpus->cpus[n].props.socket_id  =
+-                                   n / (ms->smp.cores * ms->smp.threads);
++        ms->possible_cpus->cpus[n].props.socket_id = topo.socket_id;
+         ms->possible_cpus->cpus[n].props.has_core_id = true;
+-        ms->possible_cpus->cpus[n].props.core_id =
+-                                   n / ms->smp.threads % ms->smp.cores;
++        ms->possible_cpus->cpus[n].props.core_id = topo.core_id;
+         ms->possible_cpus->cpus[n].props.has_thread_id = true;
+-        ms->possible_cpus->cpus[n].props.thread_id = n % ms->smp.threads;
++        ms->possible_cpus->cpus[n].props.thread_id = topo.thread_id;
+     }
+     return ms->possible_cpus;
+ }
+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 {
+ #endif
+ } CPULoongArchState;
++typedef struct LoongArchCPUTopo {
++    int32_t socket_id;  /* socket-id of this VCPU */
++    int32_t core_id;    /* core-id of this VCPU */
++    int32_t thread_id;  /* thread-id of this VCPU */
++} LoongArchCPUTopo;
++
+ /**
+  * LoongArchCPU:
+  * @env: #CPULoongArchState
+--
+.43.5

-New patch
+[PULL 09/15] hw/loongarch/virt: Add topo properties on CPU object
+Add some properties such as socket_id, core_id, thread_id and node_id
+on LoongArch CPU object.
+Co-developed-by: Xianglai Li <lixianglai@loongson.cn>
+Signed-off-by: Bibo Mao <maobibo@loongson.cn>
+---
+ target/loongarch/cpu.c | 9 +++++++++
+ target/loongarch/cpu.h | 4 ++++
+files changed, 13 insertions(+)
+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 @@
+ #include "system/tcg.h"
+ #include "system/kvm.h"
+ #include "kvm/kvm_loongarch.h"
++#include "hw/qdev-properties.h"
+ #include "exec/exec-all.h"
+ #include "exec/translation-block.h"
+ #include "cpu.h"
+@@ -XXX,XX +XXX,XX @@ static int64_t loongarch_cpu_get_arch_id(CPUState *cs)
+ }
+ #endif
++static const Property loongarch_cpu_properties[] = {
++    DEFINE_PROP_INT32("socket-id", LoongArchCPU, socket_id, 0),
++    DEFINE_PROP_INT32("core-id", LoongArchCPU, core_id, 0),
++    DEFINE_PROP_INT32("thread-id", LoongArchCPU, thread_id, 0),
++    DEFINE_PROP_INT32("node-id", LoongArchCPU, node_id, CPU_UNSET_NUMA_NODE_ID),
++};
++
+ static void loongarch_cpu_class_init(ObjectClass *c, void *data)
+ {
+     LoongArchCPUClass *lacc = LOONGARCH_CPU_CLASS(c);
+@@ -XXX,XX +XXX,XX @@ static void loongarch_cpu_class_init(ObjectClass *c, void *data)
+     DeviceClass *dc = DEVICE_CLASS(c);
+     ResettableClass *rc = RESETTABLE_CLASS(c);
++    device_class_set_props(dc, loongarch_cpu_properties);
+     device_class_set_parent_realize(dc, loongarch_cpu_realizefn,
+                                     &lacc->parent_realize);
+     resettable_class_set_parent_phases(rc, NULL, loongarch_cpu_reset_hold, NULL,
+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 @@ struct ArchCPU {
+     OnOffAuto lasx;
+     OnOffAuto kvm_pv_ipi;
+     OnOffAuto kvm_steal_time;
++    int32_t socket_id;  /* socket-id of this CPU */
++    int32_t core_id;    /* core-id of this CPU */
++    int32_t thread_id;  /* thread-id of this CPU */
++    int32_t node_id;    /* NUMA node of this CPU */
+     /* 'compatible' string for this CPU for Linux device trees */
+     const char *dtb_compatible;
+--
+.43.5

-[PULL 1/5] hw/loongarch: Add compat machine for 9.1
+[PULL 10/15] hw/loongarch/virt: Add basic cpu plug interface framework
-From: Bibo Mao <maobibo@loongson.cn>
+Add basic cpu hotplug interface framework, cpu hotplug interface is
 stub function and only framework is added here.
-Since migration test case requires compat machine type support,
+Co-developed-by: Xianglai Li <lixianglai@loongson.cn>
 compat machine is added for qemu 9.1 here.
 Signed-off-by: Bibo Mao <maobibo@loongson.cn>
-Reviewed-by: Song Gao <gaosong@loongson.cn>
-Message-Id: <20240511034220.3030560-2-maobibo@loongson.cn>
-Signed-off-by: Song Gao <gaosong@loongson.cn>
 ---
- hw/loongarch/virt.c | 61 +++++++++++++++++++++++++++++++++++----------
+ hw/loongarch/virt.c    | 29 +++++++++++++++++++++++++++++
-file changed, 48 insertions(+), 13 deletions(-)
+ target/loongarch/cpu.c | 13 +++++++++++++
  target/loongarch/cpu.h |  1 +
 files changed, 43 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_class_init(ObjectClass *oc, void *data)
+@@ -XXX,XX +XXX,XX @@ static int virt_get_arch_id_from_topo(MachineState *ms, LoongArchCPUTopo *topo)
- #endif
+     return arch_id;
  }
--static const TypeInfo virt_machine_types[] = {
++static void virt_cpu_pre_plug(HotplugHandler *hotplug_dev,
--    {
++                              DeviceState *dev, Error **errp)
 -        .name           = TYPE_LOONGARCH_VIRT_MACHINE,
 -        .parent         = TYPE_MACHINE,
 -        .instance_size  = sizeof(LoongArchVirtMachineState),
 -        .class_init     = virt_class_init,
 -        .instance_init  = virt_initfn,
 -        .interfaces = (InterfaceInfo[]) {
 -         { TYPE_HOTPLUG_HANDLER },
 -         { }
 -        },
 -    }
 +#define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
 +    static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
 +                                                    void *data) \
 +    { \
 +        MachineClass *mc = MACHINE_CLASS(oc); \
 +        virt_machine_##major##_##minor##_options(mc); \
 +        mc->desc = "QEMU " # major "." # minor " LoongArch Virtual Machine"; \
 +        if (latest) { \
 +            mc->alias = "virt"; \
 +        } \
 +    } \
 +    static const TypeInfo machvirt_##major##_##minor##_info = { \
 +        .name = MACHINE_TYPE_NAME("virt-" # major "." # minor), \
 +        .parent = TYPE_LOONGARCH_VIRT_MACHINE, \
 +        .class_init = virt_##major##_##minor##_class_init, \
 +    }; \
 +    static void machvirt_machine_##major##_##minor##_init(void) \
 +    { \
 +        type_register_static(&machvirt_##major##_##minor##_info); \
 +    } \
 +    type_init(machvirt_machine_##major##_##minor##_init);
 +
 +#define DEFINE_VIRT_MACHINE_AS_LATEST(major, minor) \
 +    DEFINE_VIRT_MACHINE_LATEST(major, minor, true)
 +#define DEFINE_VIRT_MACHINE(major, minor) \
 +    DEFINE_VIRT_MACHINE_LATEST(major, minor, false)
 +
 +static const TypeInfo virt_machine_info = {
 +    .name           = TYPE_LOONGARCH_VIRT_MACHINE,
 +    .parent         = TYPE_MACHINE,
 +    .abstract       = true,
 +    .instance_size  = sizeof(LoongArchVirtMachineState),
 +    .class_init     = virt_class_init,
 +    .instance_init  = virt_initfn,
 +    .interfaces = (InterfaceInfo[]) {
 +    { TYPE_HOTPLUG_HANDLER },
 +    { }
 +    },
  };
 -DEFINE_TYPES(virt_machine_types)
 +static void machvirt_machine_init(void)
 +{
 +    type_register_static(&virt_machine_info);
 +}
 +type_init(machvirt_machine_init);
 +
 +static void virt_machine_9_1_options(MachineClass *mc)
 +{
 +}
-+DEFINE_VIRT_MACHINE_AS_LATEST(9, 1)
++
 +static void virt_cpu_unplug_request(HotplugHandler *hotplug_dev,
 +                                    DeviceState *dev, Error **errp)
 +{
 +}
 +
 +static void virt_cpu_unplug(HotplugHandler *hotplug_dev,
 +                            DeviceState *dev, Error **errp)
 +{
 +}
 +
 +static void virt_cpu_plug(HotplugHandler *hotplug_dev,
 +                          DeviceState *dev, Error **errp)
 +{
 +}
 +
  static bool memhp_type_supported(DeviceState *dev)
  {
      /* we only support pc dimm now */
@@ -XXX,XX +XXX,XX @@ static void virt_device_pre_plug(HotplugHandler *hotplug_dev,
  {
      if (memhp_type_supported(dev)) {
          virt_mem_pre_plug(hotplug_dev, dev, errp);
 +    } else if (object_dynamic_cast(OBJECT(dev), TYPE_LOONGARCH_CPU)) {
 +        virt_cpu_pre_plug(hotplug_dev, dev, errp);
      }
  }
@@ -XXX,XX +XXX,XX @@ static void virt_device_unplug_request(HotplugHandler *hotplug_dev,
  {
      if (memhp_type_supported(dev)) {
          virt_mem_unplug_request(hotplug_dev, dev, errp);
 +    } else if (object_dynamic_cast(OBJECT(dev), TYPE_LOONGARCH_CPU)) {
 +        virt_cpu_unplug_request(hotplug_dev, dev, errp);
      }
  }
@@ -XXX,XX +XXX,XX @@ static void virt_device_unplug(HotplugHandler *hotplug_dev,
  {
      if (memhp_type_supported(dev)) {
          virt_mem_unplug(hotplug_dev, dev, errp);
 +    } else if (object_dynamic_cast(OBJECT(dev), TYPE_LOONGARCH_CPU)) {
 +        virt_cpu_unplug(hotplug_dev, dev, errp);
      }
  }
@@ -XXX,XX +XXX,XX @@ static void virt_device_plug_cb(HotplugHandler *hotplug_dev,
          }
      } else if (memhp_type_supported(dev)) {
          virt_mem_plug(hotplug_dev, dev, errp);
 +    } else if (object_dynamic_cast(OBJECT(dev), TYPE_LOONGARCH_CPU)) {
 +        virt_cpu_plug(hotplug_dev, dev, errp);
      }
  }
@@ -XXX,XX +XXX,XX @@ static HotplugHandler *virt_get_hotplug_handler(MachineState *machine,
      MachineClass *mc = MACHINE_GET_CLASS(machine);
      if (device_is_dynamic_sysbus(mc, dev) ||
 +        object_dynamic_cast(OBJECT(dev), TYPE_LOONGARCH_CPU) ||
          object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI) ||
          memhp_type_supported(dev)) {
          return HOTPLUG_HANDLER(machine);
 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_cpu_realizefn(DeviceState *dev, Error **errp)
      lacc->parent_realize(dev, errp);
  }
 +static void loongarch_cpu_unrealizefn(DeviceState *dev)
 +{
 +    LoongArchCPUClass *lacc = LOONGARCH_CPU_GET_CLASS(dev);
 +
 +#ifndef CONFIG_USER_ONLY
 +    cpu_remove_sync(CPU(dev));
 +#endif
 +
 +    lacc->parent_unrealize(dev);
 +}
 +
  static bool loongarch_get_lsx(Object *obj, Error **errp)
  {
      return LOONGARCH_CPU(obj)->lsx != ON_OFF_AUTO_OFF;
@@ -XXX,XX +XXX,XX @@ static void loongarch_cpu_class_init(ObjectClass *c, void *data)
      device_class_set_props(dc, loongarch_cpu_properties);
      device_class_set_parent_realize(dc, loongarch_cpu_realizefn,
                                      &lacc->parent_realize);
 +    device_class_set_parent_unrealize(dc, loongarch_cpu_unrealizefn,
 +                                      &lacc->parent_unrealize);
      resettable_class_set_parent_phases(rc, NULL, loongarch_cpu_reset_hold, NULL,
                                         &lacc->parent_phases);
 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 @@ struct LoongArchCPUClass {
      CPUClass parent_class;
      DeviceRealize parent_realize;
 +    DeviceUnrealize parent_unrealize;
      ResettablePhases parent_phases;
  };
 --
-.34.1
+.43.5

-New patch
+[PULL 11/15] hw/loongarch/virt: Implement cpu unplug interface
+Implement cpu unplug interfaces including virt_cpu_unplug_request()
+and virt_cpu_unplug().
+Co-developed-by: Xianglai Li <lixianglai@loongson.cn>
+Signed-off-by: Bibo Mao <maobibo@loongson.cn>
+---
+ hw/loongarch/virt.c | 58 +++++++++++++++++++++++++++++++++++++++++++++
+file changed, 58 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 int virt_get_arch_id_from_topo(MachineState *ms, LoongArchCPUTopo *topo)
+     return arch_id;
+ }
++/* Find cpu slot in machine->possible_cpus by arch_id */
++static CPUArchId *virt_find_cpu_slot(MachineState *ms, int arch_id)
++{
++    int n;
++    for (n = 0; n < ms->possible_cpus->len; n++) {
++        if (ms->possible_cpus->cpus[n].arch_id == arch_id) {
++            return &ms->possible_cpus->cpus[n];
++        }
++    }
++
++    return NULL;
++}
++
+ static void virt_cpu_pre_plug(HotplugHandler *hotplug_dev,
+                               DeviceState *dev, Error **errp)
+ {
+@@ -XXX,XX +XXX,XX @@ static void virt_cpu_pre_plug(HotplugHandler *hotplug_dev,
+ static void virt_cpu_unplug_request(HotplugHandler *hotplug_dev,
+                                     DeviceState *dev, Error **errp)
+ {
++    LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(hotplug_dev);
++    Error *err = NULL;
++    LoongArchCPU *cpu = LOONGARCH_CPU(dev);
++    CPUState *cs = CPU(dev);
++
++    if (cs->cpu_index == 0) {
++        error_setg(&err, "hot-unplug of boot cpu(id%d=%d:%d:%d) not supported",
++                   cs->cpu_index, cpu->socket_id,
++                   cpu->core_id, cpu->thread_id);
++        error_propagate(errp, err);
++        return;
++    }
++
++    hotplug_handler_unplug_request(HOTPLUG_HANDLER(lvms->acpi_ged), dev, &err);
++    if (err) {
++        error_propagate(errp, err);
++    }
+ }
+ static void virt_cpu_unplug(HotplugHandler *hotplug_dev,
+                             DeviceState *dev, Error **errp)
+ {
++    CPUArchId *cpu_slot;
++    Error *err = NULL;
++    LoongArchCPU *cpu = LOONGARCH_CPU(dev);
++    LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(hotplug_dev);
++
++    /* Notify ipi and extioi irqchip to remove interrupt routing to CPU */
++    hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->ipi), dev, &err);
++    if (err) {
++        error_propagate(errp, err);
++        return;
++    }
++
++    hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->extioi), dev, &err);
++    if (err) {
++        error_propagate(errp, err);
++        return;
++    }
++
++    /* Notify acpi ged CPU removed */
++    hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->acpi_ged), dev, &err);
++    if (err) {
++        error_propagate(errp, err);
++        return;
++    }
++
++    cpu_slot = virt_find_cpu_slot(MACHINE(lvms), cpu->phy_id);
++    cpu_slot->cpu = NULL;
++    return;
+ }
+ static void virt_cpu_plug(HotplugHandler *hotplug_dev,
+--
+.43.5

-[PULL 5/5] target/loongarch/kvm: fpu save the vreg registers high 192bit
+[PULL 12/15] hw/loongarch/virt: Implement cpu plug interface
-On kvm side, get_fpu/set_fpu save the vreg registers high 192bits,
+Implement cpu plug interface, and cold-plug cpu uses plug interface
-but QEMU missing.
+when cpu object is created.
-Signed-off-by: Song Gao <gaosong@loongson.cn>
+Co-developed-by: Xianglai Li <lixianglai@loongson.cn>
-Reviewed-by: Bibo Mao <maobibo@loongson.cn>
+Signed-off-by: Bibo Mao <maobibo@loongson.cn>
 Message-Id: <20240514110752.989572-1-gaosong@loongson.cn>
 ---
- target/loongarch/kvm/kvm.c | 6 ++++++
+ hw/loongarch/virt.c    | 88 ++++++++++++++++++++++++++++++++++++------
-file changed, 6 insertions(+)
+ target/loongarch/cpu.c |  1 +
 files changed, 78 insertions(+), 11 deletions(-)
-diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
+diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
 index XXXXXXX..XXXXXXX 100644
---- a/target/loongarch/kvm/kvm.c
+--- a/hw/loongarch/virt.c
-+++ b/target/loongarch/kvm/kvm.c
++++ b/hw/loongarch/virt.c
-@@ -XXX,XX +XXX,XX @@ static int kvm_loongarch_get_regs_fp(CPUState *cs)
+@@ -XXX,XX +XXX,XX @@ static void fw_cfg_add_memory(MachineState *ms)
-     env->fcsr0 = fpu.fcsr;
-     for (i = 0; i < 32; i++) {
+ static void virt_init(MachineState *machine)
-         env->fpr[i].vreg.UD[0] = fpu.fpr[i].val64[0];
+ {
-+        env->fpr[i].vreg.UD[1] = fpu.fpr[i].val64[1];
+-    LoongArchCPU *lacpu;
-+        env->fpr[i].vreg.UD[2] = fpu.fpr[i].val64[2];
+     const char *cpu_model = machine->cpu_type;
-+        env->fpr[i].vreg.UD[3] = fpu.fpr[i].val64[3];
+     MemoryRegion *address_space_mem = get_system_memory();
      LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(machine);
      int i;
      hwaddr base, size, ram_size = machine->ram_size;
 -    const CPUArchIdList *possible_cpus;
      MachineClass *mc = MACHINE_GET_CLASS(machine);
 -    CPUState *cpu;
 +    Object *cpuobj;
      if (!cpu_model) {
          cpu_model = LOONGARCH_CPU_TYPE_NAME("la464");
@@ -XXX,XX +XXX,XX @@ static void virt_init(MachineState *machine)
      memory_region_add_subregion(&lvms->system_iocsr, 0, &lvms->iocsr_mem);
      /* Init CPUs */
 -    possible_cpus = mc->possible_cpu_arch_ids(machine);
 -    for (i = 0; i < possible_cpus->len; i++) {
 -        cpu = cpu_create(machine->cpu_type);
 -        cpu->cpu_index = i;
 -        machine->possible_cpus->cpus[i].cpu = cpu;
 -        lacpu = LOONGARCH_CPU(cpu);
 -        lacpu->phy_id = machine->possible_cpus->cpus[i].arch_id;
 -        lacpu->env.address_space_iocsr = &lvms->as_iocsr;
 +    mc->possible_cpu_arch_ids(machine);
 +    for (i = 0; i < machine->smp.cpus; i++) {
 +        cpuobj = object_new(machine->cpu_type);
 +        if (cpuobj == NULL) {
 +            error_report("Fail to create object with type %s ",
 +                         machine->cpu_type);
 +            exit(EXIT_FAILURE);
 +        }
 +        qdev_realize_and_unref(DEVICE(cpuobj), NULL, &error_fatal);
      }
-     for (i = 0; i < 8; i++) {
+     fw_cfg_add_memory(machine);
-         env->cf[i] = fpu.fcc & 0xFF;
-@@ -XXX,XX +XXX,XX @@ static int kvm_loongarch_put_regs_fp(CPUState *cs)
+@@ -XXX,XX +XXX,XX @@ static CPUArchId *virt_find_cpu_slot(MachineState *ms, int arch_id)
-     fpu.fcc = 0;
+     return NULL;
-     for (i = 0; i < 32; i++) {
+ }
-         fpu.fpr[i].val64[0] = env->fpr[i].vreg.UD[0];
-+        fpu.fpr[i].val64[1] = env->fpr[i].vreg.UD[1];
++/* Find cpu slot for cold-plut CPU object where cpu is NULL */
-+        fpu.fpr[i].val64[2] = env->fpr[i].vreg.UD[2];
++static CPUArchId *virt_find_empty_cpu_slot(MachineState *ms)
-+        fpu.fpr[i].val64[3] = env->fpr[i].vreg.UD[3];
++{
-     }
++    int n;
++    for (n = 0; n < ms->possible_cpus->len; n++) {
-     for (i = 0; i < 8; i++) {
++        if (ms->possible_cpus->cpus[n].cpu == NULL) {
 +            return &ms->possible_cpus->cpus[n];
 +        }
 +    }
 +
 +    return NULL;
 +}
 +
  static void virt_cpu_pre_plug(HotplugHandler *hotplug_dev,
                                DeviceState *dev, Error **errp)
  {
 +    LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(hotplug_dev);
 +    MachineState *ms = MACHINE(OBJECT(hotplug_dev));
 +    LoongArchCPU *cpu = LOONGARCH_CPU(dev);
 +    CPUState *cs = CPU(dev);
 +    CPUArchId *cpu_slot;
 +    Error *err = NULL;
 +    LoongArchCPUTopo topo;
 +
 +    if (lvms->acpi_ged) {
 +        error_setg(&err, "CPU hotplug not supported");
 +        goto out;
 +    } else {
 +        /* For cold-add cpu, find empty cpu slot */
 +        cpu_slot = virt_find_empty_cpu_slot(ms);
 +        topo.socket_id = cpu_slot->props.socket_id;
 +        topo.core_id = cpu_slot->props.core_id;
 +        topo.thread_id = cpu_slot->props.thread_id;
 +        object_property_set_int(OBJECT(dev), "socket-id", topo.socket_id, NULL);
 +        object_property_set_int(OBJECT(dev), "core-id", topo.core_id, NULL);
 +        object_property_set_int(OBJECT(dev), "thread-id", topo.thread_id, NULL);
 +    }
 +
 +    cpu->env.address_space_iocsr = &lvms->as_iocsr;
 +    cpu->phy_id = cpu_slot->arch_id;
 +    cs->cpu_index = cpu_slot - ms->possible_cpus->cpus;
 +    numa_cpu_pre_plug(cpu_slot, dev, &err);
 +out:
 +    if (err) {
 +        error_propagate(errp, err);
 +    }
  }
  static void virt_cpu_unplug_request(HotplugHandler *hotplug_dev,
@@ -XXX,XX +XXX,XX @@ static void virt_cpu_unplug(HotplugHandler *hotplug_dev,
  static void virt_cpu_plug(HotplugHandler *hotplug_dev,
                            DeviceState *dev, Error **errp)
  {
 +    CPUArchId *cpu_slot;
 +    LoongArchCPU *cpu = LOONGARCH_CPU(dev);
 +    LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(hotplug_dev);
 +    Error *err = NULL;
 +
 +    cpu_slot = virt_find_cpu_slot(MACHINE(lvms), cpu->phy_id);
 +    cpu_slot->cpu = CPU(dev);
 +    if (lvms->ipi) {
 +        hotplug_handler_plug(HOTPLUG_HANDLER(lvms->ipi), dev, &err);
 +        if (err) {
 +            error_propagate(errp, err);
 +            return;
 +        }
 +    }
 +
 +    if (lvms->extioi) {
 +        hotplug_handler_plug(HOTPLUG_HANDLER(lvms->extioi), dev, &err);
 +        if (err) {
 +            error_propagate(errp, err);
 +            return;
 +        }
 +    }
 +
 +    return;
  }
  static bool memhp_type_supported(DeviceState *dev)
 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_cpu_class_init(ObjectClass *c, void *data)
  #ifdef CONFIG_TCG
      cc->tcg_ops = &loongarch_tcg_ops;
  #endif
 +    dc->user_creatable = true;
  }
  static const gchar *loongarch32_gdb_arch_name(CPUState *cs)
 --
-.34.1
+.43.5

-[PULL 4/5] target/loongarch/kvm: Fix VM recovery from disk failures
+[PULL 13/15] hw/loongarch/virt: Update the ACPI table for hotplug cpu
-vmstate does not save kvm_state_conter,
+On LoongArch virt machine, ACPI GED hardware is used for CPU hotplug
-which can cause VM recovery from disk to fail.
+handler, here CPU hotplug support feature is added based on GED handler,
 also CPU scan and reject method is added about CPU device in DSDT table.
-Cc: qemu-stable@nongnu.org
+Co-developed-by: Xianglai Li <lixianglai@loongson.cn>
-Signed-off-by: Song Gao <gaosong@loongson.cn>
+Signed-off-by: Bibo Mao <maobibo@loongson.cn>
 Acked-by: Peter Xu <peterx@redhat.com>
 Message-Id: <20240508024732.3127792-1-gaosong@loongson.cn>
 ---
- target/loongarch/machine.c | 6 ++++--
+ hw/loongarch/Kconfig           |  1 +
-file changed, 4 insertions(+), 2 deletions(-)
+ hw/loongarch/virt-acpi-build.c | 35 +++++++++++++++++++++++++++++++---
  hw/loongarch/virt.c            | 10 ++++++++++
  include/hw/loongarch/virt.h    |  1 +
 files changed, 44 insertions(+), 3 deletions(-)
-diff --git a/target/loongarch/machine.c b/target/loongarch/machine.c
+diff --git a/hw/loongarch/Kconfig b/hw/loongarch/Kconfig
 index XXXXXXX..XXXXXXX 100644
---- a/target/loongarch/machine.c
+--- a/hw/loongarch/Kconfig
-+++ b/target/loongarch/machine.c
++++ b/hw/loongarch/Kconfig
-@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_tlb = {
+@@ -XXX,XX +XXX,XX @@ config LOONGARCH_VIRT
- /* LoongArch CPU state */
+     select LOONGARCH_EXTIOI
- const VMStateDescription vmstate_loongarch_cpu = {
+     select LS7A_RTC
-     .name = "cpu",
+     select SMBIOS
--    .version_id = 1,
++    select ACPI_CPU_HOTPLUG
--    .minimum_version_id = 1,
+     select ACPI_PCI
-+    .version_id = 2,
+     select ACPI_HW_REDUCED
-+    .minimum_version_id = 2,
+     select FW_CFG_DMA
-     .fields = (const VMStateField[]) {
+diff --git a/hw/loongarch/virt-acpi-build.c b/hw/loongarch/virt-acpi-build.c
-         VMSTATE_UINTTL_ARRAY(env.gpr, LoongArchCPU, 32),
+index XXXXXXX..XXXXXXX 100644
-         VMSTATE_UINTTL(env.pc, LoongArchCPU),
+--- a/hw/loongarch/virt-acpi-build.c
-@@ -XXX,XX +XXX,XX @@ const VMStateDescription vmstate_loongarch_cpu = {
++++ b/hw/loongarch/virt-acpi-build.c
-         VMSTATE_UINT64(env.CSR_DERA, LoongArchCPU),
+@@ -XXX,XX +XXX,XX @@
-         VMSTATE_UINT64(env.CSR_DSAVE, LoongArchCPU),
+ #define ACPI_BUILD_DPRINTF(fmt, ...)
+ #endif
-+        VMSTATE_UINT64(kvm_state_counter, LoongArchCPU),
 +static void virt_madt_cpu_entry(int uid,
 +                                const CPUArchIdList *apic_ids,
 +                                GArray *entry, bool force_enabled)
 +{
 +    uint32_t flags, apic_id = apic_ids->cpus[uid].arch_id;
 +
-         VMSTATE_END_OF_LIST()
++    flags = apic_ids->cpus[uid].cpu || force_enabled ? 1 /* Enabled */ : 0;
-     },
++
-     .subsections = (const VMStateDescription * const []) {
++    /* Rev 1.0b, Table 5-13 Processor Local APIC Structure */
 +    build_append_int_noprefix(entry, 0, 1);       /* Type */
 +    build_append_int_noprefix(entry, 8, 1);       /* Length */
 +    build_append_int_noprefix(entry, uid, 1);     /* ACPI Processor ID */
 +    build_append_int_noprefix(entry, apic_id, 1); /* APIC ID */
 +    build_append_int_noprefix(entry, flags, 4); /* Flags */
 +}
 +
  /* build FADT */
  static void init_common_fadt_data(AcpiFadtData *data)
  {
@@ -XXX,XX +XXX,XX @@ build_madt(GArray *table_data, BIOSLinker *linker,
      MachineState *ms = MACHINE(lvms);
      MachineClass *mc = MACHINE_GET_CLASS(ms);
      const CPUArchIdList *arch_ids = mc->possible_cpu_arch_ids(ms);
 -    int i, arch_id;
 +    int i, arch_id, flags;
      AcpiTable table = { .sig = "APIC", .rev = 1, .oem_id = lvms->oem_id,
                          .oem_table_id = lvms->oem_table_id };
@@ -XXX,XX +XXX,XX @@ build_madt(GArray *table_data, BIOSLinker *linker,
      for (i = 0; i < arch_ids->len; i++) {
          /* Processor Core Interrupt Controller Structure */
          arch_id = arch_ids->cpus[i].arch_id;
 -
 +        flags   = arch_ids->cpus[i].cpu ? 1 : 0;
          build_append_int_noprefix(table_data, 17, 1);    /* Type */
          build_append_int_noprefix(table_data, 15, 1);    /* Length */
          build_append_int_noprefix(table_data, 1, 1);     /* Version */
          build_append_int_noprefix(table_data, i, 4);     /* ACPI Processor ID */
          build_append_int_noprefix(table_data, arch_id, 4); /* Core ID */
 -        build_append_int_noprefix(table_data, 1, 4);     /* Flags */
 +        build_append_int_noprefix(table_data, flags, 4); /* Flags */
      }
      /* Extend I/O Interrupt Controller Structure */
@@ -XXX,XX +XXX,XX @@ build_la_ged_aml(Aml *dsdt, MachineState *machine)
  {
      uint32_t event;
      LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(machine);
 +    CPUHotplugFeatures opts;
      build_ged_aml(dsdt, "\\_SB."GED_DEVICE,
                    HOTPLUG_HANDLER(lvms->acpi_ged),
@@ -XXX,XX +XXX,XX @@ build_la_ged_aml(Aml *dsdt, MachineState *machine)
                                   AML_SYSTEM_MEMORY,
                                   VIRT_GED_MEM_ADDR);
      }
 +
 +    if (event & ACPI_GED_CPU_HOTPLUG_EVT) {
 +        opts.acpi_1_compatible = false;
 +        opts.has_legacy_cphp = false;
 +        opts.fw_unplugs_cpu = false;
 +        opts.smi_path = NULL;
 +
 +        build_cpus_aml(dsdt, machine, opts, virt_madt_cpu_entry,
 +                       VIRT_GED_CPUHP_ADDR, "\\_SB",
 +                       AML_GED_EVT_CPU_SCAN_METHOD, AML_SYSTEM_MEMORY);
 +    }
 +
      acpi_dsdt_add_power_button(dsdt);
  }
 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 DeviceState *create_acpi_ged(DeviceState *pch_pic,
  {
      DeviceState *dev;
      MachineState *ms = MACHINE(lvms);
 +    MachineClass *mc = MACHINE_GET_CLASS(lvms);
      uint32_t event = ACPI_GED_PWR_DOWN_EVT;
      if (ms->ram_slots) {
          event |= ACPI_GED_MEM_HOTPLUG_EVT;
      }
 +
 +    if (mc->has_hotpluggable_cpus) {
 +        event |= ACPI_GED_CPU_HOTPLUG_EVT;
 +    }
 +
      dev = qdev_new(TYPE_ACPI_GED);
      qdev_prop_set_uint32(dev, "ged-event", event);
      sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
@@ -XXX,XX +XXX,XX @@ static DeviceState *create_acpi_ged(DeviceState *pch_pic,
      /* ged regs used for reset and power down */
      sysbus_mmio_map(SYS_BUS_DEVICE(dev), 2, VIRT_GED_REG_ADDR);
 +    if (mc->has_hotpluggable_cpus) {
 +        sysbus_mmio_map(SYS_BUS_DEVICE(dev), 3, VIRT_GED_CPUHP_ADDR);
 +    }
 +
      sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,
                         qdev_get_gpio_in(pch_pic, VIRT_SCI_IRQ - VIRT_GSI_BASE));
      return dev;
 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_EVT_ADDR       0x100e0000
  #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 VIRT_GED_CPUHP_ADDR     (VIRT_GED_REG_ADDR + ACPI_GED_REG_COUNT)
  #define COMMAND_LINE_SIZE       512
 --
-.34.1
+.43.5

The following changes since commit 922582ace2df59572a671f5c0c5c6c5c706995e5:

Merge tag 'pull-hppa-20240515' of https://gitlab.com/rth7680/qemu into staging (2024-05-15 11:46:58 +0200)

are available in the Git repository at:

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

for you to fetch changes up to d55d16700a2e2b36c7e34724d4d77f4a75c5243a:

target/loongarch/kvm: fpu save the vreg registers high 192bit (2024-05-16 16:32:35 +0800)

----------------------------------------------------------------
pull-loongarch-20240516

----------------------------------------------------------------
Bibo Mao (3):
      hw/loongarch: Add compat machine for 9.1
      hw/loongarch: Remove minimum and default memory size
      tests: Add migration test for loongarch64

Song Gao (2):
      target/loongarch/kvm: Fix VM recovery from disk failures
      target/loongarch/kvm: fpu save the vreg registers high 192bit

hw/loongarch/virt.c                      | 66 +++++++++++++++++++++++---------
 target/loongarch/kvm/kvm.c               |  6 +++
 target/loongarch/machine.c               |  6 ++-
 tests/migration/Makefile                 |  2 +-
 tests/migration/loongarch64/Makefile     | 18 +++++++++
 tests/migration/loongarch64/a-b-kernel.S | 49 ++++++++++++++++++++++++
 tests/migration/loongarch64/a-b-kernel.h | 16 ++++++++
 tests/migration/migration-test.h         |  3 ++
 tests/qtest/meson.build                  |  2 +-
 tests/qtest/migration-test.c             | 10 +++++
 10 files changed, 156 insertions(+), 22 deletions(-)
 create mode 100644 tests/migration/loongarch64/Makefile
 create mode 100644 tests/migration/loongarch64/a-b-kernel.S
 create mode 100644 tests/migration/loongarch64/a-b-kernel.h

From: Bibo Mao <maobibo@loongson.cn>

Since migration test case requires compat machine type support,
compat machine is added for qemu 9.1 here.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240511034220.3030560-2-maobibo@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
 hw/loongarch/virt.c | 61 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 48 insertions(+), 13 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_class_init(ObjectClass *oc, void *data)
 #endif
 }
 
-static const TypeInfo virt_machine_types[] = {
-    {
-        .name           = TYPE_LOONGARCH_VIRT_MACHINE,
-        .parent         = TYPE_MACHINE,
-        .instance_size  = sizeof(LoongArchVirtMachineState),
-        .class_init     = virt_class_init,
-        .instance_init  = virt_initfn,
-        .interfaces = (InterfaceInfo[]) {
-         { TYPE_HOTPLUG_HANDLER },
-         { }
-        },
-    }
+#define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
+    static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
+                                                    void *data) \
+    { \
+        MachineClass *mc = MACHINE_CLASS(oc); \
+        virt_machine_##major##_##minor##_options(mc); \
+        mc->desc = "QEMU " # major "." # minor " LoongArch Virtual Machine"; \
+        if (latest) { \
+            mc->alias = "virt"; \
+        } \
+    } \
+    static const TypeInfo machvirt_##major##_##minor##_info = { \
+        .name = MACHINE_TYPE_NAME("virt-" # major "." # minor), \
+        .parent = TYPE_LOONGARCH_VIRT_MACHINE, \
+        .class_init = virt_##major##_##minor##_class_init, \
+    }; \
+    static void machvirt_machine_##major##_##minor##_init(void) \
+    { \
+        type_register_static(&machvirt_##major##_##minor##_info); \
+    } \
+    type_init(machvirt_machine_##major##_##minor##_init);
+
+#define DEFINE_VIRT_MACHINE_AS_LATEST(major, minor) \
+    DEFINE_VIRT_MACHINE_LATEST(major, minor, true)
+#define DEFINE_VIRT_MACHINE(major, minor) \
+    DEFINE_VIRT_MACHINE_LATEST(major, minor, false)
+
+static const TypeInfo virt_machine_info = {
+    .name           = TYPE_LOONGARCH_VIRT_MACHINE,
+    .parent         = TYPE_MACHINE,
+    .abstract       = true,
+    .instance_size  = sizeof(LoongArchVirtMachineState),
+    .class_init     = virt_class_init,
+    .instance_init  = virt_initfn,
+    .interfaces = (InterfaceInfo[]) {
+    { TYPE_HOTPLUG_HANDLER },
+    { }
+    },
 };
 
-DEFINE_TYPES(virt_machine_types)
+static void machvirt_machine_init(void)
+{
+    type_register_static(&virt_machine_info);
+}
+type_init(machvirt_machine_init);
+
+static void virt_machine_9_1_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE_AS_LATEST(9, 1)
-- 
2.34.1

From: Bibo Mao <maobibo@loongson.cn>

Some qtest test cases such as numa use default memory size of generic
machine class, which is 128M by fault.

Here generic default memory size is used, and also remove minimum memory
size which is 1G originally.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240511034220.3030560-3-maobibo@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
 hw/loongarch/virt.c | 5 -----
 1 file changed, 5 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_init(MachineState *machine)
         cpu_model = LOONGARCH_CPU_TYPE_NAME("la464");
     }
 
-    if (ram_size < 1 * GiB) {
-        error_report("ram_size must be greater than 1G.");
-        exit(1);
-    }
     create_fdt(lvms);
 
     /* Create IOCSR space */
@@ -XXX,XX +XXX,XX @@ static void virt_class_init(ObjectClass *oc, void *data)
     HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
 
     mc->init = virt_init;
-    mc->default_ram_size = 1 * GiB;
     mc->default_cpu_type = LOONGARCH_CPU_TYPE_NAME("la464");
     mc->default_ram_id = "loongarch.ram";
     mc->max_cpus = LOONGARCH_MAX_CPUS;
-- 
2.34.1

From: Bibo Mao <maobibo@loongson.cn>

This patch adds migration test support for loongarch64. The test code
comes from aarch64 mostly, only that it booted as bios in qemu since
kernel requires elf format and bios uses binary format.

In addition to providing the binary, this patch also includes the source
code and the build script in tests/migration/loongarch64. So users can
change the source and/or re-compile the binary as they wish.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Acked-by: Thomas Huth <thuth@redhat.com>
Acked-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Tested-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240511034220.3030560-4-maobibo@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
 tests/migration/Makefile                 |  2 +-
 tests/migration/loongarch64/Makefile     | 18 +++++++++
 tests/migration/loongarch64/a-b-kernel.S | 49 ++++++++++++++++++++++++
 tests/migration/loongarch64/a-b-kernel.h | 16 ++++++++
 tests/migration/migration-test.h         |  3 ++
 tests/qtest/meson.build                  |  2 +-
 tests/qtest/migration-test.c             | 10 +++++
 7 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 tests/migration/loongarch64/Makefile
 create mode 100644 tests/migration/loongarch64/a-b-kernel.S
 create mode 100644 tests/migration/loongarch64/a-b-kernel.h

diff --git a/tests/migration/Makefile b/tests/migration/Makefile
index XXXXXXX..XXXXXXX 100644
--- a/tests/migration/Makefile
+++ b/tests/migration/Makefile
@@ -XXX,XX +XXX,XX @@
 # See the COPYING file in the top-level directory.
 #
 
-TARGET_LIST = i386 aarch64 s390x
+TARGET_LIST = i386 aarch64 s390x loongarch64
 
 SRC_PATH = ../..
 
diff --git a/tests/migration/loongarch64/Makefile b/tests/migration/loongarch64/Makefile
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/migration/loongarch64/Makefile
@@ -XXX,XX +XXX,XX @@
+# To specify cross compiler prefix, use CROSS_PREFIX=
+#   $ make CROSS_PREFIX=loongarch64-linux-gnu-
+
+.PHONY: all clean
+all: a-b-kernel.h
+
+a-b-kernel.h: loongarch64.kernel
+	echo "$$__note" > $@
+	xxd -i $< | sed -e 's/.*int.*//' >> $@
+
+loongarch64.kernel: loongarch64.elf
+	$(CROSS_PREFIX)objcopy -j .text -O binary $< $@
+
+loongarch64.elf: a-b-kernel.S
+	$(CROSS_PREFIX)gcc -o $@ -nostdlib -Wl,--build-id=none $<
+
+clean:
+	$(RM) *.kernel *.elf
diff --git a/tests/migration/loongarch64/a-b-kernel.S b/tests/migration/loongarch64/a-b-kernel.S
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/migration/loongarch64/a-b-kernel.S
@@ -XXX,XX +XXX,XX @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (c) 2024 Loongson Technology Corporation Limited
+ */
+#include "../migration-test.h"
+
+#define LOONGARCH_CSR_CRMD          0
+#define LOONGARCH_VIRT_UART         0x1FE001E0
+.section .text
+
+    .globl  _start
+_start:
+    /* output char 'A' to UART16550 */
+    li.d    $t0, LOONGARCH_VIRT_UART
+    li.w    $t1, 'A'
+    st.b    $t1, $t0, 0
+
+    /* traverse test memory region */
+    li.d    $t0, LOONGARCH_TEST_MEM_START
+    li.d    $t1, LOONGARCH_TEST_MEM_END
+    li.d    $t2, TEST_MEM_PAGE_SIZE
+    li.d    $t4, LOONGARCH_VIRT_UART
+    li.w    $t5, 'B'
+
+clean:
+    st.b    $zero, $t0, 0
+    add.d   $t0,   $t0, $t2
+    bne     $t0,   $t1, clean
+    /* keeps a counter so we can limit the output speed */
+    addi.d  $t6,   $zero, 0
+
+mainloop:
+    li.d    $t0, LOONGARCH_TEST_MEM_START
+
+innerloop:
+    ld.bu   $t3, $t0, 0
+    addi.w  $t3, $t3, 1
+    ext.w.b $t3, $t3
+    st.b    $t3, $t0, 0
+    add.d   $t0, $t0, $t2
+    bne     $t0, $t1, innerloop
+
+    addi.d  $t6, $t6, 1
+    andi    $t6, $t6, 31
+    bnez    $t6, mainloop
+
+    st.b    $t5, $t4, 0
+    b       mainloop
+    nop
diff --git a/tests/migration/loongarch64/a-b-kernel.h b/tests/migration/loongarch64/a-b-kernel.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/migration/loongarch64/a-b-kernel.h
@@ -XXX,XX +XXX,XX @@
+/* This file is automatically generated from the assembly file in
+* tests/migration/loongarch64. Edit that file and then run "make all"
+* inside tests/migration to update, and then remember to send both
+* the header and the assembler differences in your patch submission.
+*/
+unsigned char loongarch64_kernel[] = {
+  0x0c, 0xc0, 0x3f, 0x14, 0x8c, 0x81, 0x87, 0x03, 0x0d, 0x04, 0x81, 0x03,
+  0x8d, 0x01, 0x00, 0x29, 0x0c, 0x00, 0x04, 0x14, 0x0d, 0x80, 0x0c, 0x14,
+  0x2e, 0x00, 0x00, 0x14, 0x10, 0xc0, 0x3f, 0x14, 0x10, 0x82, 0x87, 0x03,
+  0x11, 0x08, 0x81, 0x03, 0x80, 0x01, 0x00, 0x29, 0x8c, 0xb9, 0x10, 0x00,
+  0x8d, 0xf9, 0xff, 0x5f, 0x12, 0x00, 0xc0, 0x02, 0x0c, 0x00, 0x04, 0x14,
+  0x8f, 0x01, 0x00, 0x2a, 0xef, 0x05, 0x80, 0x02, 0xef, 0x5d, 0x00, 0x00,
+  0x8f, 0x01, 0x00, 0x29, 0x8c, 0xb9, 0x10, 0x00, 0x8d, 0xed, 0xff, 0x5f,
+  0x52, 0x06, 0xc0, 0x02, 0x52, 0x7e, 0x40, 0x03, 0x5f, 0xde, 0xff, 0x47,
+  0x11, 0x02, 0x00, 0x29, 0xff, 0xd7, 0xff, 0x53, 0x00, 0x00, 0x40, 0x03
+};
diff --git a/tests/migration/migration-test.h b/tests/migration/migration-test.h
index XXXXXXX..XXXXXXX 100644
--- a/tests/migration/migration-test.h
+++ b/tests/migration/migration-test.h
@@ -XXX,XX +XXX,XX @@
  */
 #define ARM_TEST_MAX_KERNEL_SIZE (512 * 1024)
 
+/* LoongArch64 */
+#define LOONGARCH_TEST_MEM_START (32 * 1024 * 1024)
+#define LOONGARCH_TEST_MEM_END   (100 * 1024 * 1024)
 #endif /* MIGRATION_TEST_H */
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -XXX,XX +XXX,XX @@ qtests_hppa = ['boot-serial-test'] + \
   (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
 
 qtests_loongarch64 = qtests_filter + \
-  ['boot-serial-test']
+  ['boot-serial-test', 'migration-test']
 
 qtests_m68k = ['boot-serial-test'] + \
   qtests_filter
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -XXX,XX +XXX,XX @@ static char *bootpath;
 #include "tests/migration/i386/a-b-bootblock.h"
 #include "tests/migration/aarch64/a-b-kernel.h"
 #include "tests/migration/s390x/a-b-bios.h"
+#include "tests/migration/loongarch64/a-b-kernel.h"
 
 static void bootfile_create(char *dir, bool suspend_me)
 {
@@ -XXX,XX +XXX,XX @@ static void bootfile_create(char *dir, bool suspend_me)
         content = aarch64_kernel;
         len = sizeof(aarch64_kernel);
         g_assert(sizeof(aarch64_kernel) <= ARM_TEST_MAX_KERNEL_SIZE);
+    } else if (strcmp(arch, "loongarch64") == 0) {
+        content = loongarch64_kernel;
+        len = sizeof(loongarch64_kernel);
     } else {
         g_assert_not_reached();
     }
@@ -XXX,XX +XXX,XX @@ static int test_migrate_start(QTestState **from, QTestState **to,
         arch_opts = g_strdup_printf("-cpu max -kernel %s", bootpath);
         start_address = ARM_TEST_MEM_START;
         end_address = ARM_TEST_MEM_END;
+    } else if (strcmp(arch, "loongarch64") == 0) {
+        memory_size = "256M";
+        machine_alias = "virt";
+        arch_opts = g_strdup_printf("-cpu la464 -bios %s", bootpath);
+        start_address = LOONGARCH_TEST_MEM_START;
+        end_address = LOONGARCH_TEST_MEM_END;
     } else {
         g_assert_not_reached();
     }
-- 
2.34.1

vmstate does not save kvm_state_conter,
which can cause VM recovery from disk to fail.

Cc: qemu-stable@nongnu.org
Signed-off-by: Song Gao <gaosong@loongson.cn>
Acked-by: Peter Xu <peterx@redhat.com>
Message-Id: <20240508024732.3127792-1-gaosong@loongson.cn>
---
 target/loongarch/machine.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/target/loongarch/machine.c b/target/loongarch/machine.c
index XXXXXXX..XXXXXXX 100644
--- a/target/loongarch/machine.c
+++ b/target/loongarch/machine.c
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_tlb = {
 /* LoongArch CPU state */
 const VMStateDescription vmstate_loongarch_cpu = {
     .name = "cpu",
-    .version_id = 1,
-    .minimum_version_id = 1,
+    .version_id = 2,
+    .minimum_version_id = 2,
     .fields = (const VMStateField[]) {
         VMSTATE_UINTTL_ARRAY(env.gpr, LoongArchCPU, 32),
         VMSTATE_UINTTL(env.pc, LoongArchCPU),
@@ -XXX,XX +XXX,XX @@ const VMStateDescription vmstate_loongarch_cpu = {
         VMSTATE_UINT64(env.CSR_DERA, LoongArchCPU),
         VMSTATE_UINT64(env.CSR_DSAVE, LoongArchCPU),
 
+        VMSTATE_UINT64(kvm_state_counter, LoongArchCPU),
+
         VMSTATE_END_OF_LIST()
     },
     .subsections = (const VMStateDescription * const []) {
-- 
2.34.1

On kvm side, get_fpu/set_fpu save the vreg registers high 192bits,
but QEMU missing.

Signed-off-by: Song Gao <gaosong@loongson.cn>
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
Message-Id: <20240514110752.989572-1-gaosong@loongson.cn>
---
 target/loongarch/kvm/kvm.c | 6 ++++++
 1 file changed, 6 insertions(+)

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 int kvm_loongarch_get_regs_fp(CPUState *cs)
     env->fcsr0 = fpu.fcsr;
     for (i = 0; i < 32; i++) {
         env->fpr[i].vreg.UD[0] = fpu.fpr[i].val64[0];
+        env->fpr[i].vreg.UD[1] = fpu.fpr[i].val64[1];
+        env->fpr[i].vreg.UD[2] = fpu.fpr[i].val64[2];
+        env->fpr[i].vreg.UD[3] = fpu.fpr[i].val64[3];
     }
     for (i = 0; i < 8; i++) {
         env->cf[i] = fpu.fcc & 0xFF;
@@ -XXX,XX +XXX,XX @@ static int kvm_loongarch_put_regs_fp(CPUState *cs)
     fpu.fcc = 0;
     for (i = 0; i < 32; i++) {
         fpu.fpr[i].val64[0] = env->fpr[i].vreg.UD[0];
+        fpu.fpr[i].val64[1] = env->fpr[i].vreg.UD[1];
+        fpu.fpr[i].val64[2] = env->fpr[i].vreg.UD[2];
+        fpu.fpr[i].val64[3] = env->fpr[i].vreg.UD[3];
     }
 
     for (i = 0; i < 8; i++) {
-- 
2.34.1

The following changes since commit 661c2e1ab29cd9c4d268ae3f44712e8d421c0e56:

scripts/checkpatch: Fix a typo (2025-03-04 09:30:26 +0800)

are available in the Git repository at:

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

for you to fetch changes up to 0a629c827300d514cc1f61806414d214fcf75051:

target/loongarch: Adjust the cpu reset action to a proper position (2025-03-05 09:45:52 +0800)

----------------------------------------------------------------
pull-loongarch-20250305 queue

----------------------------------------------------------------
Bibo Mao (14):
      hw/intc/loongarch_ipi: Add basic hotplug framework
      hw/intc/loongarch_ipi: Implment cpu hotplug interface
      hw/intc/loongarch_ipi: Notify ipi object when cpu is plugged
      hw/intc/loongarch_extioi: Move gpio irq initial to common code
      hw/intc/loongarch_extioi: Add basic hotplug framework
      hw/intc/loongarch_extioi: Implment cpu hotplug interface
      hw/intc/loongarch_extioi: Use cpu plug notification
      hw/loongarch/virt: Add CPU topology support
      hw/loongarch/virt: Add topo properties on CPU object
      hw/loongarch/virt: Add basic cpu plug interface framework
      hw/loongarch/virt: Implement cpu unplug interface
      hw/loongarch/virt: Implement cpu plug interface
      hw/loongarch/virt: Update the ACPI table for hotplug cpu
      hw/loongarch/virt: Enable cpu hotplug feature on virt machine

Xianglai Li (1):
      target/loongarch: Adjust the cpu reset action to a proper position

LoongArch ipi can send interrupt to multiple CPUs, interrupt routing
to CPU comes from destination physical cpu id. Here hotplug interface
is added for IPI object, so that parent irq line can be connected, and
routing table can be added for new created cpu.

Here only basic hotplug framework is added, it is stub function.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 hw/intc/loongarch_ipi.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/hw/intc/loongarch_ipi.c b/hw/intc/loongarch_ipi.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/intc/loongarch_ipi.c
+++ b/hw/intc/loongarch_ipi.c
@@ -XXX,XX +XXX,XX @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "hw/boards.h"
 #include "qapi/error.h"
 #include "hw/intc/loongarch_ipi.h"
@@ -XXX,XX +XXX,XX @@ static void loongarch_ipi_realize(DeviceState *dev, Error **errp)
     }
 }
 
+static void loongarch_ipi_cpu_plug(HotplugHandler *hotplug_dev,
+                                   DeviceState *dev, Error **errp)
+{
+    Object *obj = OBJECT(dev);
+
+    if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
+        warn_report("LoongArch extioi: Invalid %s device type",
+                                       object_get_typename(obj));
+        return;
+    }
+}
+
+static void loongarch_ipi_cpu_unplug(HotplugHandler *hotplug_dev,
+                                     DeviceState *dev, Error **errp)
+{
+    Object *obj = OBJECT(dev);
+
+    if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
+        warn_report("LoongArch extioi: Invalid %s device type",
+                                       object_get_typename(obj));
+        return;
+    }
+}
+
 static void loongarch_ipi_class_init(ObjectClass *klass, void *data)
 {
     LoongsonIPICommonClass *licc = LOONGSON_IPI_COMMON_CLASS(klass);
+    HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass);
     LoongarchIPIClass *lic = LOONGARCH_IPI_CLASS(klass);
     DeviceClass *dc = DEVICE_CLASS(klass);
 
@@ -XXX,XX +XXX,XX @@ static void loongarch_ipi_class_init(ObjectClass *klass, void *data)
                                     &lic->parent_realize);
     licc->get_iocsr_as = get_iocsr_as;
     licc->cpu_by_arch_id = loongarch_cpu_by_arch_id;
+    hc->plug = loongarch_ipi_cpu_plug;
+    hc->unplug = loongarch_ipi_cpu_unplug;
 }
 
 static const TypeInfo loongarch_ipi_types[] = {
@@ -XXX,XX +XXX,XX @@ static const TypeInfo loongarch_ipi_types[] = {
         .instance_size      = sizeof(LoongarchIPIState),
         .class_size         = sizeof(LoongarchIPIClass),
         .class_init         = loongarch_ipi_class_init,
+        .interfaces         = (InterfaceInfo[]) {
+            { TYPE_HOTPLUG_HANDLER },
+            { }
+        },
     }
 };
 
-- 
2.43.5

Add logic cpu allocation and cpu mapping with cpu hotplug interface.
When cpu is added, connect ipi gpio irq to CPU IRQ_IPI irq pin.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 hw/intc/loongarch_ipi.c | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/hw/intc/loongarch_ipi.c b/hw/intc/loongarch_ipi.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/intc/loongarch_ipi.c
+++ b/hw/intc/loongarch_ipi.c
@@ -XXX,XX +XXX,XX @@ static int loongarch_cpu_by_arch_id(LoongsonIPICommonState *lics,
     return MEMTX_ERROR;
 }
 
+static IPICore *loongarch_ipi_get_cpu(LoongsonIPICommonState *lics,
+                                      DeviceState *dev)
+{
+    CPUClass *k = CPU_GET_CLASS(dev);
+    uint64_t arch_id = k->get_arch_id(CPU(dev));
+    int i;
+
+    for (i = 0; i < lics->num_cpu; i++) {
+        if (lics->cpu[i].arch_id == arch_id) {
+            return &lics->cpu[i];
+        }
+    }
+
+    return NULL;
+}
+
 static void loongarch_ipi_realize(DeviceState *dev, Error **errp)
 {
     LoongsonIPICommonState *lics = LOONGSON_IPI_COMMON(dev);
@@ -XXX,XX +XXX,XX @@ static void loongarch_ipi_realize(DeviceState *dev, Error **errp)
 static void loongarch_ipi_cpu_plug(HotplugHandler *hotplug_dev,
                                    DeviceState *dev, Error **errp)
 {
+    LoongsonIPICommonState *lics = LOONGSON_IPI_COMMON(hotplug_dev);
     Object *obj = OBJECT(dev);
+    IPICore *core;
+    int index;
 
     if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
         warn_report("LoongArch extioi: Invalid %s device type",
                                        object_get_typename(obj));
         return;
     }
+
+    core = loongarch_ipi_get_cpu(lics, dev);
+    if (!core) {
+        return;
+    }
+
+    core->cpu = CPU(dev);
+    index = core - lics->cpu;
+
+    /* connect ipi irq to cpu irq */
+    qdev_connect_gpio_out(DEVICE(lics), index, qdev_get_gpio_in(dev, IRQ_IPI));
 }
 
 static void loongarch_ipi_cpu_unplug(HotplugHandler *hotplug_dev,
                                      DeviceState *dev, Error **errp)
 {
+    LoongsonIPICommonState *lics = LOONGSON_IPI_COMMON(hotplug_dev);
     Object *obj = OBJECT(dev);
+    IPICore *core;
 
     if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
         warn_report("LoongArch extioi: Invalid %s device type",
                                        object_get_typename(obj));
         return;
     }
+
+    core = loongarch_ipi_get_cpu(lics, dev);
+    if (!core) {
+        return;
+    }
+
+    core->cpu = NULL;
 }
 
 static void loongarch_ipi_class_init(ObjectClass *klass, void *data)
-- 
2.43.5

Use hotplug_handler_plug() to nofity ipi object when cold-plug
cpu is created, so that ipi can set and configure irq routing
to new cpu.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 hw/loongarch/virt.c | 5 ++---
 1 file changed, 2 insertions(+), 3 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_cpu_irq_init(LoongArchVirtMachineState *lvms)
     MachineClass *mc = MACHINE_GET_CLASS(ms);
     const CPUArchIdList *possible_cpus;
     CPUState *cs;
+    Error *err = NULL;
 
     /* cpu nodes */
     possible_cpus = mc->possible_cpu_arch_ids(ms);
@@ -XXX,XX +XXX,XX @@ static void virt_cpu_irq_init(LoongArchVirtMachineState *lvms)
             continue;
         }
 
-        /* connect ipi irq to cpu irq */
-        qdev_connect_gpio_out(lvms->ipi, num,
-                              qdev_get_gpio_in(DEVICE(cs), IRQ_IPI));
+        hotplug_handler_plug(HOTPLUG_HANDLER(lvms->ipi), DEVICE(cs), &err);
 
         /*
          * connect ext irq to the cpu irq
-- 
2.43.5

When cpu is added, it will connect gpio irq line to cpu irq.
And cpu hot-add is put in common code, move gpio irq initial
part into common code.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 hw/intc/loongarch_extioi.c        | 8 +-------
 hw/intc/loongarch_extioi_common.c | 6 +++++-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/hw/intc/loongarch_extioi.c b/hw/intc/loongarch_extioi.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/intc/loongarch_extioi.c
+++ b/hw/intc/loongarch_extioi.c
@@ -XXX,XX +XXX,XX @@ static void loongarch_extioi_realize(DeviceState *dev, Error **errp)
     LoongArchExtIOIClass *lec = LOONGARCH_EXTIOI_GET_CLASS(dev);
     SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
     Error *local_err = NULL;
-    int i, pin;
+    int i;
 
     lec->parent_realize(dev, &local_err);
     if (local_err) {
@@ -XXX,XX +XXX,XX @@ static void loongarch_extioi_realize(DeviceState *dev, Error **errp)
     } else {
         s->status |= BIT(EXTIOI_ENABLE);
     }
-
-    for (i = 0; i < s->num_cpu; i++) {
-        for (pin = 0; pin < LS3A_INTC_IP; pin++) {
-            qdev_init_gpio_out(dev, &s->cpu[i].parent_irq[pin], 1);
-        }
-    }
 }
 
 static void loongarch_extioi_unrealize(DeviceState *dev)
diff --git a/hw/intc/loongarch_extioi_common.c b/hw/intc/loongarch_extioi_common.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/intc/loongarch_extioi_common.c
+++ b/hw/intc/loongarch_extioi_common.c
@@ -XXX,XX +XXX,XX @@ static void loongarch_extioi_common_realize(DeviceState *dev, Error **errp)
     MachineState *machine = MACHINE(qdev_get_machine());
     MachineClass *mc = MACHINE_GET_CLASS(machine);
     const CPUArchIdList *id_list;
-    int i;
+    int i, pin;
 
     assert(mc->possible_cpu_arch_ids);
     id_list = mc->possible_cpu_arch_ids(machine);
@@ -XXX,XX +XXX,XX @@ static void loongarch_extioi_common_realize(DeviceState *dev, Error **errp)
     for (i = 0; i < s->num_cpu; i++) {
         s->cpu[i].arch_id = id_list->cpus[i].arch_id;
         s->cpu[i].cpu = CPU(id_list->cpus[i].cpu);
+
+        for (pin = 0; pin < LS3A_INTC_IP; pin++) {
+            qdev_init_gpio_out(dev, &s->cpu[i].parent_irq[pin], 1);
+        }
     }
 }
 
-- 
2.43.5

LoongArch extioi interrupt controller routes peripheral interrupt
to multiple CPUs, physical cpu id is used in interrupt routing table.
Here hotplug interface is added for extioi object, so that parent irq
line can be connected, and routing table can be added for new created
cpu.

Here only basic hotplug framework is added, it is stub function.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 hw/intc/loongarch_extioi_common.c | 33 +++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/hw/intc/loongarch_extioi_common.c b/hw/intc/loongarch_extioi_common.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/intc/loongarch_extioi_common.c
+++ b/hw/intc/loongarch_extioi_common.c
@@ -XXX,XX +XXX,XX @@
  * Copyright (C) 2024 Loongson Technology Corporation Limited
  */
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/qdev-properties.h"
 #include "hw/intc/loongarch_extioi_common.h"
 #include "migration/vmstate.h"
+#include "target/loongarch/cpu.h"
+
+static void loongarch_extioi_cpu_plug(HotplugHandler *hotplug_dev,
+                                      DeviceState *dev, Error **errp)
+{
+    Object *obj = OBJECT(dev);
+
+    if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
+        warn_report("LoongArch extioi: Invalid %s device type",
+                                       object_get_typename(obj));
+        return;
+    }
+}
+
+static void loongarch_extioi_cpu_unplug(HotplugHandler *hotplug_dev,
+                                        DeviceState *dev, Error **errp)
+{
+    Object *obj = OBJECT(dev);
+
+    if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
+        warn_report("LoongArch extioi: Invalid %s device type",
+                                       object_get_typename(obj));
+        return;
+    }
+}
 
 static void loongarch_extioi_common_realize(DeviceState *dev, Error **errp)
 {
@@ -XXX,XX +XXX,XX @@ static void loongarch_extioi_common_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
     LoongArchExtIOICommonClass *lecc = LOONGARCH_EXTIOI_COMMON_CLASS(klass);
+    HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass);
 
     device_class_set_parent_realize(dc, loongarch_extioi_common_realize,
                                     &lecc->parent_realize);
     device_class_set_props(dc, extioi_properties);
     dc->vmsd = &vmstate_loongarch_extioi;
+    hc->plug = loongarch_extioi_cpu_plug;
+    hc->unplug = loongarch_extioi_cpu_unplug;
 }
 
 static const TypeInfo loongarch_extioi_common_types[] = {
@@ -XXX,XX +XXX,XX @@ static const TypeInfo loongarch_extioi_common_types[] = {
         .instance_size      = sizeof(LoongArchExtIOICommonState),
         .class_size         = sizeof(LoongArchExtIOICommonClass),
         .class_init         = loongarch_extioi_common_class_init,
+        .interfaces         = (InterfaceInfo[]) {
+            { TYPE_HOTPLUG_HANDLER },
+            { }
+        },
         .abstract           = true,
     }
 };
-- 
2.43.5

When cpu is added, connect extioi gpio irq to CPU irq pin.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 hw/intc/loongarch_extioi_common.c | 45 +++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/hw/intc/loongarch_extioi_common.c b/hw/intc/loongarch_extioi_common.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/intc/loongarch_extioi_common.c
+++ b/hw/intc/loongarch_extioi_common.c
@@ -XXX,XX +XXX,XX @@
 #include "migration/vmstate.h"
 #include "target/loongarch/cpu.h"
 
+static ExtIOICore *loongarch_extioi_get_cpu(LoongArchExtIOICommonState *s,
+                                            DeviceState *dev)
+{
+    CPUClass *k = CPU_GET_CLASS(dev);
+    uint64_t arch_id = k->get_arch_id(CPU(dev));
+    int i;
+
+    for (i = 0; i < s->num_cpu; i++) {
+        if (s->cpu[i].arch_id == arch_id) {
+            return &s->cpu[i];
+        }
+    }
+
+    return NULL;
+}
+
 static void loongarch_extioi_cpu_plug(HotplugHandler *hotplug_dev,
                                       DeviceState *dev, Error **errp)
 {
+    LoongArchExtIOICommonState *s = LOONGARCH_EXTIOI_COMMON(hotplug_dev);
     Object *obj = OBJECT(dev);
+    ExtIOICore *core;
+    int pin, index;
 
     if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
         warn_report("LoongArch extioi: Invalid %s device type",
                                        object_get_typename(obj));
         return;
     }
+
+    core = loongarch_extioi_get_cpu(s, dev);
+    if (!core) {
+        return;
+    }
+
+    core->cpu = CPU(dev);
+    index = core - s->cpu;
+
+    /*
+     * connect extioi irq to the cpu irq
+     * cpu_pin[LS3A_INTC_IP + 2 : 2] <= intc_pin[LS3A_INTC_IP : 0]
+     */
+    for (pin = 0; pin < LS3A_INTC_IP; pin++) {
+        qdev_connect_gpio_out(DEVICE(s), index * LS3A_INTC_IP + pin,
+                              qdev_get_gpio_in(dev, pin + 2));
+    }
 }
 
 static void loongarch_extioi_cpu_unplug(HotplugHandler *hotplug_dev,
                                         DeviceState *dev, Error **errp)
 {
+    LoongArchExtIOICommonState *s = LOONGARCH_EXTIOI_COMMON(hotplug_dev);
     Object *obj = OBJECT(dev);
+    ExtIOICore *core;
 
     if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
         warn_report("LoongArch extioi: Invalid %s device type",
                                        object_get_typename(obj));
         return;
     }
+
+    core = loongarch_extioi_get_cpu(s, dev);
+    if (!core) {
+        return;
+    }
+
+    core->cpu = NULL;
 }
 
 static void loongarch_extioi_common_realize(DeviceState *dev, Error **errp)
-- 
2.43.5

Use hotplug_handler_plug() to nofity extioi object when cold-plug
cpu is created, so that extioi can set and configure irq routing
to new cpu.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 hw/loongarch/virt.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 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_devices_init(DeviceState *pch_pic,
 
 static void virt_cpu_irq_init(LoongArchVirtMachineState *lvms)
 {
-    int num, pin;
+    int num;
     MachineState *ms = MACHINE(lvms);
     MachineClass *mc = MACHINE_GET_CLASS(ms);
     const CPUArchIdList *possible_cpus;
@@ -XXX,XX +XXX,XX @@ static void virt_cpu_irq_init(LoongArchVirtMachineState *lvms)
         }
 
         hotplug_handler_plug(HOTPLUG_HANDLER(lvms->ipi), DEVICE(cs), &err);
-
-        /*
-         * connect ext irq to the cpu irq
-         * cpu_pin[9:2] <= intc_pin[7:0]
-         */
-        for (pin = 0; pin < LS3A_INTC_IP; pin++) {
-            qdev_connect_gpio_out(lvms->extioi, (num * LS3A_INTC_IP + pin),
-                                  qdev_get_gpio_in(DEVICE(cs), pin + 2));
-        }
+        hotplug_handler_plug(HOTPLUG_HANDLER(lvms->extioi), DEVICE(cs), &err);
     }
 }
 
-- 
2.43.5

Add topological relationships for Loongarch VCPU and initialize
topology member variables.

On LoongArch system there is socket/core/thread topo information,
physical CPU id is calculated from CPU topo, every topo sub-field is
aligned by power of 2. So it is different from logical cpu index.

Co-developed-by: Xianglai Li <lixianglai@loongson.cn>
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 hw/loongarch/virt.c    | 59 ++++++++++++++++++++++++++++++++++++------
 target/loongarch/cpu.h |  6 +++++
 2 files changed, 57 insertions(+), 8 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_initfn(Object *obj)
     virt_flash_create(lvms);
 }
 
+static void virt_get_topo_from_index(MachineState *ms,
+                                     LoongArchCPUTopo *topo, int index)
+{
+    topo->socket_id = index / (ms->smp.cores * ms->smp.threads);
+    topo->core_id = index / ms->smp.threads % ms->smp.cores;
+    topo->thread_id = index % ms->smp.threads;
+}
+
+static unsigned int topo_align_up(unsigned int count)
+{
+    g_assert(count >= 1);
+    count -= 1;
+    return BIT(count ? 32 - clz32(count) : 0);
+}
+
+/*
+ * LoongArch Reference Manual Vol1, Chapter 7.4.12 CPU Identity
+ *  For CPU architecture, bit0 .. bit8 is valid for CPU id, max cpuid is 512
+ *  However for IPI/Eiointc interrupt controller, max supported cpu id for
+ *  irq routingis 256
+ *
+ *  Here max cpu id is 256 for virt machine
+ */
+static int virt_get_arch_id_from_topo(MachineState *ms, LoongArchCPUTopo *topo)
+{
+    int arch_id, threads, cores, sockets;
+
+    threads = topo_align_up(ms->smp.threads);
+    cores = topo_align_up(ms->smp.cores);
+    sockets = topo_align_up(ms->smp.sockets);
+    if ((threads * cores * sockets) > 256) {
+        error_report("Exceeding max cpuid 256 with sockets[%d] cores[%d]"
+                     " threads[%d]", ms->smp.sockets, ms->smp.cores,
+                     ms->smp.threads);
+        exit(1);
+    }
+
+    arch_id = topo->thread_id + topo->core_id * threads;
+    arch_id += topo->socket_id * threads * cores;
+    return arch_id;
+}
+
 static bool memhp_type_supported(DeviceState *dev)
 {
     /* we only support pc dimm now */
@@ -XXX,XX +XXX,XX @@ static HotplugHandler *virt_get_hotplug_handler(MachineState *machine,
 
 static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)
 {
-    int n;
+    int n, arch_id;
     unsigned int max_cpus = ms->smp.max_cpus;
+    LoongArchCPUTopo topo;
 
     if (ms->possible_cpus) {
         assert(ms->possible_cpus->len == max_cpus);
@@ -XXX,XX +XXX,XX @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)
                                   sizeof(CPUArchId) * max_cpus);
     ms->possible_cpus->len = max_cpus;
     for (n = 0; n < ms->possible_cpus->len; n++) {
+        virt_get_topo_from_index(ms, &topo, n);
+        arch_id = virt_get_arch_id_from_topo(ms, &topo);
         ms->possible_cpus->cpus[n].type = ms->cpu_type;
-        ms->possible_cpus->cpus[n].arch_id = n;
-
+        ms->possible_cpus->cpus[n].arch_id = arch_id;
+        ms->possible_cpus->cpus[n].vcpus_count = 1;
         ms->possible_cpus->cpus[n].props.has_socket_id = true;
-        ms->possible_cpus->cpus[n].props.socket_id  =
-                                   n / (ms->smp.cores * ms->smp.threads);
+        ms->possible_cpus->cpus[n].props.socket_id = topo.socket_id;
         ms->possible_cpus->cpus[n].props.has_core_id = true;
-        ms->possible_cpus->cpus[n].props.core_id =
-                                   n / ms->smp.threads % ms->smp.cores;
+        ms->possible_cpus->cpus[n].props.core_id = topo.core_id;
         ms->possible_cpus->cpus[n].props.has_thread_id = true;
-        ms->possible_cpus->cpus[n].props.thread_id = n % ms->smp.threads;
+        ms->possible_cpus->cpus[n].props.thread_id = topo.thread_id;
     }
     return ms->possible_cpus;
 }
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 {
 #endif
 } CPULoongArchState;
 
+typedef struct LoongArchCPUTopo {
+    int32_t socket_id;  /* socket-id of this VCPU */
+    int32_t core_id;    /* core-id of this VCPU */
+    int32_t thread_id;  /* thread-id of this VCPU */
+} LoongArchCPUTopo;
+
 /**
  * LoongArchCPU:
  * @env: #CPULoongArchState
-- 
2.43.5

Add some properties such as socket_id, core_id, thread_id and node_id
on LoongArch CPU object.

Co-developed-by: Xianglai Li <lixianglai@loongson.cn>
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 target/loongarch/cpu.c | 9 +++++++++
 target/loongarch/cpu.h | 4 ++++
 2 files changed, 13 insertions(+)

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 @@
 #include "system/tcg.h"
 #include "system/kvm.h"
 #include "kvm/kvm_loongarch.h"
+#include "hw/qdev-properties.h"
 #include "exec/exec-all.h"
 #include "exec/translation-block.h"
 #include "cpu.h"
@@ -XXX,XX +XXX,XX @@ static int64_t loongarch_cpu_get_arch_id(CPUState *cs)
 }
 #endif
 
+static const Property loongarch_cpu_properties[] = {
+    DEFINE_PROP_INT32("socket-id", LoongArchCPU, socket_id, 0),
+    DEFINE_PROP_INT32("core-id", LoongArchCPU, core_id, 0),
+    DEFINE_PROP_INT32("thread-id", LoongArchCPU, thread_id, 0),
+    DEFINE_PROP_INT32("node-id", LoongArchCPU, node_id, CPU_UNSET_NUMA_NODE_ID),
+};
+
 static void loongarch_cpu_class_init(ObjectClass *c, void *data)
 {
     LoongArchCPUClass *lacc = LOONGARCH_CPU_CLASS(c);
@@ -XXX,XX +XXX,XX @@ static void loongarch_cpu_class_init(ObjectClass *c, void *data)
     DeviceClass *dc = DEVICE_CLASS(c);
     ResettableClass *rc = RESETTABLE_CLASS(c);
 
+    device_class_set_props(dc, loongarch_cpu_properties);
     device_class_set_parent_realize(dc, loongarch_cpu_realizefn,
                                     &lacc->parent_realize);
     resettable_class_set_parent_phases(rc, NULL, loongarch_cpu_reset_hold, NULL,
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 @@ struct ArchCPU {
     OnOffAuto lasx;
     OnOffAuto kvm_pv_ipi;
     OnOffAuto kvm_steal_time;
+    int32_t socket_id;  /* socket-id of this CPU */
+    int32_t core_id;    /* core-id of this CPU */
+    int32_t thread_id;  /* thread-id of this CPU */
+    int32_t node_id;    /* NUMA node of this CPU */
 
     /* 'compatible' string for this CPU for Linux device trees */
     const char *dtb_compatible;
-- 
2.43.5

Add basic cpu hotplug interface framework, cpu hotplug interface is
stub function and only framework is added here.

Co-developed-by: Xianglai Li <lixianglai@loongson.cn>
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 hw/loongarch/virt.c    | 29 +++++++++++++++++++++++++++++
 target/loongarch/cpu.c | 13 +++++++++++++
 target/loongarch/cpu.h |  1 +
 3 files changed, 43 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 int virt_get_arch_id_from_topo(MachineState *ms, LoongArchCPUTopo *topo)
     return arch_id;
 }
 
+static void virt_cpu_pre_plug(HotplugHandler *hotplug_dev,
+                              DeviceState *dev, Error **errp)
+{
+}
+
+static void virt_cpu_unplug_request(HotplugHandler *hotplug_dev,
+                                    DeviceState *dev, Error **errp)
+{
+}
+
+static void virt_cpu_unplug(HotplugHandler *hotplug_dev,
+                            DeviceState *dev, Error **errp)
+{
+}
+
+static void virt_cpu_plug(HotplugHandler *hotplug_dev,
+                          DeviceState *dev, Error **errp)
+{
+}
+
 static bool memhp_type_supported(DeviceState *dev)
 {
     /* we only support pc dimm now */
@@ -XXX,XX +XXX,XX @@ static void virt_device_pre_plug(HotplugHandler *hotplug_dev,
 {
     if (memhp_type_supported(dev)) {
         virt_mem_pre_plug(hotplug_dev, dev, errp);
+    } else if (object_dynamic_cast(OBJECT(dev), TYPE_LOONGARCH_CPU)) {
+        virt_cpu_pre_plug(hotplug_dev, dev, errp);
     }
 }
 
@@ -XXX,XX +XXX,XX @@ static void virt_device_unplug_request(HotplugHandler *hotplug_dev,
 {
     if (memhp_type_supported(dev)) {
         virt_mem_unplug_request(hotplug_dev, dev, errp);
+    } else if (object_dynamic_cast(OBJECT(dev), TYPE_LOONGARCH_CPU)) {
+        virt_cpu_unplug_request(hotplug_dev, dev, errp);
     }
 }
 
@@ -XXX,XX +XXX,XX @@ static void virt_device_unplug(HotplugHandler *hotplug_dev,
 {
     if (memhp_type_supported(dev)) {
         virt_mem_unplug(hotplug_dev, dev, errp);
+    } else if (object_dynamic_cast(OBJECT(dev), TYPE_LOONGARCH_CPU)) {
+        virt_cpu_unplug(hotplug_dev, dev, errp);
     }
 }
 
@@ -XXX,XX +XXX,XX @@ static void virt_device_plug_cb(HotplugHandler *hotplug_dev,
         }
     } else if (memhp_type_supported(dev)) {
         virt_mem_plug(hotplug_dev, dev, errp);
+    } else if (object_dynamic_cast(OBJECT(dev), TYPE_LOONGARCH_CPU)) {
+        virt_cpu_plug(hotplug_dev, dev, errp);
     }
 }
 
@@ -XXX,XX +XXX,XX @@ static HotplugHandler *virt_get_hotplug_handler(MachineState *machine,
     MachineClass *mc = MACHINE_GET_CLASS(machine);
 
     if (device_is_dynamic_sysbus(mc, dev) ||
+        object_dynamic_cast(OBJECT(dev), TYPE_LOONGARCH_CPU) ||
         object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI) ||
         memhp_type_supported(dev)) {
         return HOTPLUG_HANDLER(machine);
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_cpu_realizefn(DeviceState *dev, Error **errp)
     lacc->parent_realize(dev, errp);
 }
 
+static void loongarch_cpu_unrealizefn(DeviceState *dev)
+{
+    LoongArchCPUClass *lacc = LOONGARCH_CPU_GET_CLASS(dev);
+
+#ifndef CONFIG_USER_ONLY
+    cpu_remove_sync(CPU(dev));
+#endif
+
+    lacc->parent_unrealize(dev);
+}
+
 static bool loongarch_get_lsx(Object *obj, Error **errp)
 {
     return LOONGARCH_CPU(obj)->lsx != ON_OFF_AUTO_OFF;
@@ -XXX,XX +XXX,XX @@ static void loongarch_cpu_class_init(ObjectClass *c, void *data)
     device_class_set_props(dc, loongarch_cpu_properties);
     device_class_set_parent_realize(dc, loongarch_cpu_realizefn,
                                     &lacc->parent_realize);
+    device_class_set_parent_unrealize(dc, loongarch_cpu_unrealizefn,
+                                      &lacc->parent_unrealize);
     resettable_class_set_parent_phases(rc, NULL, loongarch_cpu_reset_hold, NULL,
                                        &lacc->parent_phases);
 
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 @@ struct LoongArchCPUClass {
     CPUClass parent_class;
 
     DeviceRealize parent_realize;
+    DeviceUnrealize parent_unrealize;
     ResettablePhases parent_phases;
 };
 
-- 
2.43.5

Implement cpu unplug interfaces including virt_cpu_unplug_request()
and virt_cpu_unplug().

Co-developed-by: Xianglai Li <lixianglai@loongson.cn>
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 hw/loongarch/virt.c | 58 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 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 int virt_get_arch_id_from_topo(MachineState *ms, LoongArchCPUTopo *topo)
     return arch_id;
 }
 
+/* Find cpu slot in machine->possible_cpus by arch_id */
+static CPUArchId *virt_find_cpu_slot(MachineState *ms, int arch_id)
+{
+    int n;
+    for (n = 0; n < ms->possible_cpus->len; n++) {
+        if (ms->possible_cpus->cpus[n].arch_id == arch_id) {
+            return &ms->possible_cpus->cpus[n];
+        }
+    }
+
+    return NULL;
+}
+
 static void virt_cpu_pre_plug(HotplugHandler *hotplug_dev,
                               DeviceState *dev, Error **errp)
 {
@@ -XXX,XX +XXX,XX @@ static void virt_cpu_pre_plug(HotplugHandler *hotplug_dev,
 static void virt_cpu_unplug_request(HotplugHandler *hotplug_dev,
                                     DeviceState *dev, Error **errp)
 {
+    LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(hotplug_dev);
+    Error *err = NULL;
+    LoongArchCPU *cpu = LOONGARCH_CPU(dev);
+    CPUState *cs = CPU(dev);
+
+    if (cs->cpu_index == 0) {
+        error_setg(&err, "hot-unplug of boot cpu(id%d=%d:%d:%d) not supported",
+                   cs->cpu_index, cpu->socket_id,
+                   cpu->core_id, cpu->thread_id);
+        error_propagate(errp, err);
+        return;
+    }
+
+    hotplug_handler_unplug_request(HOTPLUG_HANDLER(lvms->acpi_ged), dev, &err);
+    if (err) {
+        error_propagate(errp, err);
+    }
 }
 
 static void virt_cpu_unplug(HotplugHandler *hotplug_dev,
                             DeviceState *dev, Error **errp)
 {
+    CPUArchId *cpu_slot;
+    Error *err = NULL;
+    LoongArchCPU *cpu = LOONGARCH_CPU(dev);
+    LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(hotplug_dev);
+
+    /* Notify ipi and extioi irqchip to remove interrupt routing to CPU */
+    hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->ipi), dev, &err);
+    if (err) {
+        error_propagate(errp, err);
+        return;
+    }
+
+    hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->extioi), dev, &err);
+    if (err) {
+        error_propagate(errp, err);
+        return;
+    }
+
+    /* Notify acpi ged CPU removed */
+    hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->acpi_ged), dev, &err);
+    if (err) {
+        error_propagate(errp, err);
+        return;
+    }
+
+    cpu_slot = virt_find_cpu_slot(MACHINE(lvms), cpu->phy_id);
+    cpu_slot->cpu = NULL;
+    return;
 }
 
 static void virt_cpu_plug(HotplugHandler *hotplug_dev,
-- 
2.43.5

Implement cpu plug interface, and cold-plug cpu uses plug interface
when cpu object is created.

Co-developed-by: Xianglai Li <lixianglai@loongson.cn>
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 hw/loongarch/virt.c    | 88 ++++++++++++++++++++++++++++++++++++------
 target/loongarch/cpu.c |  1 +
 2 files changed, 78 insertions(+), 11 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 fw_cfg_add_memory(MachineState *ms)
 
 static void virt_init(MachineState *machine)
 {
-    LoongArchCPU *lacpu;
     const char *cpu_model = machine->cpu_type;
     MemoryRegion *address_space_mem = get_system_memory();
     LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(machine);
     int i;
     hwaddr base, size, ram_size = machine->ram_size;
-    const CPUArchIdList *possible_cpus;
     MachineClass *mc = MACHINE_GET_CLASS(machine);
-    CPUState *cpu;
+    Object *cpuobj;
 
     if (!cpu_model) {
         cpu_model = LOONGARCH_CPU_TYPE_NAME("la464");
@@ -XXX,XX +XXX,XX @@ static void virt_init(MachineState *machine)
     memory_region_add_subregion(&lvms->system_iocsr, 0, &lvms->iocsr_mem);
 
     /* Init CPUs */
-    possible_cpus = mc->possible_cpu_arch_ids(machine);
-    for (i = 0; i < possible_cpus->len; i++) {
-        cpu = cpu_create(machine->cpu_type);
-        cpu->cpu_index = i;
-        machine->possible_cpus->cpus[i].cpu = cpu;
-        lacpu = LOONGARCH_CPU(cpu);
-        lacpu->phy_id = machine->possible_cpus->cpus[i].arch_id;
-        lacpu->env.address_space_iocsr = &lvms->as_iocsr;
+    mc->possible_cpu_arch_ids(machine);
+    for (i = 0; i < machine->smp.cpus; i++) {
+        cpuobj = object_new(machine->cpu_type);
+        if (cpuobj == NULL) {
+            error_report("Fail to create object with type %s ",
+                         machine->cpu_type);
+            exit(EXIT_FAILURE);
+        }
+        qdev_realize_and_unref(DEVICE(cpuobj), NULL, &error_fatal);
     }
     fw_cfg_add_memory(machine);
 
@@ -XXX,XX +XXX,XX @@ static CPUArchId *virt_find_cpu_slot(MachineState *ms, int arch_id)
     return NULL;
 }
 
+/* Find cpu slot for cold-plut CPU object where cpu is NULL */
+static CPUArchId *virt_find_empty_cpu_slot(MachineState *ms)
+{
+    int n;
+    for (n = 0; n < ms->possible_cpus->len; n++) {
+        if (ms->possible_cpus->cpus[n].cpu == NULL) {
+            return &ms->possible_cpus->cpus[n];
+        }
+    }
+
+    return NULL;
+}
+
 static void virt_cpu_pre_plug(HotplugHandler *hotplug_dev,
                               DeviceState *dev, Error **errp)
 {
+    LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(hotplug_dev);
+    MachineState *ms = MACHINE(OBJECT(hotplug_dev));
+    LoongArchCPU *cpu = LOONGARCH_CPU(dev);
+    CPUState *cs = CPU(dev);
+    CPUArchId *cpu_slot;
+    Error *err = NULL;
+    LoongArchCPUTopo topo;
+
+    if (lvms->acpi_ged) {
+        error_setg(&err, "CPU hotplug not supported");
+        goto out;
+    } else {
+        /* For cold-add cpu, find empty cpu slot */
+        cpu_slot = virt_find_empty_cpu_slot(ms);
+        topo.socket_id = cpu_slot->props.socket_id;
+        topo.core_id = cpu_slot->props.core_id;
+        topo.thread_id = cpu_slot->props.thread_id;
+        object_property_set_int(OBJECT(dev), "socket-id", topo.socket_id, NULL);
+        object_property_set_int(OBJECT(dev), "core-id", topo.core_id, NULL);
+        object_property_set_int(OBJECT(dev), "thread-id", topo.thread_id, NULL);
+    }
+
+    cpu->env.address_space_iocsr = &lvms->as_iocsr;
+    cpu->phy_id = cpu_slot->arch_id;
+    cs->cpu_index = cpu_slot - ms->possible_cpus->cpus;
+    numa_cpu_pre_plug(cpu_slot, dev, &err);
+out:
+    if (err) {
+        error_propagate(errp, err);
+    }
 }
 
 static void virt_cpu_unplug_request(HotplugHandler *hotplug_dev,
@@ -XXX,XX +XXX,XX @@ static void virt_cpu_unplug(HotplugHandler *hotplug_dev,
 static void virt_cpu_plug(HotplugHandler *hotplug_dev,
                           DeviceState *dev, Error **errp)
 {
+    CPUArchId *cpu_slot;
+    LoongArchCPU *cpu = LOONGARCH_CPU(dev);
+    LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(hotplug_dev);
+    Error *err = NULL;
+
+    cpu_slot = virt_find_cpu_slot(MACHINE(lvms), cpu->phy_id);
+    cpu_slot->cpu = CPU(dev);
+    if (lvms->ipi) {
+        hotplug_handler_plug(HOTPLUG_HANDLER(lvms->ipi), dev, &err);
+        if (err) {
+            error_propagate(errp, err);
+            return;
+        }
+    }
+
+    if (lvms->extioi) {
+        hotplug_handler_plug(HOTPLUG_HANDLER(lvms->extioi), dev, &err);
+        if (err) {
+            error_propagate(errp, err);
+            return;
+        }
+    }
+
+    return;
 }
 
 static bool memhp_type_supported(DeviceState *dev)
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_cpu_class_init(ObjectClass *c, void *data)
 #ifdef CONFIG_TCG
     cc->tcg_ops = &loongarch_tcg_ops;
 #endif
+    dc->user_creatable = true;
 }
 
 static const gchar *loongarch32_gdb_arch_name(CPUState *cs)
-- 
2.43.5

On LoongArch virt machine, ACPI GED hardware is used for CPU hotplug
handler, here CPU hotplug support feature is added based on GED handler,
also CPU scan and reject method is added about CPU device in DSDT table.

Co-developed-by: Xianglai Li <lixianglai@loongson.cn>
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 hw/loongarch/Kconfig           |  1 +
 hw/loongarch/virt-acpi-build.c | 35 +++++++++++++++++++++++++++++++---
 hw/loongarch/virt.c            | 10 ++++++++++
 include/hw/loongarch/virt.h    |  1 +
 4 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/hw/loongarch/Kconfig b/hw/loongarch/Kconfig
index XXXXXXX..XXXXXXX 100644
--- a/hw/loongarch/Kconfig
+++ b/hw/loongarch/Kconfig
@@ -XXX,XX +XXX,XX @@ config LOONGARCH_VIRT
     select LOONGARCH_EXTIOI
     select LS7A_RTC
     select SMBIOS
+    select ACPI_CPU_HOTPLUG
     select ACPI_PCI
     select ACPI_HW_REDUCED
     select FW_CFG_DMA
diff --git a/hw/loongarch/virt-acpi-build.c b/hw/loongarch/virt-acpi-build.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/loongarch/virt-acpi-build.c
+++ b/hw/loongarch/virt-acpi-build.c
@@ -XXX,XX +XXX,XX @@
 #define ACPI_BUILD_DPRINTF(fmt, ...)
 #endif
 
+static void virt_madt_cpu_entry(int uid,
+                                const CPUArchIdList *apic_ids,
+                                GArray *entry, bool force_enabled)
+{
+    uint32_t flags, apic_id = apic_ids->cpus[uid].arch_id;
+
+    flags = apic_ids->cpus[uid].cpu || force_enabled ? 1 /* Enabled */ : 0;
+
+    /* Rev 1.0b, Table 5-13 Processor Local APIC Structure */
+    build_append_int_noprefix(entry, 0, 1);       /* Type */
+    build_append_int_noprefix(entry, 8, 1);       /* Length */
+    build_append_int_noprefix(entry, uid, 1);     /* ACPI Processor ID */
+    build_append_int_noprefix(entry, apic_id, 1); /* APIC ID */
+    build_append_int_noprefix(entry, flags, 4); /* Flags */
+}
+
 /* build FADT */
 static void init_common_fadt_data(AcpiFadtData *data)
 {
@@ -XXX,XX +XXX,XX @@ build_madt(GArray *table_data, BIOSLinker *linker,
     MachineState *ms = MACHINE(lvms);
     MachineClass *mc = MACHINE_GET_CLASS(ms);
     const CPUArchIdList *arch_ids = mc->possible_cpu_arch_ids(ms);
-    int i, arch_id;
+    int i, arch_id, flags;
     AcpiTable table = { .sig = "APIC", .rev = 1, .oem_id = lvms->oem_id,
                         .oem_table_id = lvms->oem_table_id };
 
@@ -XXX,XX +XXX,XX @@ build_madt(GArray *table_data, BIOSLinker *linker,
     for (i = 0; i < arch_ids->len; i++) {
         /* Processor Core Interrupt Controller Structure */
         arch_id = arch_ids->cpus[i].arch_id;
-
+        flags   = arch_ids->cpus[i].cpu ? 1 : 0;
         build_append_int_noprefix(table_data, 17, 1);    /* Type */
         build_append_int_noprefix(table_data, 15, 1);    /* Length */
         build_append_int_noprefix(table_data, 1, 1);     /* Version */
         build_append_int_noprefix(table_data, i, 4);     /* ACPI Processor ID */
         build_append_int_noprefix(table_data, arch_id, 4); /* Core ID */
-        build_append_int_noprefix(table_data, 1, 4);     /* Flags */
+        build_append_int_noprefix(table_data, flags, 4); /* Flags */
     }
 
     /* Extend I/O Interrupt Controller Structure */
@@ -XXX,XX +XXX,XX @@ build_la_ged_aml(Aml *dsdt, MachineState *machine)
 {
     uint32_t event;
     LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(machine);
+    CPUHotplugFeatures opts;
 
     build_ged_aml(dsdt, "\\_SB."GED_DEVICE,
                   HOTPLUG_HANDLER(lvms->acpi_ged),
@@ -XXX,XX +XXX,XX @@ build_la_ged_aml(Aml *dsdt, MachineState *machine)
                                  AML_SYSTEM_MEMORY,
                                  VIRT_GED_MEM_ADDR);
     }
+
+    if (event & ACPI_GED_CPU_HOTPLUG_EVT) {
+        opts.acpi_1_compatible = false;
+        opts.has_legacy_cphp = false;
+        opts.fw_unplugs_cpu = false;
+        opts.smi_path = NULL;
+
+        build_cpus_aml(dsdt, machine, opts, virt_madt_cpu_entry,
+                       VIRT_GED_CPUHP_ADDR, "\\_SB",
+                       AML_GED_EVT_CPU_SCAN_METHOD, AML_SYSTEM_MEMORY);
+    }
+
     acpi_dsdt_add_power_button(dsdt);
 }
 
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 DeviceState *create_acpi_ged(DeviceState *pch_pic,
 {
     DeviceState *dev;
     MachineState *ms = MACHINE(lvms);
+    MachineClass *mc = MACHINE_GET_CLASS(lvms);
     uint32_t event = ACPI_GED_PWR_DOWN_EVT;
 
     if (ms->ram_slots) {
         event |= ACPI_GED_MEM_HOTPLUG_EVT;
     }
+
+    if (mc->has_hotpluggable_cpus) {
+        event |= ACPI_GED_CPU_HOTPLUG_EVT;
+    }
+
     dev = qdev_new(TYPE_ACPI_GED);
     qdev_prop_set_uint32(dev, "ged-event", event);
     sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
@@ -XXX,XX +XXX,XX @@ static DeviceState *create_acpi_ged(DeviceState *pch_pic,
     /* ged regs used for reset and power down */
     sysbus_mmio_map(SYS_BUS_DEVICE(dev), 2, VIRT_GED_REG_ADDR);
 
+    if (mc->has_hotpluggable_cpus) {
+        sysbus_mmio_map(SYS_BUS_DEVICE(dev), 3, VIRT_GED_CPUHP_ADDR);
+    }
+
     sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,
                        qdev_get_gpio_in(pch_pic, VIRT_SCI_IRQ - VIRT_GSI_BASE));
     return dev;
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_EVT_ADDR       0x100e0000
 #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 VIRT_GED_CPUHP_ADDR     (VIRT_GED_REG_ADDR + ACPI_GED_REG_COUNT)
 
 #define COMMAND_LINE_SIZE       512
 
-- 
2.43.5