Changeset 99385 in vbox for trunk/include/VBox/vmm

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/include/VBox/vmm

Files:

• cpum-armv8.h (modified) (2 diffs)
• gic.h (added)
• vm.h (modified) (2 diffs)
• vm.mac (modified) (2 diffs)

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