Changeset 99385 in vbox

Timestamp:

Apr 13, 2023 11:05:39 AM (20 months ago)

Author:

vboxsync

Message:

VMM/ArmV8: Skeleton of the GICv3 interrupt controller emulation, bugref:10404

Location:

trunk

Files:

• include/VBox/vmm/cpum-armv8.h (modified) (2 diffs)
• include/VBox/vmm/gic.h (added)
• include/VBox/vmm/vm.h (modified) (2 diffs)
• include/VBox/vmm/vm.mac (modified) (2 diffs)
• src/VBox/VMM/Makefile.kmk (modified) (2 diffs)
• src/VBox/VMM/VMMAll/CPUMAllSysRegs-armv8.cpp (modified) (6 diffs)
• src/VBox/VMM/VMMAll/GICAll.cpp (added)
• src/VBox/VMM/VMMR3/GICR3.cpp (added)
• src/VBox/VMM/VMMR3/PDMDevice.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/VMM.cpp (modified) (1 diff)

trunk/include/VBox/vmm/cpum-armv8.h

@@ -66 +66 @@
     kCpumSysRegRdFn_WriteOnly,
 
+    /** Read from a GICv3 PE ICC system register. */
+    kCpumSysRegRdFn_GicV3Icc,
+
     /** End of valid system register read function indexes. */
     kCpumSysRegRdFn_End
@@ -86 +89 @@
      * kCpumSysRegRdFn_Alias. */
     kCpumSysRegWrFn_Alias,
+
+    /** Write to a GICv3 PE ICC system register. */
+    kCpumSysRegWrFn_GicV3Icc,
 
     /** End of valid system register write function indexes. */

trunk/include/VBox/vmm/vm.h

@@ -269 +269 @@
     } gim;
 
+#if defined(VBOX_VMM_TARGET_ARMV8)
+    /** GIC part. */
+    union VMCPUUNIONGIC
+    {
+# ifdef VMM_INCLUDED_SRC_include_GICInternal_h
+        struct GICCPU       s;
+# endif
+        uint8_t             padding[3840];      /* multiple of 64 */
+    } gic;
+#else
     /** APIC part. */
     union VMCPUUNIONAPIC
     {
-#ifdef VMM_INCLUDED_SRC_include_APICInternal_h
+# ifdef VMM_INCLUDED_SRC_include_APICInternal_h
         struct APICCPU      s;
-#endif
+# endif
         uint8_t             padding[3840];      /* multiple of 64 */
     } apic;
+#endif
 
     /*
@@ -1433 +1444 @@
     } gim;
 
-    union
-    {
-#ifdef VMM_INCLUDED_SRC_include_APICInternal_h
+#if defined(VBOX_VMM_TARGET_ARMV8)
+    union
+    {
+# ifdef VMM_INCLUDED_SRC_include_GICInternal_h
+        struct GIC  s;
+# endif
+        uint8_t     padding[128];       /* multiple of 8 */
+    } gic;
+#else
+    union
+    {
+# ifdef VMM_INCLUDED_SRC_include_APICInternal_h
         struct APIC s;
-#endif
+# endif
         uint8_t     padding[128];       /* multiple of 8 */
     } apic;
+#endif
 
     /* ---- begin small stuff ---- */

trunk/include/VBox/vmm/vm.mac

@@ -89 +89 @@
     .gim                    resb 512
     alignb 64
+%ifdef VBOX_VMM_TARGET_ARMV8
+    .gic                    resb 3840
+%else
     .apic                   resb 3840
+%endif
 
     alignb 64
@@ -169 +173 @@
     .gim                    resb 448
     alignb 64
+%ifdef VBOX_VMM_TARGET_ARMV8
+    .gic                    resb 128
+%else
     .apic                   resb 128
+%endif
     alignb 64
     .vm                     resb 32

trunk/src/VBox/VMM/Makefile.kmk

@@ -375 +375 @@
         VMMR3/EMR3Dbg.cpp \
         VMMR3/EMR3Nem.cpp \
+        VMMR3/GICR3.cpp \
         VMMR3/GIM.cpp \
         VMMR3/IEMR3.cpp \
@@ -432 +433 @@
         VMMAll/PGMAllPool.cpp \
         VMMAll/EMAll.cpp \
+        VMMAll/GICAll.cpp \
         VMMAll/GIMAll.cpp \
         VMMAll/TMAll.cpp \

trunk/src/VBox/VMM/VMMAll/CPUMAllSysRegs-armv8.cpp

@@ -33 +33 @@
 #include <VBox/vmm/cpum.h>
 #include "CPUMInternal-armv8.h"
+#include <VBox/vmm/gic.h>
 #include <VBox/vmm/vmcc.h>
 #include <VBox/err.h>
@@ -143 +144 @@
 
 
+/** @callback_method_impl{FNCPUMRDMSR} */
+static DECLCALLBACK(VBOXSTRICTRC) cpumSysRegRd_GicV3Icc(PVMCPUCC pVCpu, uint32_t idSysReg, PCCPUMSYSREGRANGE pRange, uint64_t *puValue)
+{
+    RT_NOREF_PV(pRange);
+    return GICReadSysReg(pVCpu, idSysReg, puValue);
+}
+
+
+/** @callback_method_impl{FNCPUMWRMSR} */
+static DECLCALLBACK(VBOXSTRICTRC) cpumSysRegWr_GicV3Icc(PVMCPUCC pVCpu, uint32_t idSysReg, PCCPUMSYSREGRANGE pRange, uint64_t uValue, uint64_t uRawValue)
+{
+    RT_NOREF_PV(pRange); RT_NOREF_PV(uRawValue);
+    return GICWriteSysReg(pVCpu, idSysReg, uValue);
+}
+
 
 /**
@@ -153 +169 @@
     { NULL }, /* Alias */
     { cpumSysRegRd_WriteOnly },
+    { cpumSysRegRd_GicV3Icc  },
 };
 
@@ -165 +182 @@
     { cpumSysRegWr_ReadOnly },
     { NULL }, /* Alias */
+    { cpumSysRegWr_GicV3Icc },
 };
 
@@ -396 +414 @@
  * @returns VINF_SUCCESS on success, error on failure.
  */
-int cpumR3SysRegStrictInitChecks(void)
+DECLHIDDEN(int) cpumR3SysRegStrictInitChecks(void)
 {
 #define CPUM_ASSERT_RD_SYSREG_FN(a_Register) \
@@ -406 +424 @@
     CPUM_ASSERT_RD_SYSREG_FN(FixedValue);
     CPUM_ASSERT_RD_SYSREG_FN(WriteOnly);
+    CPUM_ASSERT_RD_SYSREG_FN(GicV3Icc);
 
     AssertReturn(g_aCpumWrSysRegFns[kCpumSysRegWrFn_Invalid].pfnWrSysReg == NULL, VERR_CPUM_IPE_2);
+    CPUM_ASSERT_WR_SYSREG_FN(IgnoreWrite);
+    CPUM_ASSERT_WR_SYSREG_FN(ReadOnly);
+    CPUM_ASSERT_WR_SYSREG_FN(GicV3Icc);
 
     return VINF_SUCCESS;

trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp

@@ -34 +34 @@
 #include "PDMInternal.h"
 #include <VBox/vmm/pdm.h>
-#include <VBox/vmm/apic.h>
+#if defined(VBOX_VMM_TARGET_ARMV8)
+# include <VBox/vmm/gic.h>
+#else
+# include <VBox/vmm/apic.h>
+#endif
 #include <VBox/vmm/cfgm.h>
 #include <VBox/vmm/dbgf.h>
@@ -676 +680 @@
 
 #if defined(VBOX_VMM_TARGET_ARMV8)
-    int rc;
+    /*
+     * Register the internal VMM GIC device.
+     */
+    int rc = pdmR3DevReg_Register(&RegCB.Core, &g_DeviceGIC);
+    AssertRCReturn(rc, rc);
 #else
     /*

trunk/src/VBox/VMM/VMMR3/VMM.cpp

@@ -130 +130 @@
 #include <VBox/sup.h>
 #include <VBox/vmm/dbgf.h>
-#include <VBox/vmm/apic.h>
+#if defined(VBOX_VMM_TARGET_ARMV8)
+# include <VBox/vmm/gic.h>
+#else
+# include <VBox/vmm/apic.h>
+#endif
 #include <VBox/vmm/ssm.h>
 #include <VBox/vmm/tm.h>