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

Timestamp:

Apr 27, 2020 8:40:58 AM (5 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 Bits.

File:

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

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

@@ -2092 +2092 @@
 
 /**
+ * An array of the masks to select the device table segment index from a device ID.
+ */
+static uint16_t const g_auDevTabSegMasks[] = { 0x0, 0x8000, 0xc000, 0xe000 };
+
+/**
  * The maximum size (inclusive) of each device table segment (0 to 7).
  * Indexed by the device table segment index.
@@ -2908 +2913 @@
 
 /**
+ * Reads a device table entry from guest memory given the device ID.
+ *
+ * @returns VBox status code.
+ * @param   pDevIns         The IOMMU device instance.
+ * @param   uDevId          The device ID.
+ * @param   pDevTabEntry    Where to store the device table entry.
+ */
+static int iommuAmdReadDevTabEntry(PPDMDEVINS pDevIns, uint16_t uDevId, DEV_TAB_ENTRY_T *pDevTabEntry)
+{
+    PCIOMMU pThis = PDMDEVINS_2_DATA(pDevIns, PIOMMU);
+    IOMMU_CTRL_T const Ctrl = iommuAmdGetCtrl(pThis);
+
+    uint8_t const idxSegsEn = Ctrl.n.u3DevTabSegEn;
+    Assert(idxSegsEn < RT_ELEMENTS(g_auDevTabSegMasks));
+
+    uint8_t const idxSeg = uDevId & g_auDevTabSegMasks[idxSegsEn] >> 13;
+    Assert(idxSeg < RT_ELEMENTS(pThis->aDevTabBaseAddrs));
+
+    RTGCPHYS const GCPhysDevTab   = pThis->aDevTabBaseAddrs[idxSeg].n.u40Base;
+    uint16_t const offDevTabEntry = uDevId & ~g_auDevTabSegMasks[idxSegsEn];
+    RTGCPHYS const GCPhysDevTabEntry = GCPhysDevTab + offDevTabEntry;
+
+    int rc = PDMDevHlpPCIPhysRead(pDevIns, GCPhysDevTabEntry, pDevTabEntry, sizeof(*pDevTabEntry));
+    if (RT_FAILURE(rc))
+        Log((IOMMU_LOG_PFX ": Failed to read device table entry at %#RGp. rc=%Rrc\n", GCPhysDevTabEntry, rc));
+
+    return rc;
+}
+
+
+/**
  * Memory read transaction from a device.
  *
  * @returns VBox status code.
  * @param   pDevIns     The IOMMU device instance.
- * @param   uDeviceId   The device identifier (bus, device, function).
+ * @param   uDevId      The device identifier (bus, device, function).
  * @param   uDva        The device virtual address being read.
  * @param   cbRead      The number of bytes being read.
@@ -2919 +2955 @@
  * @thread  Any.
  */
-static int iommuAmdDeviceMemRead(PPDMDEVINS pDevIns, uint16_t uDeviceId, uint64_t uDva, size_t cbRead, PRTGCPHYS pGCPhysOut)
-{
-    RT_NOREF(pDevIns, uDeviceId, uDva, cbRead, pGCPhysOut);
+static int iommuAmdDeviceMemRead(PPDMDEVINS pDevIns, uint16_t uDevId, uint64_t uDva, size_t cbRead, PRTGCPHYS pGCPhysOut)
+{
+    RT_NOREF(pDevIns, uDevId, uDva, cbRead, pGCPhysOut);
     return VERR_NOT_IMPLEMENTED;
 }
@@ -2931 +2967 @@
  * @returns VBox status code.
  * @param   pDevIns     The IOMMU device instance.
- * @param   uDeviceId   The device identifier (bus, device, function).
+ * @param   uDevId      The device identifier (bus, device, function).
  * @param   uDva        The device virtual address being written.
  * @param   cbWrite     The number of bytes being written.
@@ -2938 +2974 @@
  * @thread  Any.
  */
-static int iommuAmdDeviceMemWrite(PPDMDEVINS pDevIns, uint16_t uDeviceId, uint64_t uDva, size_t cbWrite, PRTGCPHYS pGCPhysOut)
-{
-    RT_NOREF(pDevIns, uDeviceId, uDva, cbWrite, pGCPhysOut);
+static int iommuAmdDeviceMemWrite(PPDMDEVINS pDevIns, uint16_t uDevId, uint64_t uDva, size_t cbWrite, PRTGCPHYS pGCPhysOut)
+{
+    RT_NOREF(pDevIns, uDevId, uDva, cbWrite, pGCPhysOut);
     return VERR_NOT_IMPLEMENTED;
 }