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

Timestamp:

Apr 27, 2020 8:53:56 AM (5 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 Bits.

File:

• trunk/src/VBox/Devices/Bus/DevIommuAmd.cpp (modified) (3 diffs)

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

@@ -2793 +2793 @@
         case IOMMU_MMIO_OFF_PPR_EVT_B_BAR:            uReg = pThis->EvtLogBBaseAddr.u64;        break;
 
-        case IOMMU_MMIO_OFF_DEV_TAB_SEG_FIRST:
-        case IOMMU_MMIO_OFF_DEV_TAB_SEG_LAST:
+        case IOMMU_MMIO_OFF_DEV_TAB_SEG_1:
+        case IOMMU_MMIO_OFF_DEV_TAB_SEG_2:
+        case IOMMU_MMIO_OFF_DEV_TAB_SEG_3:
+        case IOMMU_MMIO_OFF_DEV_TAB_SEG_4:
+        case IOMMU_MMIO_OFF_DEV_TAB_SEG_5:
+        case IOMMU_MMIO_OFF_DEV_TAB_SEG_6:
+        case IOMMU_MMIO_OFF_DEV_TAB_SEG_7:
         {
             uint8_t const offDevTabSeg = (off - IOMMU_MMIO_OFF_DEV_TAB_SEG_FIRST) >> 3;
@@ -2935 +2940 @@
     RTGCPHYS const GCPhysDevTabEntry = GCPhysDevTab + offDevTabEntry;
 
+    Assert(!(GCPhysDevTab & X86_PAGE_4K_OFFSET_MASK));
     int rc = PDMDevHlpPCIPhysRead(pDevIns, GCPhysDevTabEntry, pDevTabEntry, sizeof(*pDevTabEntry));
     if (RT_FAILURE(rc))
@@ -3728 +3734 @@
     pThis->ExtFeat.n.u5MaxPasidSup           = 0;   /* Requires GstTranslateSup. */
     pThis->ExtFeat.n.u1UserSupervisorSup     = 0;
-    AssertCompile(IOMMU_MAX_DEV_TAB_SEGMENTS < RT_ELEMENTS(g_acDevTabSegs));
+    AssertCompile(IOMMU_MAX_DEV_TAB_SEGMENTS <= 3);
     pThis->ExtFeat.n.u2DevTabSegSup          = IOMMU_MAX_DEV_TAB_SEGMENTS;
     pThis->ExtFeat.n.u1PprLogOverflowWarn    = 0;