Add save and store funtction if irqchip-in-kernel property is enabled,
it is to get/set ExtIOI irqchip state from KVM kernel.
Signed-off-by: Bibo Mao <maob...@loongson.cn>
---
hw/intc/loongarch_extioi.c | 17 +++++
hw/intc/loongarch_extioi_kvm.c | 100 +++++++++++++++++++++++++++++
include/hw/intc/loongarch_extioi.h | 2 +
3 files changed, 119 insertions(+)
diff --git a/hw/intc/loongarch_extioi.c b/hw/intc/loongarch_extioi.c
index 854f54684b..e81caf430c 100644
--- a/hw/intc/loongarch_extioi.c
+++ b/hw/intc/loongarch_extioi.c
@@ -398,9 +398,21 @@ static void loongarch_extioi_reset_hold(Object *obj,
ResetType type)
}
}
+static int vmstate_extioi_pre_save(void *opaque)
+{
+ LoongArchExtIOIState *les = LOONGARCH_EXTIOI(opaque);
+
+ if (kvm_enabled() && les->irqchip_in_kernel) {
+ return kvm_loongarch_extioi_pre_save(opaque);
+ }
+
+ return 0;
+}
+
static int vmstate_extioi_post_load(void *opaque, int version_id)
{
LoongArchExtIOICommonState *s = LOONGARCH_EXTIOI_COMMON(opaque);
+ LoongArchExtIOIState *les = LOONGARCH_EXTIOI(opaque);
int i, start_irq;
for (i = 0; i < (EXTIOI_IRQS / 4); i++) {
@@ -412,6 +424,10 @@ static int vmstate_extioi_post_load(void *opaque, int
version_id)
extioi_update_sw_ipmap(s, i, s->ipmap[i]);
}
+ if (kvm_enabled() && les->irqchip_in_kernel) {
+ return kvm_loongarch_extioi_post_load(opaque, version_id);
+ }
+
return 0;
}
@@ -434,6 +450,7 @@ static void loongarch_extioi_class_init(ObjectClass *klass,
const void *data)
resettable_class_set_parent_phases(rc, NULL, loongarch_extioi_reset_hold,
NULL, &lec->parent_phases);
device_class_set_props(dc, loongarch_extioi_properties);
+ lecc->pre_save = vmstate_extioi_pre_save;
lecc->post_load = vmstate_extioi_post_load;
}
diff --git a/hw/intc/loongarch_extioi_kvm.c b/hw/intc/loongarch_extioi_kvm.c
index 833ec856ee..9c5649dd1a 100644
--- a/hw/intc/loongarch_extioi_kvm.c
+++ b/hw/intc/loongarch_extioi_kvm.c
@@ -12,6 +12,106 @@
#include "qapi/error.h"
#include "system/kvm.h"
+static void kvm_extioi_access_regs(int fd, uint64_t addr,
+ void *val, bool write)
+{
+ kvm_device_access(fd, KVM_DEV_LOONGARCH_EXTIOI_GRP_REGS,
+ addr, val, write, &error_abort);
+}
+
+static void kvm_extioi_access_sw_status(int fd, uint64_t addr,
+ void *val, bool write)
+{
+ kvm_device_access(fd, KVM_DEV_LOONGARCH_EXTIOI_GRP_SW_STATUS,
+ addr, val, write, &error_abort);
+}
+
+static void kvm_extioi_save_load_sw_status(void *opaque, bool write)
+{
+ LoongArchExtIOICommonState *lecs = LOONGARCH_EXTIOI_COMMON(opaque);
+ LoongArchExtIOIState *les = LOONGARCH_EXTIOI(opaque);
+ int fd = les->dev_fd;
+ int addr;
+
+ addr = KVM_DEV_LOONGARCH_EXTIOI_SW_STATUS_NUM_CPU;
+ kvm_extioi_access_sw_status(fd, addr, &lecs->num_cpu, write);
+
+ addr = KVM_DEV_LOONGARCH_EXTIOI_SW_STATUS_FEATURE;
+ kvm_extioi_access_sw_status(fd, addr, &lecs->features, write);
+
+ addr = KVM_DEV_LOONGARCH_EXTIOI_SW_STATUS_STATE;
+ kvm_extioi_access_sw_status(fd, addr, &lecs->status, write);
+}
+
+static void kvm_extioi_save_load_regs(void *opaque, bool write)
+{
+ LoongArchExtIOICommonState *lecs = LOONGARCH_EXTIOI_COMMON(opaque);
+ LoongArchExtIOIState *les = LOONGARCH_EXTIOI(opaque);
+ int fd = les->dev_fd;
+ int addr, offset, cpuid;
+
+ for (addr = EXTIOI_NODETYPE_START; addr < EXTIOI_NODETYPE_END; addr += 4) {
+ offset = (addr - EXTIOI_NODETYPE_START) / 4;
+ kvm_extioi_access_regs(fd, addr, &lecs->nodetype[offset], write);
+ }
+
+ for (addr = EXTIOI_IPMAP_START; addr < EXTIOI_IPMAP_END; addr += 4) {
+ offset = (addr - EXTIOI_IPMAP_START) / 4;
+ kvm_extioi_access_regs(fd, addr, &lecs->ipmap[offset], write);
+ }
+
+ for (addr = EXTIOI_ENABLE_START; addr < EXTIOI_ENABLE_END; addr += 4) {
+ offset = (addr - EXTIOI_ENABLE_START) / 4;
+ kvm_extioi_access_regs(fd, addr, &lecs->enable[offset], write);
+ }
+
+ for (addr = EXTIOI_BOUNCE_START; addr < EXTIOI_BOUNCE_END; addr += 4) {
+ offset = (addr - EXTIOI_BOUNCE_START) / 4;
+ kvm_extioi_access_regs(fd, addr, &lecs->bounce[offset], write);
+ }
+
+ for (addr = EXTIOI_ISR_START; addr < EXTIOI_ISR_END; addr += 4) {
+ offset = (addr - EXTIOI_ISR_START) / 4;
+ kvm_extioi_access_regs(fd, addr, &lecs->isr[offset], write);
+ }
+
+ for (addr = EXTIOI_COREMAP_START; addr < EXTIOI_COREMAP_END; addr += 4) {
+ offset = (addr - EXTIOI_COREMAP_START) / 4;
+ kvm_extioi_access_regs(fd, addr, &lecs->coremap[offset], write);
+ }
+
+ for (cpuid = 0; cpuid < lecs->num_cpu; cpuid++) {
+ for (addr = EXTIOI_COREISR_START;
+ addr < EXTIOI_COREISR_END; addr += 4) {
+ offset = (addr - EXTIOI_COREISR_START) / 4;
+ addr = (cpuid << 16) | addr;
+ kvm_extioi_access_regs(fd, addr,
+ &lecs->cpu[cpuid].coreisr[offset], write);
+ }
+ }
+}
+
+int kvm_loongarch_extioi_pre_save(void *opaque)
+{
+ kvm_extioi_save_load_regs(opaque, false);
+ kvm_extioi_save_load_sw_status(opaque, false);
+ return 0;
+}
+
+int kvm_loongarch_extioi_post_load(void *opaque, int version_id)
+{
+ LoongArchExtIOIState *les = LOONGARCH_EXTIOI(opaque);
+ int fd = les->dev_fd;
+
+ kvm_extioi_save_load_regs(opaque, true);
+ kvm_extioi_save_load_sw_status(opaque, true);
+
+ kvm_device_access(fd, KVM_DEV_LOONGARCH_EXTIOI_GRP_CTRL,
+ KVM_DEV_LOONGARCH_EXTIOI_CTRL_LOAD_FINISHED,
+ NULL, true, &error_abort);
+ return 0;
+}
+
void kvm_loongarch_extioi_realize(DeviceState *dev, Error **errp)
{
LoongArchExtIOICommonState *lecs = LOONGARCH_EXTIOI_COMMON(dev);
diff --git a/include/hw/intc/loongarch_extioi.h
b/include/hw/intc/loongarch_extioi.h
index 848a01f52c..69f1c7aedc 100644
--- a/include/hw/intc/loongarch_extioi.h
+++ b/include/hw/intc/loongarch_extioi.h
@@ -28,5 +28,7 @@ struct LoongArchExtIOIClass {
};
void kvm_loongarch_extioi_realize(DeviceState *dev, Error **errp);
+int kvm_loongarch_extioi_pre_save(void *opaque);
+int kvm_loongarch_extioi_post_load(void *opaque, int version_id);
#endif /* LOONGARCH_EXTIOI_H */
--
2.39.3
