Changeset 87893 in vbox

Timestamp:

Mar 1, 2021 7:43:35 AM (4 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 SSM bits.

File:

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

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

@@ -6296 +6296 @@
     AssertLogRelMsgReturn(cDevTabBaseAddrs > 0 && cDevTabBaseAddrs <= RT_ELEMENTS(pThis->aDevTabBaseAddrs),
                           ("Device table segment count invalid %#x\n", cDevTabBaseAddrs), rcErr);
+    AssertCompile(RT_ELEMENTS(pThis->aDevTabBaseAddrs) == RT_ELEMENTS(g_auDevTabSegMaxSizes));
     for (uint8_t i = 0; i < cDevTabBaseAddrs; i++)
     {
@@ -6301 +6302 @@
         AssertRCReturn(rc, rc);
         pThis->aDevTabBaseAddrs[i].u64 &= IOMMU_DEV_TAB_BAR_VALID_MASK;
-        AssertLogRelMsgReturn(pThis->aDevTabBaseAddrs[i].n.u9Size <= g_auDevTabSegMaxSizes[0],
-                              ("Device table segment size invalid %#x\n", pThis->aDevTabBaseAddrs[i].n.u9Size), rcErr);
+        uint16_t const uSegSize    = pThis->aDevTabBaseAddrs[i].n.u9Size;
+        uint16_t const uMaxSegSize = g_auDevTabSegMaxSizes[i];
+        AssertLogRelMsgReturn(uSegSize <= uMaxSegSize,
+                              ("Device table segment size invalid %u (max %u)\n", uSegSize, uMaxSegSize), rcErr);
     }
 
@@ -6409 +6412 @@
     }
 
-    /* MARC (Memory access and routing) registers. */
+    /* MARC (Memory Access and Routing) registers. */
     {
         uint8_t cMarcApers;