Changeset 88153 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 17, 2021 12:56:48 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

143302

Message:

Intel IOMMU: bugref:9967 Skeleton bits.

Location:

trunk/src/VBox/Devices

Files:

• Bus/DevIommuIntel.cpp (added)
• Makefile.kmk (modified) (6 diffs)
• build/VBoxDD.cpp (modified) (1 diff)
• build/VBoxDD.h (modified) (1 diff)
• build/VBoxDDR0.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -155 +155 @@
         VBOX_WITH_DMI_CHASSIS \
         VBOX_WITH_DMI_OEMSTRINGS \
-        $(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD,)
+        $(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD,) \
+        $(if $(VBOX_WITH_IOMMU_INTEL),VBOX_WITH_IOMMU_INTEL,)
  VBoxDD_DEFS.win         = _WIN32_WINNT=0x0510
  ifeq ($(KBUILD_TARGET_ARCH),x86)
@@ -173 +174 @@
         Bus/MsixCommon.cpp \
         $(if $(VBOX_WITH_IOMMU_AMD),Bus/DevIommuAmd.cpp,) \
+        $(if $(VBOX_WITH_IOMMU_INTEL),Bus/DevIommuIntel.cpp,) \
         EFI/DevSmc.cpp \
         EFI/DevFlash.cpp \
@@ -956 +958 @@
    VBoxDDRC_DEFS.darwin   = VBOX_WITH_2X_4GB_ADDR_SPACE
   endif
-  VBoxDDRC_DEFS           = $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) $(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD,)
+  VBoxDDRC_DEFS           = \
+        $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
+        $(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD,) \
+        $(if $(VBOX_WITH_IOMMU_INTEL),VBOX_WITH_IOMMU_INTEL,)
   VBoxDDRC_INCS           = build $(VBOX_GRAPHICS_INCS)
   VBoxDDRC_SOURCES        = \
@@ -964 +969 @@
         Bus/MsixCommon.cpp \
         $(if $(VBOX_WITH_IOMMU_AMD),Bus/DevIommuAmd.cpp,) \
+        $(if $(VBOX_WITH_IOMMU_INTEL),Bus/DevIommuIntel.cpp,) \
         EFI/DevSmc.cpp \
         Graphics/DevVGA.cpp \
@@ -1159 +1165 @@
         $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
         $(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD,) \
+        $(if $(VBOX_WITH_IOMMU_INTEL),VBOX_WITH_IOMMU_INTEL,) \
         IN_RT_R0  # - WTF is IN_RT_R0 doing here?
  VBoxDDR0_DEFS.win      += VBOX_WITH_WIN_PARPORT_SUP
@@ -1171 +1178 @@
         Bus/MsixCommon.cpp \
         $(if $(VBOX_WITH_IOMMU_AMD),Bus/DevIommuAmd.cpp,) \
+        $(if $(VBOX_WITH_IOMMU_INTEL),Bus/DevIommuIntel.cpp,) \
         EFI/DevSmc.cpp \
         EFI/DevFlash.cpp \

trunk/src/VBox/Devices/build/VBoxDD.cpp

@@ -224 +224 @@
         return rc;
 #endif
+#ifdef VBOX_WITH_IOMMU_INTEL
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceIommuIntel);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceQemuFwCfg);
     if (RT_FAILURE(rc))

trunk/src/VBox/Devices/build/VBoxDD.h

@@ -196 +196 @@
 extern const PDMDEVREG g_DeviceIommuAmd;
 #endif
+#ifdef VBOX_WITH_IOMMU_INTEL
+extern const PDMDEVREG g_DeviceIommuIntel;
+#endif
 
 /* VBoxAcpi.cpp */

trunk/src/VBox/Devices/build/VBoxDDR0.cpp

@@ -111 +111 @@
     &g_DeviceIommuAmd,
 #endif
+#ifdef VBOX_WITH_IOMMU_INTEL
+    &g_DeviceIommuIntel,
+#endif
 };