feat(riscv): add vplic/vaplic reset functions

Signed-off-by: Jose Martins <[email protected]>

Author: josecm

src/arch/riscv/irqc/aia/inc/vaplic.h

@@ -86,4 +86,16 @@ static inline void virqc_inject(vcpu_t* vcpu, irqid_t id)
     vaplic_inject(vcpu, id);
 }
 
+/**
+ * @brief Resets the state of the virtual aplic
+ *
+ * @param vm Virtual Machine of the target vaplic
+ */
+void vaplic_reset(struct vm* vm);
+
+static inline void virqc_reset(struct vm* vm)
+{
+    vaplic_reset(vm);
+}
+
 #endif // VAPLIC_H

src/arch/riscv/irqc/aia/vaplic.c

@@ -10,6 +10,7 @@
 #include <mem.h>
 #include <interrupts.h>
 #include <arch/csrs.h>
+#include <string.h>
 
 #define APLIC_MIN_PRIO             (0xFF)
 #define UPDATE_ALL_HARTS           (~0U)
@@ -1282,6 +1283,28 @@ static bool vaplic_idc_emul_handler(struct emul_access* acc)
     return true;
 }
 
+void vaplic_reset(struct vm* vm)
+{
+    memset(vm->arch.vaplic.srccfg, 0, sizeof(vm->arch.vaplic.srccfg));
+    memset(vm->arch.vaplic.ip, 0, sizeof(vm->arch.vaplic.ip));
+    memset(vm->arch.vaplic.ie, 0, sizeof(vm->arch.vaplic.ie));
+    memset(vm->arch.vaplic.target, 0, sizeof(vm->arch.vaplic.target));
+    memset(vm->arch.vaplic.idelivery, 0, sizeof(vm->arch.vaplic.idelivery));
+    memset(vm->arch.vaplic.iforce, 0, sizeof(vm->arch.vaplic.iforce));
+    memset(vm->arch.vaplic.ithreshold, 0, sizeof(vm->arch.vaplic.ithreshold));
+    memset(vm->arch.vaplic.topi_claimi, 0, sizeof(vm->arch.vaplic.topi_claimi));
+
+    for (irqid_t id = 1; id <= APLIC_MAX_INTERRUPTS; id++) {
+        if (bitmap_get(vm->arch.vaplic.hw, id)) {
+            aplic_clr_enbl(id);
+            aplic_clr_pend(id);
+            aplic_set_sourcecfg(id, APLIC_SOURCECFG_SM_INACTIVE);
+            aplic_set_target_prio(id, APLIC_TARGET_MIN_PRIO);
+            aplic_set_target_hart(id, 0);
+        }
+    }
+}
+
 void vaplic_init(struct vm* vm, const union vm_irqc_dscrp* vm_irqc_dscrp)
 {
     if (cpu()->id == vm->master) {
@@ -1301,5 +1324,7 @@ void vaplic_init(struct vm* vm, const union vm_irqc_dscrp* vm_irqc_dscrp)
                 .handler = vaplic_idc_emul_handler };
 
         vm_emul_add_mem(vm, &vm->arch.vaplic.aplic_idc_emul);
+
+        vaplic_reset(vm);
     }
 }

src/arch/riscv/irqc/plic/inc/vplic.h

@@ -31,6 +31,7 @@ union vm_irqc_dscrp;
 void vplic_init(struct vm* vm, const union vm_irqc_dscrp* vm_irqc_dscrp);
 void vplic_inject(struct vcpu* vcpu, irqid_t id);
 void vplic_set_hw(struct vm* vm, irqid_t id);
+void vplic_reset(struct vm* vm);
 
 static inline void virqc_init(struct vm* vm, const union vm_irqc_dscrp* vm_irqc_dscrp)
 {
@@ -43,4 +44,9 @@ static inline void virqc_inject(vcpu_t* vcpu, irqid_t id)
     vplic_inject(vcpu, id);
 }
 
+static inline void virqc_reset(struct vm* vm)
+{
+    vplic_reset(vm);
+}
+
 #endif //__VPLIC_H__

src/arch/riscv/irqc/plic/vplic.c

@@ -10,6 +10,7 @@
 #include <vm.h>
 #include <interrupts.h>
 #include <arch/csrs.h>
+#include <string.h>
 
 static ssize_t vplic_vcntxt_to_pcntxt(struct vcpu* vcpu, size_t vcntxt_id)
 {
@@ -369,6 +370,24 @@ static bool vplic_hart_emul_handler(struct emul_access* acc)
     return true;
 }
 
+void vplic_reset(struct vm* vm)
+{
+    memset(vm->arch.vplic.pend, 0, sizeof(vm->arch.vplic.pend));
+    memset(vm->arch.vplic.act, 0, sizeof(vm->arch.vplic.act));
+    memset(vm->arch.vplic.prio, 0, sizeof(vm->arch.vplic.prio));
+    memset(vm->arch.vplic.enbl, 0, sizeof(vm->arch.vplic.enbl));
+    memset(vm->arch.vplic.pend, 0, sizeof(vm->arch.vplic.pend));
+
+    for (irqid_t id = 1; id <= PLIC_IMPL_INTERRUPTS; id++) {
+        if (vm->arch.vplic.hw) {
+            plic_set_prio(id, 0);
+            for (size_t j = 1; j < PLIC_PLAT_CNTXT_NUM; j += 2) {
+                plic_set_enbl(j, id, false);
+            }
+        }
+    }
+}
+
 void vplic_init(struct vm* vm, const union vm_irqc_dscrp* vm_irqc_dscrp)
 {
     if (cpu()->id == vm->master) {
@@ -387,5 +406,7 @@ void vplic_init(struct vm* vm, const union vm_irqc_dscrp* vm_irqc_dscrp)
 
         /* assumes 2 contexts per hart */
         vm->arch.vplic.cntxt_num = vm->cpu_num * 2;
+
+        vplic_reset(vm);
     }
 }