Changeset 88310 in vbox for trunk

Timestamp:

Mar 29, 2021 12:52:12 PM (4 years ago)

Author:

vboxsync

Message:

Intel IOMMU: bugref:9967 WIP.

Location:

trunk/src/VBox/Devices

Files:

• Bus/DevIommuIntel.cpp (modified) (1 diff)
• Bus/DevIommuIntel.h (added)
• PC/DevACPI.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Bus/DevIommuIntel.cpp

@@ -21 +21 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_DEV_IOMMU
-#include <VBox/vmm/pdmdev.h>
-#include <VBox/iommu-intel.h>
+#include "VBoxDD.h"
+#include "DevIommuIntel.h"
 
 #include <iprt/string.h>
-
-#include "VBoxDD.h"
 
 

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -47 +47 @@
 #ifdef VBOX_WITH_IOMMU_AMD
 # include "../Bus/DevIommuAmd.h"
+#endif
+#ifdef VBOX_WITH_IOMMU_INTEL
+# include "../Bus/DevIommuIntel.h"
 #endif
 
@@ -863 +866 @@
     ACPIDMAR            Dmar;
     ACPIDRHD            Drhd;
+    /* ACPIDMARDEVSCOPE    DevScope; */
 } ACPITBLDMAR;
 #endif  /* VBOX_WITH_IOMMU_INTEL */
@@ -3357 +3361 @@
     acpiR3PhysCopy(pDevIns, addr, (const uint8_t *)&Ivrs, sizeof(Ivrs));
 }
-#endif
+#endif  /* VBOX_WITH_IOMMU_AMD */
 
 
@@ -3369 +3373 @@
     RT_ZERO(VtdTable);
 
-    /* VT-d/DMAR header. */
+    /* VT-d Table. */
     acpiR3PrepareHeader(pThis, &VtdTable.Dmar.Hdr, "DMAR", sizeof(ACPITBLVTD), ACPI_DMAR_REVISION);
 
-    /** @todo Populate rest of DMAR table. */
+    /* DMAR. */
+    uint8_t cPhysAddrBits;
+    uint8_t cLinearAddrBits;
+    PDMDevHlpCpuGetGuestAddrWidths(pDevIns, &cPhysAddrBits, &cLinearAddrBits);
+    Assert(cPhysAddrBits > 0); NOREF(cLinearAddrBits);
+    VtdTable.Dmar.uHostAddrWidth = cPhysAddrBits - 1;
+    VtdTable.Dmar.fFlags         = VTD_ACPI_DMAR_FLAGS;
+
+    /* DRHD. */
+    VtdTable.Drhd.cbLength     = sizeof(ACPIDRHD) /* + sizeof(VtdTable.DevScope) */;
+    VtdTable.Drhd.fFlags       = ACPI_DRHD_F_INCLUDE_PCI_ALL;
+    VtdTable.Drhd.uRegBaseAddr = VTD_MMIO_BASE_ADDR;
 
     /* Finally, compute checksum. */
@@ -3380 +3395 @@
     acpiR3PhysCopy(pDevIns, addr, (const uint8_t *)&VtdTable, sizeof(VtdTable));
 }
-#endif
+#endif  /* VBOX_WITH_IOMMU_INTEL */