Changeset 99821 in vbox

Timestamp:

May 17, 2023 7:35:02 AM (20 months ago)

Author:

vboxsync

Message:

VMM/GIC: Implement interrupt forwarding to the GIC from shared peripherals, bugref:10404

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PDMAll.cpp (modified) (5 diffs)
• VMMR3/PDMDevMiscHlp.cpp (modified) (1 diff)

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

@@ -36 +36 @@
 #include <VBox/vmm/vmcc.h>
 #include <VBox/err.h>
-#include <VBox/vmm/apic.h>
+#ifdef VBOX_VMM_TARGET_ARMV8
+# include <VBox/vmm/gic.h>
+#else
+# include <VBox/vmm/apic.h>
+#endif
 
 #include <VBox/log.h>
@@ -144 +148 @@
     Log9(("PDMIsaSetIrq: irq=%#x lvl=%u tag=%#x\n", u8Irq, u8Level, uTagSrc));
 
+#ifdef VBOX_VMM_TARGET_ARMV8
+    int rc = VINF_SUCCESS;
+    GICSpiSet(pVM, u8Level, u8Level == PDM_IRQ_LEVEL_HIGH ? true : false);
+#else
     int rc = VERR_PDM_NO_PIC_INSTANCE;
 /** @todo r=bird: This code is incorrect, as it ASSUMES the PIC and I/O APIC
@@ -173 +181 @@
         rc = VINF_SUCCESS;
     }
+#endif
 
     if (!uTagSrc && u8Level == PDM_IRQ_LEVEL_LOW)
@@ -195 +204 @@
 {
     Log9(("PDMIoApicSetIrq: irq=%#x lvl=%u tag=%#x src=%#x\n", u8Irq, u8Level, uTagSrc, uBusDevFn));
+
+#ifdef VBOX_VMM_TARGET_ARMV8
+    int rc = VINF_SUCCESS;
+    RT_NOREF(uBusDevFn, uTagSrc);
+    GICSpiSet(pVM, u8Irq, u8Level == PDM_IRQ_LEVEL_HIGH ? true : false);
+#else
     if (pVM->pdm.s.IoApic.CTX_SUFF(pDevIns))
     {
@@ -202 +217 @@
     }
     return VERR_PDM_NO_PIC_INSTANCE;
+#endif
 }
 

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

@@ -35 +35 @@
 #include <VBox/vmm/pgm.h>
 #include <VBox/vmm/hm.h>
-#include <VBox/vmm/apic.h>
+#ifndef VBOX_VMM_TARGET_ARMV8
+# include <VBox/vmm/apic.h>
+#endif
 #include <VBox/vmm/vm.h>
 #include <VBox/vmm/vmm.h>