Changeset 81333 in vbox for trunk/include/VBox/vmm/iom.h

Timestamp:

Oct 17, 2019 11:49:39 PM (5 years ago)

Author:

vboxsync

Message:

IOM: More MMIO stuff, almost there now... bugref:9218

File:

• trunk/include/VBox/vmm/iom.h (modified) (8 diffs)

trunk/include/VBox/vmm/iom.h

@@ -155 +155 @@
 #define IOMMMIO_FLAGS_DBGSTOP_ON_COMPLICATED_WRITE      UINT32_C(0x00000200)
 
+/** Pass the absolute physical address (GC) to the callback rather than the
+ * relative one.
+ * @note New-style only, is implicit in old-style interface.  */
+#define IOMMMIO_FLAGS_ABS                               UINT32_C(0x00001000)
+
 /** Mask of valid flags. */
-#define IOMMMIO_FLAGS_VALID_MASK                        UINT32_C(0x00000373)
+#define IOMMMIO_FLAGS_VALID_MASK                        UINT32_C(0x00001373)
 /** @} */
 
@@ -399 +404 @@
  * @param   pvUser      User argument.
  * @param   off         Offset into the mapping of the read,
- *                      or the physical address if IOM_MMIO_F_ABS is active.
+ *                      or the physical address if IOMMMIO_FLAGS_ABS is active.
  * @param   pv          Where to store the result.
  * @param   cb          Number of bytes read.
@@ -416 +421 @@
  * @param   pvUser      User argument.
  * @param   off         Offset into the mapping of the write,
- *                      or the physical address if IOM_MMIO_F_ABS is active.
+ *                      or the physical address if IOMMMIO_FLAGS_ABS is active.
  * @param   pv          Where to fetch the result.
  * @param   cb          Number of bytes to write.
@@ -433 +438 @@
  * @param   pvUser      User argument.
  * @param   off         Offset into the mapping of the fill,
- *                      or the physical address if IOM_MMIO_F_ABS is active.
+ *                      or the physical address if IOMMMIO_FLAGS_ABS is active.
  * @param   u32Item     Byte/Word/Dword data to fill.
  * @param   cbItem      Size of data in u32Item parameter, restricted to 1/2/4 bytes.
@@ -456 +461 @@
 VMMDECL(int)            IOMMMIOMapMMIOHCPage(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhys, RTHCPHYS HCPhys, uint64_t fPageFlags);
 VMMDECL(int)            IOMMMIOResetRegion(PVMCC pVM, RTGCPHYS GCPhys);
-VMMDECL(bool)           IOMIsLockWriteOwner(PVM pVM);
+
+VMM_INT_DECL(VBOXSTRICTRC)  IOMMmioPhysHandler(PVMCC pVM, PVMCPUCC pVCpu, uint32_t uErrorCode, RTGCPHYS GCPhysFault);
+VMM_INT_DECL(int)           IOMMmioMapMmio2Page(PVMCC pVM, PPDMDEVINS pDevIns, IOMMMIOHANDLE hRegion, RTGCPHYS offRegion,
+                                                uint64_t hMmio2, RTGCPHYS offMmio2, uint64_t fPageFlags);
+VMM_INT_DECL(int)           IOMMmioMapMmioHCPage(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhys, RTHCPHYS HCPhys, uint64_t fPageFlags);
+VMM_INT_DECL(int)           IOMMmioResetRegion(PVMCC pVM, PPDMDEVINS pDevIns, IOMMMIOHANDLE hRegion);
+
 
 /** @name IOM_IOPORT_F_XXX - Flags for IOMR3IoPortCreate() and PDMDevHlpIoPortCreateEx().
@@ -464 +475 @@
 /** Valid flags for IOMR3IoPortCreate(). */
 #define IOM_IOPORT_F_VALID_MASK     UINT32_C(0x00000001)
-/** @} */
-
-/** @name IOM_MMIO_F_XXX - Flags for IOMR3MmioCreate() and PDMDevHlpMmioCreateEx().
- * @{ */
-/** Pass the absolute physical address (GC) to the callback rather than the
- * relative one. */
-#define IOM_MMIO_F_ABS              RT_BIT_32(0)
-/** Valid flags for IOMR3IoPortCreate(). */
-#define IOM_MMIO_F_VALID_MASK       UINT32_C(0x00000001)
 /** @} */
 
@@ -574 +576 @@
 VMMR0_INT_DECL(int)  IOMR0IoPortGrowRegistrationTables(PGVM pGVM, uint64_t cMinEntries);
 VMMR0_INT_DECL(int)  IOMR0IoPortGrowStatisticsTable(PGVM pGVM, uint64_t cMinEntries);
+VMMR0_INT_DECL(int)  IOMR0IoPortSyncStatisticsIndices(PGVM pGVM);
 
 VMMR0_INT_DECL(int)  IOMR0MmioSetUpContext(PGVM pGVM, PPDMDEVINS pDevIns, IOMMMIOHANDLE hRegion, PFNIOMMMIONEWWRITE pfnWrite,
@@ -579 +582 @@
 VMMR0_INT_DECL(int)  IOMR0MmioGrowRegistrationTables(PGVM pGVM, uint64_t cMinEntries);
 VMMR0_INT_DECL(int)  IOMR0MmioGrowStatisticsTable(PGVM pGVM, uint64_t cMinEntries);
+VMMR0_INT_DECL(int)  IOMR0MmioSyncStatisticsIndices(PGVM pGVM);
+
 /** @} */
 #endif /* IN_RING0 || DOXYGEN_RUNNING */