Changeset 12545 in vbox for trunk/include

Timestamp:

Sep 17, 2008 3:11:37 PM (16 years ago)

Author:

vboxsync

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

36722

Message:

Updates for per-cpu MMIO range registration. (APIC)

Location:

trunk/include/VBox

Files:

• iom.h (modified) (2 diffs)
• pdmdev.h (modified) (10 diffs)
• vm.h (modified) (1 diff)
• vm.mac (modified) (1 diff)

trunk/include/VBox/iom.h

@@ -47 +47 @@
  */
 #define IOM_NO_PDMINS_CHECKS
+
+
+
+typedef enum
+{
+    /** MMIO mapping for a specific CPU. */
+    MMIO_REGCTX_CPU0    = 0,
+    MMIO_REGCTX_CPU1    = 1,
+    MMIO_REGCTX_CPU2    = 2,
+    MMIO_REGCTX_CPU3    = 3,
+    MMIO_REGCTX_CPU4    = 4,
+    MMIO_REGCTX_CPU5    = 5,
+    MMIO_REGCTX_CPU6    = 6,
+    MMIO_REGCTX_CPU7    = 7,
+    MMIO_REGCTX_CPU8    = 8,
+    MMIO_REGCTX_CPU9    = 9,
+    MMIO_REGCTX_CPU10   = 10,
+    MMIO_REGCTX_CPU11   = 11,
+    MMIO_REGCTX_CPU12   = 12,
+    MMIO_REGCTX_CPU13   = 13,
+    MMIO_REGCTX_CPU14   = 14,
+    MMIO_REGCTX_CPU15   = 15,
+    MMIO_REGCTX_CPU16   = 16,
+    /* ... */
+
+    /** MMIO mapping for all CPUs. */
+    MMIO_REGCTX_GLOBAL  = 0x100000,
+
+    /** 32bit hackishness. */
+    MMIO_REGCTX_32BIT_HACK = 0x7fffffff
+} MMIO_REGISTRATION_CTX;
 
 /**
@@ -249 +280 @@
 IOMR3DECL(int)  IOMR3IOPortDeregister(PVM pVM, PPDMDEVINS pDevIns, RTIOPORT PortStart, RTUINT cPorts);
 
-IOMR3DECL(int)  IOMR3MMIORegisterR3(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTHCPTR pvUser,
+IOMR3DECL(int)  IOMR3MMIORegisterR3(PVM pVM, PPDMDEVINS pDevIns, MMIO_REGISTRATION_CTX enmCtx, RTGCPHYS GCPhysStart, RTUINT cbRange, RTHCPTR pvUser,
                                     R3PTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback,
                                     R3PTRTYPE(PFNIOMMMIOREAD)  pfnReadCallback,
                                     R3PTRTYPE(PFNIOMMMIOFILL)  pfnFillCallback, const char *pszDesc);
-IOMR3DECL(int)  IOMR3MMIORegisterR0(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTR0PTR pvUser,
+IOMR3DECL(int)  IOMR3MMIORegisterR0(PVM pVM, PPDMDEVINS pDevIns, MMIO_REGISTRATION_CTX enmCtx, RTGCPHYS GCPhysStart, RTUINT cbRange, RTR0PTR pvUser,
                                     R0PTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback,
                                     R0PTRTYPE(PFNIOMMMIOREAD)  pfnReadCallback,
                                     R0PTRTYPE(PFNIOMMMIOFILL)  pfnFillCallback);
-IOMR3DECL(int)  IOMR3MMIORegisterGC(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTGCPTR pvUser,
+IOMR3DECL(int)  IOMR3MMIORegisterGC(PVM pVM, PPDMDEVINS pDevIns, MMIO_REGISTRATION_CTX enmCtx, RTGCPHYS GCPhysStart, RTUINT cbRange, RTGCPTR pvUser,
                                     RCPTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback,
                                     RCPTRTYPE(PFNIOMMMIOREAD)  pfnReadCallback,
                                     RCPTRTYPE(PFNIOMMMIOFILL)  pfnFillCallback);
-IOMR3DECL(int)  IOMR3MMIODeregister(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange);
+IOMR3DECL(int)  IOMR3MMIODeregister(PVM pVM, PPDMDEVINS pDevIns, MMIO_REGISTRATION_CTX enmCtx, RTGCPHYS GCPhysStart, RTUINT cbRange);
 /** @} */
 #endif /* IN_RING3 */

trunk/include/VBox/pdmdev.h

@@ -1726 +1726 @@
      * @param   pDevIns             The device instance to register the MMIO with.
      * @param   GCPhysStart         First physical address in the range.
+     * @param   enmCtx              CPU id or MMIO_REGCTX_GLOBAL if it's a global registration (applies to all CPUs)
      * @param   cbRange             The size of the range (in bytes).
      * @param   pvUser              User argument.
@@ -1733 +1734 @@
      * @param   pszDesc             Pointer to description string. This must not be freed.
      */
-    DECLR3CALLBACKMEMBER(int, pfnMMIORegister,(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTHCPTR pvUser,
+    DECLR3CALLBACKMEMBER(int, pfnMMIORegister,(PPDMDEVINS pDevIns, MMIO_REGISTRATION_CTX enmCtx, RTGCPHYS GCPhysStart, RTUINT cbRange, RTHCPTR pvUser,
                                                PFNIOMMMIOWRITE pfnWrite, PFNIOMMMIOREAD pfnRead, PFNIOMMMIOFILL pfnFill,
                                                const char *pszDesc));
@@ -1746 +1747 @@
      * @returns VBox status.
      * @param   pDevIns             The device instance to register the MMIO with.
+     * @param   enmCtx              CPU id or MMIO_REGCTX_GLOBAL if it's a global registration (applies to all CPUs)
      * @param   GCPhysStart         First physical address in the range.
      * @param   cbRange             The size of the range (in bytes).
@@ -1755 +1757 @@
      * @todo    Remove pszDesc in the next major revision of PDMDEVHLP.
      */
-    DECLR3CALLBACKMEMBER(int, pfnMMIORegisterGC,(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTGCPTR pvUser,
+    DECLR3CALLBACKMEMBER(int, pfnMMIORegisterGC,(PPDMDEVINS pDevIns, MMIO_REGISTRATION_CTX enmCtx, RTGCPHYS GCPhysStart, RTUINT cbRange, RTGCPTR pvUser,
                                                  const char *pszWrite, const char *pszRead, const char *pszFill,
                                                  const char *pszDesc));
@@ -1767 +1769 @@
      * @returns VBox status.
      * @param   pDevIns             The device instance to register the MMIO with.
+     * @param   enmCtx              CPU id or MMIO_REGCTX_GLOBAL if it's a global registration (applies to all CPUs)
      * @param   GCPhysStart         First physical address in the range.
      * @param   cbRange             The size of the range (in bytes).
@@ -1776 +1779 @@
      * @todo    Remove pszDesc in the next major revision of PDMDEVHLP.
      */
-    DECLR3CALLBACKMEMBER(int, pfnMMIORegisterR0,(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTR0PTR pvUser,
+    DECLR3CALLBACKMEMBER(int, pfnMMIORegisterR0,(PPDMDEVINS pDevIns, MMIO_REGISTRATION_CTX enmCtx, RTGCPHYS GCPhysStart, RTUINT cbRange, RTR0PTR pvUser,
                                                  const char *pszWrite, const char *pszRead, const char *pszFill,
                                                  const char *pszDesc));
@@ -1787 +1790 @@
      * @returns VBox status.
      * @param   pDevIns             The device instance owning the MMIO region(s).
+     * @param   enmCtx              CPU id or MMIO_REGCTX_GLOBAL if it's a global registration (applies to all CPUs)
      * @param   GCPhysStart         First physical address in the range.
      * @param   cbRange             The size of the range (in bytes).
      */
-    DECLR3CALLBACKMEMBER(int, pfnMMIODeregister,(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange));
+    DECLR3CALLBACKMEMBER(int, pfnMMIODeregister,(PPDMDEVINS pDevIns, MMIO_REGISTRATION_CTX enmCtx, RTGCPHYS GCPhysStart, RTUINT cbRange));
 
     /**
@@ -3110 +3114 @@
                                       const char *pszDesc)
 {
-    return pDevIns->pDevHlp->pfnMMIORegister(pDevIns, GCPhysStart, cbRange, pvUser, pfnWrite, pfnRead, pfnFill, pszDesc);
+    return pDevIns->pDevHlp->pfnMMIORegister(pDevIns, MMIO_REGCTX_GLOBAL, GCPhysStart, cbRange, pvUser, pfnWrite, pfnRead, pfnFill, pszDesc);
 }
 
@@ -3119 +3123 @@
                                         const char *pszWrite, const char *pszRead, const char *pszFill)
 {
-    return pDevIns->pDevHlp->pfnMMIORegisterGC(pDevIns, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, NULL);
+    return pDevIns->pDevHlp->pfnMMIORegisterGC(pDevIns, MMIO_REGCTX_GLOBAL, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, NULL);
 }
 
@@ -3128 +3132 @@
                                         const char *pszWrite, const char *pszRead, const char *pszFill)
 {
-    return pDevIns->pDevHlp->pfnMMIORegisterR0(pDevIns, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, NULL);
+    return pDevIns->pDevHlp->pfnMMIORegisterR0(pDevIns, MMIO_REGCTX_GLOBAL, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, NULL);
+}
+
+/**
+ * @copydoc PDMDEVHLP::pfnMMIORegisterPerCPU
+ */
+DECLINLINE(int) PDMDevHlpMMIORegisterPerCPU(PPDMDEVINS pDevIns, int idCPU, RTGCPHYS GCPhysStart, RTUINT cbRange, RTHCPTR pvUser,
+                                      PFNIOMMMIOWRITE pfnWrite, PFNIOMMMIOREAD pfnRead, PFNIOMMMIOFILL pfnFill,
+                                      const char *pszDesc)
+{
+    return pDevIns->pDevHlp->pfnMMIORegister(pDevIns, (MMIO_REGISTRATION_CTX)idCPU, GCPhysStart, cbRange, pvUser, pfnWrite, pfnRead, pfnFill, pszDesc);
+}
+
+/**
+ * @copydoc PDMDEVHLP::pfnMMIORegisterPerCPUGC
+ */
+DECLINLINE(int) PDMDevHlpMMIORegisterPerCPUGC(PPDMDEVINS pDevIns, int idCPU, RTGCPHYS GCPhysStart, RTUINT cbRange, RTGCPTR pvUser,
+                                        const char *pszWrite, const char *pszRead, const char *pszFill)
+{
+    return pDevIns->pDevHlp->pfnMMIORegisterGC(pDevIns, (MMIO_REGISTRATION_CTX)idCPU, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, NULL);
+}
+
+/**
+ * @copydoc PDMDEVHLP::pfnMMIORegisterPerCPUR0
+ */
+DECLINLINE(int) PDMDevHlpMMIORegisterPerCPUR0(PPDMDEVINS pDevIns, int idCPU, RTGCPHYS GCPhysStart, RTUINT cbRange, RTR0PTR pvUser,
+                                        const char *pszWrite, const char *pszRead, const char *pszFill)
+{
+    return pDevIns->pDevHlp->pfnMMIORegisterR0(pDevIns, (MMIO_REGISTRATION_CTX)idCPU, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, NULL);
 }
 

trunk/include/VBox/vm.h

@@ -287 +287 @@
     /** The GVM VM handle. Only the GVM should modify this field. */
     uint32_t                    hSelf;
-    /** Reserved / padding. */
-    uint32_t                    u32Reserved;
+    /** Number of virtual CPUs. */
+    uint32_t                    cCPUs;
+    /** Current CPU id; @todo move to per CPU structure. */
+    uint32_t                    idCPU;
+    /** Reserved; alignment. */
+    uint32_t                    u32Reserved[7];
 
     /** @name Public VMM Switcher APIs

trunk/include/VBox/vm.mac

@@ -56 +56 @@
     .pVMGC              RTGCPTR32_RES 1
     .hSelf              resd 1
-    .u32Reserved        resd 1
+    .cCPUs              resd 1
+    .idCPU              resd 1
+    .u32Reserved        resd 7
 
     .pfnVMMGCGuestToHostAsmGuestCtx RTGCPTR32_RES 1