Changeset 83850 in vbox for trunk/include/VBox/vmm

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

137379

Message:

AMD IOMMU: bugref:9654 R0 registration bits.

Location:

trunk/include/VBox/vmm

Files:

• gvm.h (modified) (2 diffs)
• pdmdev.h (modified) (7 diffs)

trunk/include/VBox/vmm/gvm.h

@@ -202 +202 @@
         struct PDMR0PERVM   s;
 #endif
-        uint8_t             padding[1792];
+        uint8_t             padding[1920];
     } pdmr0;
 
@@ -231 +231 @@
     /** Padding so aCpus starts on a page boundrary.  */
 #ifdef VBOX_WITH_NEM_R0
-    uint8_t         abPadding2[4096*2 - 64 - 256 - 1024 - 256 - 64 - 1792 - 640 - 512 - 64 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
-#else
-    uint8_t         abPadding2[4096*2 - 64 - 256 - 1024       - 64 - 1792 - 640 - 512 - 64 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
+    uint8_t         abPadding2[4096*2 - 64 - 256 - 1024 - 256 - 64 - 1920 - 640 - 512 - 64 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
+#else
+    uint8_t         abPadding2[4096*2 - 64 - 256 - 1024       - 64 - 1920 - 640 - 512 - 64 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
 #endif
 

trunk/include/VBox/vmm/pdmdev.h

@@ -3567 +3567 @@
      * @param   ppIommuHlp          Where to store the pointer to the ring-3 IOMMU
      *                              helpers.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnIommuRegister,(PPDMDEVINS pDevIns, PPDMIOMMUREGR3 pIommuReg, PCPDMIOMMUHLPR3 *ppIommuHlp));
+     * @param   pidxIommu           Where to return the IOMMU index. Optional.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnIommuRegister,(PPDMDEVINS pDevIns, PPDMIOMMUREGR3 pIommuReg, PCPDMIOMMUHLPR3 *ppIommuHlp,
+                                                uint32_t *pidxIommu));
 
     /**
@@ -4515 +4517 @@
 
     /**
+     * Sets up the IOMMU for the raw-mode context.
+     *
+     * This must be called after ring-3 has registered the IOMMU using
+     * PDMDevHlpIommuRegister().
+     *
+     * @returns VBox status code.
+     * @param   pDevIns     The device instance.
+     * @param   pIommuReg   The IOMMU registration information for raw-mode,
+     *                      considered volatile.
+     * @param   ppIommuHlp  Where to return the raw-mode IOMMU helpers.
+     */
+    DECLRCCALLBACKMEMBER(int, pfnIommuSetUpContext,(PPDMDEVINS pDevIns, PPDMIOMMUREGRC pIommuReg, PCPDMIOMMUHLPRC *ppIommuHlp));
+
+    /**
      * Sets up the PIC for the ring-0 context.
      *
@@ -4590 +4606 @@
 
 /** Current PDMDEVHLP version number. */
-#define PDM_DEVHLPRC_VERSION                    PDM_VERSION_MAKE(0xffe6, 14, 0)
+#define PDM_DEVHLPRC_VERSION                    PDM_VERSION_MAKE(0xffe6, 15, 0)
 
 
@@ -5036 +5052 @@
 
     /**
+     * Sets up the IOMMU for the ring-0 context.
+     *
+     * This must be called after ring-3 has registered the IOMMU using
+     * PDMDevHlpIommuRegister().
+     *
+     * @returns VBox status code.
+     * @param   pDevIns     The device instance.
+     * @param   pIommuReg   The IOMMU registration information for ring-0,
+     *                      considered volatile and copied.
+     * @param   ppIommuHlp  Where to return the ring-0 IOMMU helpers.
+     */
+    DECLR0CALLBACKMEMBER(int, pfnIommuSetUpContext,(PPDMDEVINS pDevIns, PPDMIOMMUREGR0 pIommuReg, PCPDMIOMMUHLPR0 *ppIommuHlp));
+
+    /**
      * Sets up the PIC for the ring-0 context.
      *
@@ -5111 +5141 @@
 
 /** Current PDMDEVHLP version number. */
-#define PDM_DEVHLPR0_VERSION                    PDM_VERSION_MAKE(0xffe5, 16, 0)
+#define PDM_DEVHLPR0_VERSION                    PDM_VERSION_MAKE(0xffe5, 17, 0)
 
 
@@ -7398 +7428 @@
  * @copydoc PDMDEVHLPR3::pfnIommuRegister
  */
-DECLINLINE(int) PDMDevHlpIommuRegister(PPDMDEVINS pDevIns, PPDMIOMMUREGR3 pIommuReg, PCPDMIOMMUHLPR3 *ppIommuHlp)
-{
-    return pDevIns->pHlpR3->pfnIommuRegister(pDevIns, pIommuReg, ppIommuHlp);
+DECLINLINE(int) PDMDevHlpIommuRegister(PPDMDEVINS pDevIns, PPDMIOMMUREGR3 pIommuReg, PCPDMIOMMUHLPR3 *ppIommuHlp, uint32_t *pidxIommu)
+{
+    return pDevIns->pHlpR3->pfnIommuRegister(pDevIns, pIommuReg, ppIommuHlp, pidxIommu);
 }
 
@@ -7557 +7587 @@
 {
     return pDevIns->CTX_SUFF(pHlp)->pfnPCIBusSetUpContext(pDevIns, pPciBusReg, ppPciHlp);
+}
+
+/**
+ * @copydoc PDMDEVHLPR0::pfnIommuSetUpContext
+ */
+DECLINLINE(int) PDMDevHlpIommuSetUpContext(PPDMDEVINS pDevIns, CTX_SUFF(PPDMIOMMUREG) pIommuReg, CTX_SUFF(PCPDMIOMMUHLP) *ppIommuHlp)
+{
+    return pDevIns->CTX_SUFF(pHlp)->pfnIommuSetUpContext(pDevIns, pIommuReg, ppIommuHlp);
 }