Add save and store funtction if irqchip-in-kernel property is enabled, it is to get/set IPI irqchip state from KVM kernel.
Signed-off-by: Bibo Mao <maob...@loongson.cn> --- hw/intc/loongarch_ipi.c | 24 ++++++++++++++ hw/intc/loongarch_ipi_kvm.c | 56 +++++++++++++++++++++++++++++++++ include/hw/intc/loongarch_ipi.h | 2 ++ 3 files changed, 82 insertions(+) diff --git a/hw/intc/loongarch_ipi.c b/hw/intc/loongarch_ipi.c index 5e240382ad..bb28e602fc 100644 --- a/hw/intc/loongarch_ipi.c +++ b/hw/intc/loongarch_ipi.c @@ -177,6 +177,28 @@ static void loongarch_ipi_cpu_unplug(HotplugHandler *hotplug_dev, core->cpu = NULL; } +static int loongarch_ipi_pre_save(void *opaque) +{ + LoongarchIPIState *lis = LOONGARCH_IPI(opaque); + + if (kvm_enabled() && lis->irqchip_in_kernel) { + return kvm_loongarch_ipi_pre_save(opaque); + } + + return 0; +} + +static int loongarch_ipi_post_load(void *opaque, int version_id) +{ + LoongarchIPIState *lis = LOONGARCH_IPI(opaque); + + if (kvm_enabled() && lis->irqchip_in_kernel) { + return kvm_loongarch_ipi_post_load(opaque, version_id); + } + + return 0; +} + static const Property loongarch_ipi_properties[] = { DEFINE_PROP_BOOL("irqchip-in-kernel", LoongarchIPIState, irqchip_in_kernel, false), @@ -199,6 +221,8 @@ static void loongarch_ipi_class_init(ObjectClass *klass, const void *data) licc->cpu_by_arch_id = loongarch_cpu_by_arch_id; hc->plug = loongarch_ipi_cpu_plug; hc->unplug = loongarch_ipi_cpu_unplug; + licc->pre_save = loongarch_ipi_pre_save; + licc->post_load = loongarch_ipi_post_load; } static const TypeInfo loongarch_ipi_types[] = { diff --git a/hw/intc/loongarch_ipi_kvm.c b/hw/intc/loongarch_ipi_kvm.c index e8fcd3bd2f..b5b2b22045 100644 --- a/hw/intc/loongarch_ipi_kvm.c +++ b/hw/intc/loongarch_ipi_kvm.c @@ -11,6 +11,62 @@ #include "system/kvm.h" #include "target/loongarch/cpu.h" +static void kvm_ipi_access_regs(int fd, uint64_t addr, + uint32_t *val, bool write) +{ + kvm_device_access(fd, KVM_DEV_LOONGARCH_IPI_GRP_REGS, + addr, val, write, &error_abort); +} + +static void kvm_loongarch_ipi_save_load_regs(void *opaque, bool write) +{ + LoongsonIPICommonState *ipi = (LoongsonIPICommonState *)opaque; + LoongarchIPIState *lis = LOONGARCH_IPI(opaque); + IPICore *cpu; + uint64_t attr; + int cpu_id = 0; + int fd = lis->dev_fd; + + for (cpu_id = 0; cpu_id < ipi->num_cpu; cpu_id++) { + cpu = &ipi->cpu[cpu_id]; + attr = (cpu_id << 16) | CORE_STATUS_OFF; + kvm_ipi_access_regs(fd, attr, &cpu->status, write); + + attr = (cpu_id << 16) | CORE_EN_OFF; + kvm_ipi_access_regs(fd, attr, &cpu->en, write); + + attr = (cpu_id << 16) | CORE_SET_OFF; + kvm_ipi_access_regs(fd, attr, &cpu->set, write); + + attr = (cpu_id << 16) | CORE_CLEAR_OFF; + kvm_ipi_access_regs(fd, attr, &cpu->clear, write); + + attr = (cpu_id << 16) | CORE_BUF_20; + kvm_ipi_access_regs(fd, attr, &cpu->buf[0], write); + + attr = (cpu_id << 16) | CORE_BUF_28; + kvm_ipi_access_regs(fd, attr, &cpu->buf[2], write); + + attr = (cpu_id << 16) | CORE_BUF_30; + kvm_ipi_access_regs(fd, attr, &cpu->buf[4], write); + + attr = (cpu_id << 16) | CORE_BUF_38; + kvm_ipi_access_regs(fd, attr, &cpu->buf[6], write); + } +} + +int kvm_loongarch_ipi_pre_save(void *opaque) +{ + kvm_loongarch_ipi_save_load_regs(opaque, false); + return 0; +} + +int kvm_loongarch_ipi_post_load(void *opaque, int version_id) +{ + kvm_loongarch_ipi_save_load_regs(opaque, true); + return 0; +} + void kvm_loongarch_ipi_realize(DeviceState *dev, Error **errp) { LoongarchIPIState *lis = LOONGARCH_IPI(dev); diff --git a/include/hw/intc/loongarch_ipi.h b/include/hw/intc/loongarch_ipi.h index 26076d8062..921cbb0fb5 100644 --- a/include/hw/intc/loongarch_ipi.h +++ b/include/hw/intc/loongarch_ipi.h @@ -27,5 +27,7 @@ struct LoongarchIPIClass { }; void kvm_loongarch_ipi_realize(DeviceState *dev, Error **errp); +int kvm_loongarch_ipi_pre_save(void *opaque); +int kvm_loongarch_ipi_post_load(void *opaque, int version_id); #endif -- 2.39.3