Changeset 84431 in vbox for trunk/include/VBox

Timestamp:

May 21, 2020 8:42:19 AM (5 years ago)

Author:

vboxsync

Message:

AMD IOMMU: bugref:9654 IOMMU interrupt remapping callback skeleton.

Location:

trunk/include/VBox/vmm

Files:

• pdmdev.h (modified) (3 diffs)
• vm.h (modified) (2 diffs)
• vm.mac (modified) (2 diffs)

trunk/include/VBox/vmm/pdmdev.h

@@ -1285 +1285 @@
                                            PRTGCPHYS pGCPhysSpa));
 
+    /**
+     * Performs an interrupt remap request through the IOMMU.
+     *
+     * @returns VBox status code.
+     * @param   pDevIns     The IOMMU device instance.
+     * @param   uDevId      The device identifier (bus, device, function).
+     * @param   GCPhysIn    The source MSI address.
+     * @param   uDataIn     The source MSI data.
+     * @param   pGCPhysOut  Where to store the remapped MSI address.
+     * @param   puDataOut   Where to store the remapped MSI data.
+     *
+     * @thread  Any.
+     */
+    DECLR0CALLBACKMEMBER(int, pfnMsiRemap,(PPDMDEVINS pDevIns, uint16_t uDevId, RTGCPHYS GCPhysIn, uint32_t uDataIn,
+                                           PRTGCPHYS pGCPhysOut, uint32_t *puDataOut));
+
     /** Just a safety precaution. */
     uint32_t            u32TheEnd;
@@ -1336 +1352 @@
                                            PRTGCPHYS pGCPhysSpa));
 
+    /**
+     * Performs an interrupt remap request through the IOMMU.
+     *
+     * @returns VBox status code.
+     * @param   pDevIns     The IOMMU device instance.
+     * @param   uDevId      The device identifier (bus, device, function).
+     * @param   GCPhysIn    The source MSI address.
+     * @param   uDataIn     The source MSI data.
+     * @param   pGCPhysOut  Where to store the remapped MSI address.
+     * @param   puDataOut   Where to store the remapped MSI data.
+     *
+     * @thread  Any.
+     */
+    DECLRCCALLBACKMEMBER(int, pfnMsiRemap,(PPDMDEVINS pDevIns, uint16_t uDevId, RTGCPHYS GCPhysIn, uint32_t uDataIn,
+                                           PRTGCPHYS pGCPhysOut, uint32_t *puDataOut));
+
     /** Just a safety precaution. */
     uint32_t            u32TheEnd;
@@ -1386 +1418 @@
     DECLR3CALLBACKMEMBER(int, pfnMemWrite,(PPDMDEVINS pDevIns, uint16_t uDevId, uint64_t uIova, size_t cbWrite,
                                            PRTGCPHYS pGCPhysSpa));
+
+    /**
+     * Performs an interrupt remap request through the IOMMU.
+     *
+     * @returns VBox status code.
+     * @param   pDevIns     The IOMMU device instance.
+     * @param   uDevId      The device identifier (bus, device, function).
+     * @param   GCPhysIn    The source MSI address.
+     * @param   uDataIn     The source MSI data.
+     * @param   pGCPhysOut  Where to store the remapped MSI address.
+     * @param   puDataOut   Where to store the remapped MSI data.
+     *
+     * @thread  Any.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnMsiRemap,(PPDMDEVINS pDevIns, uint16_t uDevId, RTGCPHYS GCPhysIn, uint32_t uDataIn,
+                                           PRTGCPHYS pGCPhysOut, uint32_t *puDataOut));
 
     /** Just a safety precaution. */

trunk/include/VBox/vmm/vm.h

@@ -1315 +1315 @@
         struct PDM s;
 #endif
-        uint8_t     padding[8064];      /* multiple of 64 */
+        uint8_t     padding[8128];      /* multiple of 64 */
     } pdm;
 
@@ -1450 +1450 @@
 
     /** Padding for aligning the structure size on a page boundrary. */
-    uint8_t         abAlignment2[600 - 256 - 64 + 256 - sizeof(PVMCPUR3) * VMM_MAX_CPU_COUNT];
+    uint8_t         abAlignment2[4568 - sizeof(PVMCPUR3) * VMM_MAX_CPU_COUNT];
 
     /* ---- end small stuff ---- */

trunk/include/VBox/vmm/vm.mac

@@ -126 +126 @@
     .selm                   resb 768
     .mm                     resb 192
-    .pdm                    resb 8064
+    .pdm                    resb 8128
     .iom                    resb 1152
     .em                     resb 256
@@ -139 +139 @@
     .R0Stats                resb 64
 
-    .abAlignment2           resb 600 - 256 - 64 + 256 - RTR0PTR_CB * VMM_MAX_CPU_COUNT
+    .abAlignment2           resb 4568 - RTR0PTR_CB * VMM_MAX_CPU_COUNT
 
     alignb RTR0PTR_CB * VMM_MAX_CPU_COUNT ; ASSUMES VMM_MAX_CPU_COUNT is a power of two.