Changeset 83851 in vbox for trunk/src/VBox/Devices/Bus/DevIommuAmd.cpp

Timestamp:

Apr 20, 2020 11:35:38 AM (5 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 Bits.

File:

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

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

@@ -26 +26 @@
 #include "VBoxDD.h"
 #include <iprt/x86.h>
+#include <iprt/string.h>
 
 
@@ -1886 +1887 @@
 typedef struct IOMMU
 {
+    /** IOMMU device index. */
+    uint32_t                    idxIommu;
+    /** Alignment padding. */
+    uint32_t                    uPadding0;
     /** The event semaphore the command thread waits on. */
     SUPSEMEVENT                 hEvtCmdThread;
@@ -2033 +2038 @@
     PPDMDEVINSR3            pDevInsR3;
     /** The IOMMU helpers. */
-    PCPDMIOMMUHLPR3         pIommuHlp;
+    PCPDMIOMMUHLPR3         pIommuHlpR3;
     /** The command thread handle. */
     R3PTRTYPE(PPDMTHREAD)   pCmdThread;
@@ -2048 +2053 @@
     PPDMDEVINSR0            pDevInsR0;
     /** The IOMMU helpers. */
-    PCPDMIOMMUHLPR0         pIommuHlp;
+    PCPDMIOMMUHLPR0         pIommuHlpR0;
 } IOMMUR0;
 /** Pointer to the ring-0 IOMMU device state. */
@@ -2061 +2066 @@
     PPDMDEVINSR0            pDevInsRC;
     /** The IOMMU helpers. */
-    PCPDMIOMMUHLPRC         pIommuHlp;
+    PCPDMIOMMUHLPRC         pIommuHlpRC;
 } IOMMURC;
 /** Pointer to the raw-mode IOMMU device state. */
@@ -2086 +2091 @@
 
 /**
- * Returns the number of entries and buffer size for a power-of-2 encoded length.
+ * Gets the buffer length length corresponding to a base address.
  *
- * @param   uEncodedLen     The length to decode.
+ * @param   uEncodedLen     The length to decode (power-of-2 encoded).
  * @param   pcEntries       Where to store the number of entries. Optional, can be
  *                          NULL.
@@ -2096 +2101 @@
  * @remarks Both @a pcEntries and @a pcbBuffer cannot both be NULL.
  */
-static void iommuAmdDecodeBufferLength(uint8_t uEncodedLen, uint32_t *pcEntries, uint32_t *pcbBuffer)
+static void iommuAmdGetBaseBufferLength(uint8_t uEncodedLen, uint32_t *pcEntries, uint32_t *pcbBuffer)
 {
     uint32_t cEntries;
@@ -2134 +2139 @@
 #ifdef VBOX_STRICT
     uint32_t cEntries;
-    iommuAmdDecodeBufferLength(uEncodedLen, &cEntries, NULL /* pcbBuffer */);
+    iommuAmdGetBaseBufferLength(uEncodedLen, &cEntries, NULL /* pcbBuffer */);
     if (!cEntries)
         Log((IOMMU_LOG_PFX ": %s: Invalid length %#x\n", pszFunc, uEncodedLen));
@@ -2378 +2383 @@
 
     /*
-     * IOMMU behavior is undefined when software writes a value value outside the buffer length.
-     * In our emtulation, we ignore the write entirely.
+     * IOMMU behavior is undefined when software writes a value outside the buffer length.
+     * In our emulation, we ignore the write entirely.
      */
     uint32_t const      offBuf     = u64Value & IOMMU_CMD_BUF_HEAD_PTR_VALID_MASK;
     CMD_BUF_BAR_T const CmdBufBar  = pThis->CmdBufBaseAddr;
     uint32_t            cbBuf;
-    iommuAmdDecodeBufferLength(CmdBufBar.n.u4CmdLen, NULL, &cbBuf);
+    iommuAmdGetBaseBufferLength(CmdBufBar.n.u4CmdLen, NULL, &cbBuf);
     if (offBuf >= cbBuf)
     {
@@ -2854 +2859 @@
     switch (uAddress)
     {
-        case IOMMU_PCI_OFF_CAP_HDR:         /* All fields are read-only. */
+        case IOMMU_PCI_OFF_CAP_HDR:         /* All bits are read-only. */
         case IOMMU_PCI_OFF_RANGE_REG:       /* We don't have any devices integrated with the IOMMU. */
         case IOMMU_PCI_OFF_MISCINFO_REG_0:  /* We don't support MSI-X. */
@@ -2954 +2959 @@
         uint32_t      cbBuffer;
         uint8_t const uEncodedLen = CmdBufBar.n.u4CmdLen;
-        iommuAmdDecodeBufferLength(uEncodedLen, &cEntries, &cbBuffer);
+        iommuAmdGetBaseBufferLength(uEncodedLen, &cEntries, &cbBuffer);
         pHlp->pfnPrintf(pHlp, "  Command buffer BAR                      = %#RX64\n", CmdBufBar.u64);
         if (fVerbose)
@@ -2969 +2974 @@
         uint32_t      cbBuffer;
         uint8_t const uEncodedLen = EvtLogBar.n.u4EvtLen;
-        iommuAmdDecodeBufferLength(uEncodedLen, &cEntries, &cbBuffer);
+        iommuAmdGetBaseBufferLength(uEncodedLen, &cEntries, &cbBuffer);
         pHlp->pfnPrintf(pHlp, "  Event log BAR                           = %#RX64\n", EvtLogBar.u64);
         if (fVerbose)
@@ -3090 +3095 @@
         uint32_t      cbBuffer;
         uint8_t const uEncodedLen = PprLogBar.n.u4PprLogLen;
-        iommuAmdDecodeBufferLength(uEncodedLen, &cEntries, &cbBuffer);
+        iommuAmdGetBaseBufferLength(uEncodedLen, &cEntries, &cbBuffer);
         pHlp->pfnPrintf(pHlp, "  PPR Log BAR                             = %#RX64\n",   PprLogBar.u64);
         if (fVerbose)
@@ -3127 +3132 @@
         uint32_t      cbBuffer;
         uint8_t const uEncodedLen = GALogBar.n.u4GALogLen;
-        iommuAmdDecodeBufferLength(uEncodedLen, &cEntries, &cbBuffer);
+        iommuAmdGetBaseBufferLength(uEncodedLen, &cEntries, &cbBuffer);
         pHlp->pfnPrintf(pHlp, "  Guest Log BAR                           = %#RX64\n",    GALogBar.u64);
         if (fVerbose)
@@ -3149 +3154 @@
         uint32_t      cbBuffer;
         uint8_t const uEncodedLen = PprLogBBar.n.u4PprLogLen;
-        iommuAmdDecodeBufferLength(uEncodedLen, &cEntries, &cbBuffer);
+        iommuAmdGetBaseBufferLength(uEncodedLen, &cEntries, &cbBuffer);
         pHlp->pfnPrintf(pHlp, "  PPR Log B BAR                           = %#RX64\n",   PprLogBBar.u64);
         if (fVerbose)
@@ -3164 +3169 @@
         uint32_t      cbBuffer;
         uint8_t const uEncodedLen = EvtLogBBar.n.u4EvtLen;
-        iommuAmdDecodeBufferLength(uEncodedLen, &cEntries, &cbBuffer);
+        iommuAmdGetBaseBufferLength(uEncodedLen, &cEntries, &cbBuffer);
         pHlp->pfnPrintf(pHlp, "  Event Log B BAR                         = %#RX64\n",   EvtLogBBar.u64);
         if (fVerbose)
@@ -3654 +3659 @@
 
     /*
+     * Register the IOMMU with PDM.
+     */
+    PDMIOMMUREGCC IommuReg;
+    RT_ZERO(IommuReg);
+    IommuReg.u32Version = PDM_IOMMUREGCC_VERSION;
+    IommuReg.u32TheEnd  = PDM_IOMMUREGCC_VERSION;
+    rc = PDMDevHlpIommuRegister(pDevIns, &IommuReg, &pThisCC->CTX_SUFF(pIommuHlp), &pThis->idxIommu);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc, N_("Failed to register ourselves as an IOMMU device"));
+    if (pThisCC->CTX_SUFF(pIommuHlp)->u32Version != PDM_IOMMUHLPR3_VERSION)
+        return PDMDevHlpVMSetError(pDevIns, VERR_VERSION_MISMATCH, RT_SRC_POS,
+                                   N_("IOMMU helper version mismatch; got %#x expected %#x"),
+                                   pThisCC->CTX_SUFF(pIommuHlp)->u32Version, PDM_IOMMUHLPR3_VERSION);
+    if (pThisCC->CTX_SUFF(pIommuHlp)->u32TheEnd != PDM_IOMMUHLPR3_VERSION)
+        return PDMDevHlpVMSetError(pDevIns, VERR_VERSION_MISMATCH, RT_SRC_POS,
+                                   N_("IOMMU helper end-version mismatch; got %#x expected %#x"),
+                                   pThisCC->CTX_SUFF(pIommuHlp)->u32TheEnd, PDM_IOMMUHLPR3_VERSION);
+
+    /*
      * Initialize read-only PCI configuration space.
      */
@@ -3802 +3826 @@
     pThisCC->CTX_SUFF(pDevIns) = pDevIns;
 
+    /* Set up the MMIO RZ handlers. */
     int rc = PDMDevHlpMmioSetUpContext(pDevIns, pThis->hMmio, iommuAmdMmioWrite, iommuAmdMmioRead, NULL /* pvUser */);
+    AssertRCReturn(rc, rc);
+
+    /* Set up the IOMMU RZ callbacks. */
+    PDMIOMMUREGCC IommuReg;
+    RT_ZERO(IommuReg);
+    IommuReg.u32Version = PDM_IOMMUREGCC_VERSION;
+    IommuReg.idxIommu   = pThis->idxIommu;
+    IommuReg.u32TheEnd  = PDM_IOMMUREGCC_VERSION;
+    rc = PDMDevHlpIommuSetUpContext(pDevIns, &IommuReg, &pThisCC->CTX_SUFF(pIommuHlp));
     AssertRCReturn(rc, rc);