Re: [PATCH v6 11/11] hw/loongarch: Implement AVEC plug/unplug interfaces

[Bibo Mao]

On 2025/9/4 下午8:18, Song Gao wrote:

when cpu added, connect avec irq to cpu INT_AVEC irq pin.

Signed-off-by: Song Gao <gaos...@loongson.cn>
---
  hw/intc/loongarch_avec.c | 71 ++++++++++++++++++++++++++++++++++++++++
  hw/loongarch/virt.c      | 11 +++++++
  2 files changed, 82 insertions(+)

diff --git a/hw/intc/loongarch_avec.c b/hw/intc/loongarch_avec.c
index 03a20a7b60..f4b0ff29fa 100644
--- a/hw/intc/loongarch_avec.c
+++ b/hw/intc/loongarch_avec.c
@@ -140,14 +140,81 @@ static void loongarch_avec_init(Object *obj)
      return;
  }

+static AVECCore *loongarch_avec_get_cpu(LoongArchAVECState *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_avec_cpu_plug(HotplugHandler *hotplug_dev,
+                                   DeviceState *dev, Error **errp)
+{
+    LoongArchAVECState *s = LOONGARCH_AVEC(hotplug_dev);
+    Object *obj = OBJECT(dev);
+    AVECCore *core;
+    int index;
+
+    if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
+        warn_report("LoongArch AVEC: Invalid %s device type",
+                                       object_get_typename(obj));
+        return;
+    }
+    core = loongarch_avec_get_cpu(s, dev);
+    if (!core) {
+        return;
+    }
+
+    core->cpu = CPU(dev);
+    index = core - s->cpu;
+
+    /* connect avec msg irq to cpu irq */
+    qdev_connect_gpio_out(DEVICE(s), index, qdev_get_gpio_in(dev, INT_AVEC));
+    return;
+}
+
+static void loongarch_avec_cpu_unplug(HotplugHandler *hotplug_dev,
+                                     DeviceState *dev, Error **errp)
+{
+    LoongArchAVECState *s = LOONGARCH_AVEC(hotplug_dev);
+    Object *obj = OBJECT(dev);
+    AVECCore *core;
+
+    if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
+        warn_report("LoongArch AVEC: Invalid %s device type",
+                                       object_get_typename(obj));
+        return;
+    }
+
+    core = loongarch_avec_get_cpu(s, dev);
+
+    if (!core) {
+        return;
+    }
+
+    core->cpu = NULL;
+}
+
  static void loongarch_avec_class_init(ObjectClass *klass, const void *data)
  {
      DeviceClass *dc = DEVICE_CLASS(klass);
+    HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass);
      LoongArchAVECClass *lac = LOONGARCH_AVEC_CLASS(klass);

dc->unrealize = loongarch_avec_unrealize;

      device_class_set_parent_realize(dc, loongarch_avec_realize,
                                      &lac->parent_realize);
+    hc->plug = loongarch_avec_cpu_plug;
+    hc->unplug = loongarch_avec_cpu_unplug;
  }

static const TypeInfo loongarch_avec_info = {

@@ -156,6 +223,10 @@ static const TypeInfo loongarch_avec_info = {
      .instance_size = sizeof(LoongArchAVECState),
      .instance_init = loongarch_avec_init,
      .class_init    = loongarch_avec_class_init,
+    .interfaces    = (const InterfaceInfo[]) {
+        { TYPE_HOTPLUG_HANDLER },
+        { }
+    },
  };

static void loongarch_avec_register_types(void)

diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index a3f8f4c854..ad78dd3f19 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -377,6 +377,10 @@ static void virt_cpu_irq_init(LoongArchVirtMachineState 
*lvms)
                               &error_abort);
          hotplug_handler_plug(HOTPLUG_HANDLER(lvms->extioi), DEVICE(cs),
                               &error_abort);
+        if (lvms->avec) {
+            hotplug_handler_plug(HOTPLUG_HANDLER(lvms->avec), DEVICE(cs),
+                                 &error_abort);
+        }
      }
  }

@@ -1089,6 +1093,9 @@ static void virt_cpu_unplug(HotplugHandler *hotplug_dev,

      /* Notify ipi and extioi irqchip to remove interrupt routing to CPU */
      hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->ipi), dev, &error_abort);
      hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->extioi), dev, &error_abort);
+    if (lvms->avec) {
+        hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->avec), dev, &error_abort);
+    }

/* Notify acpi ged CPU removed */

      hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->acpi_ged), dev, 
&error_abort);
@@ -1112,6 +1119,10 @@ static void virt_cpu_plug(HotplugHandler *hotplug_dev,
          hotplug_handler_plug(HOTPLUG_HANDLER(lvms->extioi), dev, 
&error_abort);
      }

+ if (lvms->avec) {

+        hotplug_handler_plug(HOTPLUG_HANDLER(lvms->avec), dev, &error_abort);
+    }
+
      if (lvms->acpi_ged) {
          hotplug_handler_plug(HOTPLUG_HANDLER(lvms->acpi_ged), dev,
                               &error_abort);

Reviewed-by: Bibo Mao <maob...@loongson.cn>