[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RFC v3 10/14] target/riscv: Add sifive_plic vmstate
From: |
Yifei Jiang |
Subject: |
[PATCH RFC v3 10/14] target/riscv: Add sifive_plic vmstate |
Date: |
Thu, 27 Aug 2020 17:21:33 +0800 |
Add sifive_plic vmstate for supporting sifive_plic migration.
Current vmstate framework only supports one structure parameter
as num field to describe variable length arrays, so introduce
num_enables.
Signed-off-by: Yifei Jiang <jiangyifei@huawei.com>
Signed-off-by: Yipeng Yin <yinyipeng1@huawei.com>
---
hw/riscv/sifive_plic.c | 24 +++++++++++++++++++++++-
include/hw/riscv/sifive_plic.h | 1 +
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/hw/riscv/sifive_plic.c b/hw/riscv/sifive_plic.c
index 9c5a131e0f..897dc289a0 100644
--- a/hw/riscv/sifive_plic.c
+++ b/hw/riscv/sifive_plic.c
@@ -32,6 +32,7 @@
#include "hw/riscv/sifive_plic.h"
#include "sysemu/kvm.h"
#include "kvm_riscv.h"
+#include "migration/vmstate.h"
#define RISCV_DEBUG_PLIC 0
@@ -460,11 +461,12 @@ static void sifive_plic_realize(DeviceState *dev, Error
**errp)
TYPE_SIFIVE_PLIC, plic->aperture_size);
parse_hart_config(plic);
plic->bitfield_words = (plic->num_sources + 31) >> 5;
+ plic->num_enables = plic->bitfield_words * plic->num_addrs;
plic->source_priority = g_new0(uint32_t, plic->num_sources);
plic->target_priority = g_new(uint32_t, plic->num_addrs);
plic->pending = g_new0(uint32_t, plic->bitfield_words);
plic->claimed = g_new0(uint32_t, plic->bitfield_words);
- plic->enable = g_new0(uint32_t, plic->bitfield_words * plic->num_addrs);
+ plic->enable = g_new0(uint32_t, plic->num_enables);
sysbus_init_mmio(SYS_BUS_DEVICE(dev), &plic->mmio);
qdev_init_gpio_in(dev, sifive_plic_irq_request, plic->num_sources);
@@ -484,12 +486,32 @@ static void sifive_plic_realize(DeviceState *dev, Error
**errp)
msi_nonbroken = true;
}
+static const VMStateDescription vmstate_sifive_plic = {
+ .name = "riscv_sifive_plic",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_VARRAY_UINT32(source_priority, SiFivePLICState,
num_sources, 0,
+ vmstate_info_uint32, uint32_t),
+ VMSTATE_VARRAY_UINT32(target_priority, SiFivePLICState, num_addrs,
0,
+ vmstate_info_uint32, uint32_t),
+ VMSTATE_VARRAY_UINT32(pending, SiFivePLICState, bitfield_words, 0,
+ vmstate_info_uint32, uint32_t),
+ VMSTATE_VARRAY_UINT32(claimed, SiFivePLICState, bitfield_words, 0,
+ vmstate_info_uint32, uint32_t),
+ VMSTATE_VARRAY_UINT32(enable, SiFivePLICState, num_enables, 0,
+ vmstate_info_uint32, uint32_t),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static void sifive_plic_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
device_class_set_props(dc, sifive_plic_properties);
dc->realize = sifive_plic_realize;
+ dc->vmsd = &vmstate_sifive_plic;
}
static const TypeInfo sifive_plic_info = {
diff --git a/include/hw/riscv/sifive_plic.h b/include/hw/riscv/sifive_plic.h
index 4421e81249..130df0cf1c 100644
--- a/include/hw/riscv/sifive_plic.h
+++ b/include/hw/riscv/sifive_plic.h
@@ -49,6 +49,7 @@ typedef struct SiFivePLICState {
MemoryRegion mmio;
uint32_t num_addrs;
uint32_t bitfield_words;
+ uint32_t num_enables;
PLICAddr *addr_config;
uint32_t *source_priority;
uint32_t *target_priority;
--
2.19.1
- [PATCH RFC v3 00/14] Add riscv kvm accel support, Yifei Jiang, 2020/08/27
- [PATCH RFC v3 03/14] target/riscv: Implement function kvm_arch_init_vcpu, Yifei Jiang, 2020/08/27
- [PATCH RFC v3 01/14] linux-header: Update linux/kvm.h, Yifei Jiang, 2020/08/27
- [PATCH RFC v3 05/14] arget/riscv: Implement kvm_arch_put_registers, Yifei Jiang, 2020/08/27
- [PATCH RFC v3 06/14] target/riscv: Support start kernel directly by KVM, Yifei Jiang, 2020/08/27
- [PATCH RFC v3 11/14] target/riscv: Support riscv cpu vmstate, Yifei Jiang, 2020/08/27
- [PATCH RFC v3 14/14] target/riscv: Support virtual time context synchronization, Yifei Jiang, 2020/08/27
- [PATCH RFC v3 10/14] target/riscv: Add sifive_plic vmstate,
Yifei Jiang <=
- [PATCH RFC v3 13/14] target/riscv: Implement virtual time adjusting with vm state changing, Yifei Jiang, 2020/08/27
- [PATCH RFC v3 08/14] target/riscv: Handler KVM_EXIT_RISCV_SBI exit, Yifei Jiang, 2020/08/27
- [PATCH RFC v3 02/14] target/riscv: Add target/riscv/kvm.c to place the public kvm interface, Yifei Jiang, 2020/08/27
- [PATCH RFC v3 09/14] target/riscv: Add host cpu type, Yifei Jiang, 2020/08/27
- [PATCH RFC v3 07/14] hw/riscv: PLIC update external interrupt by KVM when kvm enabled, Yifei Jiang, 2020/08/27
- [PATCH RFC v3 04/14] target/riscv: Implement kvm_arch_get_registers, Yifei Jiang, 2020/08/27
- [PATCH RFC v3 12/14] target/riscv: Add kvm_riscv_get/put_regs_timer, Yifei Jiang, 2020/08/27