Add save and store funtction if irqchip-in-kernel property is enabled,
it is to get/set PCH PCI irqchip state from KVM kernel.
Signed-off-by: Bibo Mao <maob...@loongson.cn>
`
---
hw/intc/loongarch_pch_pic.c | 26 ++++++++++++
hw/intc/loongarch_pic_kvm.c | 58 ++++++++++++++++++++++++++
include/hw/intc/loongarch_pch_pic.h | 2 +
include/hw/intc/loongarch_pic_common.h | 1 +
4 files changed, 87 insertions(+)
diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c
index 481a303cc1..e8dfd0ed75 100644
--- a/hw/intc/loongarch_pch_pic.c
+++ b/hw/intc/loongarch_pch_pic.c
@@ -293,6 +293,29 @@ static void loongarch_pic_realize(DeviceState *dev, Error
**errp)
}
}
+static int loongarch_pic_pre_save(LoongArchPICCommonState *opaque)
+{
+ LoongarchPICState *lps = LOONGARCH_PIC(opaque);
+
+ if (kvm_enabled() && lps->irqchip_in_kernel) {
+ return kvm_loongarch_pic_pre_save(opaque);
+ }
+
+ return 0;
+}
+
+static int loongarch_pic_post_load(LoongArchPICCommonState *opaque,
+ int version_id)
+{
+ LoongarchPICState *lps = LOONGARCH_PIC(opaque);
+
+ if (kvm_enabled() && lps->irqchip_in_kernel) {
+ return kvm_loongarch_pic_post_load(opaque, version_id);
+ }
+
+ return 0;
+}
+
static const Property loongarch_pic_properties[] = {
DEFINE_PROP_BOOL("irqchip-in-kernel", LoongarchPICState,
irqchip_in_kernel, false),
@@ -302,6 +325,7 @@ static void loongarch_pic_class_init(ObjectClass *klass,
const void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
LoongarchPICClass *lpc = LOONGARCH_PIC_CLASS(klass);
+ LoongArchPICCommonClass *lpcc = LOONGARCH_PIC_COMMON_CLASS(klass);
ResettableClass *rc = RESETTABLE_CLASS(klass);
resettable_class_set_parent_phases(rc, NULL, loongarch_pic_reset_hold,
@@ -309,6 +333,8 @@ static void loongarch_pic_class_init(ObjectClass *klass,
const void *data)
device_class_set_parent_realize(dc, loongarch_pic_realize,
&lpc->parent_realize);
device_class_set_props(dc, loongarch_pic_properties);
+ lpcc->pre_save = loongarch_pic_pre_save;
+ lpcc->post_load = loongarch_pic_post_load;
}
static const TypeInfo loongarch_pic_types[] = {
diff --git a/hw/intc/loongarch_pic_kvm.c b/hw/intc/loongarch_pic_kvm.c
index 696dabb0b2..84942a86cd 100644
--- a/hw/intc/loongarch_pic_kvm.c
+++ b/hw/intc/loongarch_pic_kvm.c
@@ -13,6 +13,64 @@
#include "hw/pci-host/ls7a.h"
#include "system/kvm.h"
+static void kvm_pch_pic_access_regs(int fd, uint64_t addr,
+ void *val, bool write)
+{
+ kvm_device_access(fd, KVM_DEV_LOONGARCH_PCH_PIC_GRP_REGS,
+ addr, val, write, &error_abort);
+}
+
+static void kvm_loongarch_pch_pic_save_load(void *opaque, bool write)
+{
+ LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque);
+ LoongarchPICState *lps = LOONGARCH_PIC(opaque);
+ int fd = lps->dev_fd;
+ int addr, offset;
+
+ kvm_pch_pic_access_regs(fd, VIRT_PCH_REG_BASE + PCH_PIC_INT_MASK,
+ &s->int_mask, write);
+ kvm_pch_pic_access_regs(fd, VIRT_PCH_REG_BASE + PCH_PIC_HTMSI_EN,
+ &s->htmsi_en, write);
+ kvm_pch_pic_access_regs(fd, VIRT_PCH_REG_BASE + PCH_PIC_INT_EDGE,
+ &s->intedge, write);
+ kvm_pch_pic_access_regs(fd, VIRT_PCH_REG_BASE + PCH_PIC_AUTO_CTRL0,
+ &s->auto_crtl0, write);
+ kvm_pch_pic_access_regs(fd, VIRT_PCH_REG_BASE + PCH_PIC_AUTO_CTRL1,
+ &s->auto_crtl1, write);
+
+ for (addr = PCH_PIC_ROUTE_ENTRY;
+ addr < PCH_PIC_ROUTE_ENTRY_END; addr++) {
+ offset = addr - PCH_PIC_ROUTE_ENTRY;
+ kvm_pch_pic_access_regs(fd, addr + VIRT_PCH_REG_BASE,
+ &s->route_entry[offset], write);
+ }
+
+ for (addr = PCH_PIC_HTMSI_VEC; addr < PCH_PIC_HTMSI_VEC_END; addr++) {
+ offset = addr - PCH_PIC_HTMSI_VEC;
+ kvm_pch_pic_access_regs(fd, addr + VIRT_PCH_REG_BASE,
+ &s->htmsi_vector[offset], write);
+ }
+
+ kvm_pch_pic_access_regs(fd, VIRT_PCH_REG_BASE + PCH_PIC_INT_REQUEST,
+ &s->intirr, write);
+ kvm_pch_pic_access_regs(fd, VIRT_PCH_REG_BASE + PCH_PIC_INT_STATUS,
+ &s->intisr, write);
+ kvm_pch_pic_access_regs(fd, VIRT_PCH_REG_BASE + PCH_PIC_INT_POL,
+ &s->int_polarity, write);
+}
+
+int kvm_loongarch_pic_pre_save(void *opaque)
+{
+ kvm_loongarch_pch_pic_save_load(opaque, false);
+ return 0;
+}
+
+int kvm_loongarch_pic_post_load(void *opaque, int version_id)
+{
+ kvm_loongarch_pch_pic_save_load(opaque, true);
+ return 0;
+}
+
void kvm_loongarch_pic_realize(DeviceState *dev, Error **errp)
{
LoongarchPICState *lps = LOONGARCH_PIC(dev);
diff --git a/include/hw/intc/loongarch_pch_pic.h
b/include/hw/intc/loongarch_pch_pic.h
index 91a20dd624..822d9d3544 100644
--- a/include/hw/intc/loongarch_pch_pic.h
+++ b/include/hw/intc/loongarch_pch_pic.h
@@ -28,5 +28,7 @@ struct LoongarchPICClass {
};
void kvm_loongarch_pic_realize(DeviceState *dev, Error **errp);
+int kvm_loongarch_pic_pre_save(void *opaque);
+int kvm_loongarch_pic_post_load(void *opaque, int version_id);
#endif /* HW_LOONGARCH_PCH_PIC_H */
diff --git a/include/hw/intc/loongarch_pic_common.h
b/include/hw/intc/loongarch_pic_common.h
index 9349a055d0..f774c975d4 100644
--- a/include/hw/intc/loongarch_pic_common.h
+++ b/include/hw/intc/loongarch_pic_common.h
@@ -23,6 +23,7 @@
#define PCH_PIC_ROUTE_ENTRY_END 0x13f
#define PCH_PIC_HTMSI_VEC 0x200
#define PCH_PIC_HTMSI_VEC_END 0x23f
+#define PCH_PIC_INT_REQUEST 0x380
#define PCH_PIC_INT_STATUS 0x3a0
#define PCH_PIC_INT_POL 0x3e0
--
2.39.3
