Changeset 104386 in vbox for trunk/src/VBox/VMM/VMMAll/GICAll.cpp

Timestamp:

Apr 20, 2024 7:05:54 PM (8 months ago)

Author:

vboxsync

Message:

VMM/GIC: Add a dedicated GIC device implementation for linux.arm64 which interfaces with the in-kernel KVM GIC device emulation, bugref:10391

File:

• trunk/src/VBox/VMM/VMMAll/GICAll.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/GICAll.cpp

@@ -1211 +1211 @@
     AssertReturn(uIntId < GIC_SPI_MAX, VERR_INVALID_PARAMETER);
 
-    PGIC       pGic    = VM_TO_GIC(pVM);
+    PGIC pGic = VM_TO_GIC(pVM);
+
+    /** @todo r=aeichner There must be another way to do this better, maybe create some callback interface
+     *                   the GIC can register. */
+#ifdef RT_OS_LINUX
+# ifdef IN_RING3
+    if (pGic->fKvmGic)
+        return GICR3KvmSpiSet(pVM, uIntId, fAsserted);
+# else
+#  error "Impossible to call the KVM in-kernel GIC from this context!"
+# endif
+#endif
+
     PPDMDEVINS pDevIns = pGic->CTX_SUFF(pDevIns);
     PGICDEV    pThis   = PDMDEVINS_2_DATA(pDevIns, PGICDEV);
@@ -1245 +1257 @@
     PPDMDEVINS pDevIns = VMCPU_TO_DEVINS(pVCpu);
 
+    /** @todo r=aeichner There must be another way to do this better, maybe create some callback interface
+     *                   the GIC can register. */
+#ifdef RT_OS_LINUX
+# ifdef IN_RING3
+    PGIC pGic = VM_TO_GIC(pVCpu->pVMR3);
+    if (pGic->fKvmGic)
+        return GICR3KvmPpiSet(pVCpu, uIntId, fAsserted);
+# else
+#  error "Impossible to call the KVM in-kernel GIC from this context!"
+# endif
+#endif
+
     int const  rcLock  = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_IGNORED);
     PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, pDevIns->pCritSectRoR3, rcLock);
@@ -1270 +1294 @@
 
     PPDMDEVINS pDevIns = VMCPU_TO_DEVINS(pVCpu);
+
+    /** @todo r=aeichner There must be another way to do this better, maybe create some callback interface
+     *                   the GIC can register. */
+#ifdef RT_OS_LINUX
+# ifdef IN_RING3
+    PGIC pGic = VM_TO_GIC(pVCpu->pVMR3);
+    /* These should be handled in the kernel and never be set from here. */
+    AssertReturn(!pGic->fKvmGic, VERR_NEM_IPE_6);
+# else
+#  error "Impossible to call the KVM in-kernel GIC from this context!"
+# endif
+#endif
 
     int const  rcLock  = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_IGNORED);