Changeset 87496 in vbox for trunk/src/VBox/Devices/Bus

Timestamp:

Feb 1, 2021 9:28:01 AM (4 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 Nits.

File:

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

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

@@ -2566 +2566 @@
     {
         /* Check if device access to addresses in the exclusion range can be forwarded untranslated. */
-        if (    pThis->ExclRangeBaseAddr.n.u1AllowAll
-            ||  pDte->n.u1AllowExclusion)
+        if (   pThis->ExclRangeBaseAddr.n.u1AllowAll
+            || pDte->n.u1AllowExclusion)
             return true;
     }
@@ -3787 +3787 @@
      * and freeing buffers while processing commands.
      */
-    size_t cbMaxCmds = sizeof(CMD_GENERIC_T) * iommuAmdGetBufMaxEntries(15);
-    void *pvCmds = RTMemAllocZ(cbMaxCmds);
-    AssertReturn(pvCmds, VERR_NO_MEMORY);
+    size_t const cbMaxCmdBuf = sizeof(CMD_GENERIC_T) * iommuAmdGetBufMaxEntries(15);
+    void *pvCmds = RTMemAllocZ(cbMaxCmdBuf);
+    AssertPtrReturn(pvCmds, VERR_NO_MEMORY);
 
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
@@ -3817 +3817 @@
         /** @todo r=ramshankar: We currently copy all commands from guest memory into a
          *        temporary host buffer before processing them as a batch. If we want to
-         *        save on host memory a bit we could, once PGM has the necessary APIs, lock
-         *        the page mappings and access them directly. */
+         *        save on host memory a bit, we could (once PGM has the necessary APIs)
+         *        lock the page mappings page mappings and access them directly. */
         IOMMU_LOCK(pDevIns);
 
@@ -3832 +3832 @@
             Assert(!(offHead & ~IOMMU_CMD_BUF_HEAD_PTR_VALID_MASK));
             Assert(offHead < cbCmdBuf);
-            Assert(cbCmdBuf <= cbMaxCmds);
+            Assert(cbCmdBuf <= cbMaxCmdBuf);
 
             if (offHead != offTail)
@@ -3869 +3869 @@
                             break;
                         }
+
+                        /* Move to the next command in the circular buffer. */
                         offHead = (offHead + sizeof(CMD_GENERIC_T)) % cbCmdBuf;
                     } while (offHead != offTail);
@@ -3878 +3880 @@
                     iommuAmdCmdHwErrorEventInit(GCPhysCmdBufBase, &EvtCmdHwErr);
                     iommuAmdCmdHwErrorEventRaise(pDevIns, &EvtCmdHwErr);
+
                     IOMMU_UNLOCK(pDevIns);
                 }