fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hw/loongarch: Implement DINTC plug/unplug interfaces

Browse source 
when cpu added, connect dintc irq to cpu INT_DMSI irq pin.

Reviewed-by: Bibo Mao <maobibo@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-ID: <20250916122109.749813-12-gaosong@loongson.cn>
This commit is contained in:
Song Gao 2025-09-16 20:21:09 +08:00
parent ce47eaadbd
commit 7470657ec1
2 changed files with 82 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

71
hw/intc/loongarch_dintc.c
View file

@ -115,14 +115,81 @@ static void loongarch_dintc_init(Object *obj)
return;
}
static DINTCCore *loongarch_dintc_get_cpu(LoongArchDINTCState *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_dintc_cpu_plug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
LoongArchDINTCState *s = LOONGARCH_DINTC(hotplug_dev);
Object *obj = OBJECT(dev);
DINTCCore *core;
int index;
if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
warn_report("LoongArch DINTC: Invalid %s device type",
object_get_typename(obj));
return;
}
core = loongarch_dintc_get_cpu(s, dev);
if (!core) {
return;
}
core->cpu = CPU(dev);
index = core - s->cpu;
/* connect dintc msg irq to cpu irq */
qdev_connect_gpio_out(DEVICE(s), index, qdev_get_gpio_in(dev, INT_DMSI));
return;
}
static void loongarch_dintc_cpu_unplug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
LoongArchDINTCState *s = LOONGARCH_DINTC(hotplug_dev);
Object *obj = OBJECT(dev);
DINTCCore *core;
if (!object_dynamic_cast(obj, TYPE_LOONGARCH_CPU)) {
warn_report("LoongArch DINTC: Invalid %s device type",
object_get_typename(obj));
return;
}
core = loongarch_dintc_get_cpu(s, dev);
if (!core) {
return;
}
core->cpu = NULL;
}
static void loongarch_dintc_class_init(ObjectClass *klass, const void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass);
LoongArchDINTCClass *lac = LOONGARCH_DINTC_CLASS(klass);
dc->unrealize = loongarch_dintc_unrealize;
device_class_set_parent_realize(dc, loongarch_dintc_realize,
&lac->parent_realize);
hc->plug = loongarch_dintc_cpu_plug;
hc->unplug = loongarch_dintc_cpu_unplug;
}
static const TypeInfo loongarch_dintc_info = {
@ -131,6 +198,10 @@ static const TypeInfo loongarch_dintc_info = {
.instance_size = sizeof(LoongArchDINTCState),
.instance_init = loongarch_dintc_init,
.class_init = loongarch_dintc_class_init,
.interfaces = (const InterfaceInfo[]) {
{ TYPE_HOTPLUG_HANDLER },
{ }
},
};
static void loongarch_dintc_register_types(void)

11
hw/loongarch/virt.c
View file

@ -381,6 +381,10 @@ static void virt_cpu_irq_init(LoongArchVirtMachineState *lvms)
&error_abort);
hotplug_handler_plug(HOTPLUG_HANDLER(lvms->extioi), DEVICE(cs),
&error_abort);
if (lvms->dintc) {
hotplug_handler_plug(HOTPLUG_HANDLER(lvms->dintc), DEVICE(cs),
&error_abort);
}
}
}
@ -1103,6 +1107,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->dintc) {
hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->dintc), dev, &error_abort);
}
/* Notify acpi ged CPU removed */
hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->acpi_ged), dev, &error_abort);
@ -1127,6 +1134,10 @@ static void virt_cpu_plug(HotplugHandler *hotplug_dev,
hotplug_handler_plug(HOTPLUG_HANDLER(lvms->extioi), dev, &error_abort);
}
if (lvms->dintc) {
hotplug_handler_plug(HOTPLUG_HANDLER(lvms->dintc), dev, &error_abort);
}
if (lvms->acpi_ged) {
hotplug_handler_plug(HOTPLUG_HANDLER(lvms->acpi_ged), dev,
&error_abort);