Changeset 99743 in vbox

Timestamp:

May 11, 2023 9:59:52 AM (19 months ago)

Author:

vboxsync

Message:

VMM: Add full support for reading/writing I/O ports on ARMv8 in order to emulate PIO accesses to PCI devices through a dedicated MMIO region by the host to PCI bridge, bugref:10445

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (4 diffs)
• src/VBox/VMM/Makefile.kmk (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (10 diffs)

trunk/include/VBox/vmm/pdmdev.h

@@ -2430 +2430 @@
 
 /** Current PDMDEVHLPR3 version number. */
-#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE_PP(0xffe7, 65, 0)
+#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE_PP(0xffe7, 66, 0)
 
 /**
@@ -2516 +2516 @@
 
     /**
-     * Writes to an I/O port register.
+     * Reads from an I/O port register.
      *
      * @returns Strict VBox status code. Informational status codes other than the one documented
@@ -2530 +2530 @@
      *
      * @thread EMT
-     * @todo r=aeichner This is only used by DevPCI.cpp to write the ELCR of the PIC. This shouldn't be done that way
-     *       and removed again as soon as possible (no time right now)...
+     *
+     * @note This is required for the ARM platform in order to emulate PIO accesses through a dedicated MMIO region.
+     */
+    DECLR3CALLBACKMEMBER(VBOXSTRICTRC, pfnIoPortRead,(PPDMDEVINS pDevIns, RTIOPORT Port, uint32_t *pu32Value, size_t cbValue));
+
+    /**
+     * Writes to an I/O port register.
+     *
+     * @returns Strict VBox status code. Informational status codes other than the one documented
+     *          here are to be treated as internal failure. Use IOM_SUCCESS() to check for success.
+     * @retval  VINF_SUCCESS                Success.
+     * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the
+     *                                      status code must be passed on to EM.
+     *
+     * @param   pDevIns     The device instance to register the ports with.
+     * @param   Port        The port to write to.
+     * @param   u32Value    The value to write.
+     * @param   cbValue     The size of the register to read in bytes. 1, 2 or 4 bytes.
+     *
+     * @thread EMT
+     *
+     * @note This is required for the ARM platform in order to emulate PIO accesses through a dedicated MMIO region.
      */
     DECLR3CALLBACKMEMBER(VBOXSTRICTRC, pfnIoPortWrite,(PPDMDEVINS pDevIns, RTIOPORT Port, uint32_t u32Value, size_t cbValue));
@@ -6638 +6658 @@
 }
 
+/**
+ * @copydoc PDMDEVHLPR3::pfnIoPortRead
+ */
+DECLINLINE(VBOXSTRICTRC) PDMDevHlpIoPortRead(PPDMDEVINS pDevIns, RTIOPORT Port, uint32_t *pu32Value, size_t cbValue)
+{
+    return pDevIns->pHlpR3->pfnIoPortRead(pDevIns, Port, pu32Value, cbValue);
+}
+
+/**
+ * @copydoc PDMDEVHLPR3::pfnIoPortWrite
+ */
+DECLINLINE(VBOXSTRICTRC) PDMDevHlpIoPortWrite(PPDMDEVINS pDevIns, RTIOPORT Port, uint32_t u32Value, size_t cbValue)
+{
+    return pDevIns->pHlpR3->pfnIoPortWrite(pDevIns, Port, u32Value, cbValue);
+}
+
 
 #endif /* IN_RING3 */

trunk/src/VBox/VMM/Makefile.kmk

@@ -379 +379 @@
         VMMR3/IEMR3.cpp \
         VMMR3/IOM.cpp \
+        VMMR3/IOMR3IoPort.cpp \
         VMMR3/IOMR3Mmio.cpp \
         VMMR3/GMM.cpp \

trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

@@ -90 +90 @@
     VM_ASSERT_STATE_RETURN(pVM, VMSTATE_CREATING, VERR_VM_INVALID_VM_STATE);
 
-#if defined(VBOX_VMM_TARGET_ARMV8)
-    int rc = VERR_NOT_SUPPORTED;
-    AssertReleaseFailed();
-#else
     int rc = IOMR3IoPortCreate(pVM, pDevIns, cPorts, fFlags, pPciDev, iPciRegion,
                                pfnOut, pfnIn, pfnOutStr, pfnInStr, pvUser, pszDesc, paExtDescs, phIoPorts);
-#endif
 
     LogFlow(("pdmR3DevHlp_IoPortCreateEx: caller='%s'/%d: returns %Rrc (*phIoPorts=%#x)\n",
@@ -112 +107 @@
     VM_ASSERT_EMT_RETURN(pVM, VERR_VM_THREAD_NOT_EMT);
 
-#if defined(VBOX_VMM_TARGET_ARMV8)
-    int rc = VERR_NOT_SUPPORTED;
-    AssertReleaseFailed();
-#else
     int rc = IOMR3IoPortMap(pVM, pDevIns, hIoPorts, Port);
-#endif
 
     LogFlow(("pdmR3DevHlp_IoPortMap: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
@@ -132 +122 @@
     VM_ASSERT_EMT_RETURN(pVM, VERR_VM_THREAD_NOT_EMT);
 
-#if defined(VBOX_VMM_TARGET_ARMV8)
-    int rc = VERR_NOT_SUPPORTED;
-    AssertReleaseFailed();
-#else
     int rc = IOMR3IoPortUnmap(pVM, pDevIns, hIoPorts);
-#endif
 
     LogFlow(("pdmR3DevHlp_IoPortMap: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
@@ -150 +135 @@
     LogFlow(("pdmR3DevHlp_IoPortGetMappingAddress: caller='%s'/%d: hIoPorts=%#x\n", pDevIns->pReg->szName, pDevIns->iInstance, hIoPorts));
 
-#if defined(VBOX_VMM_TARGET_ARMV8)
-    uint32_t uAddress = UINT32_MAX;
-    AssertReleaseFailed();
-#else
     uint32_t uAddress = IOMR3IoPortGetMappingAddress(pDevIns->Internal.s.pVMR3, pDevIns, hIoPorts);
-#endif
 
     LogFlow(("pdmR3DevHlp_IoPortGetMappingAddress: caller='%s'/%d: returns %#RX32\n", pDevIns->pReg->szName, pDevIns->iInstance, uAddress));
@@ -162 +142 @@
 
 
+/** @interface_method_impl{PDMDEVHLPR3,pfnIoPortRead} */
+static DECLCALLBACK(VBOXSTRICTRC) pdmR3DevHlp_IoPortRead(PPDMDEVINS pDevIns, RTIOPORT Port, uint32_t *pu32Value, size_t cbValue)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    LogFlow(("pdmR3DevHlp_IoPortRead: caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance));
+    PVM pVM = pDevIns->Internal.s.pVMR3;
+    VM_ASSERT_EMT_RETURN(pVM, VERR_VM_THREAD_NOT_EMT);
+
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+    AssertPtrReturn(pVCpu, VERR_ACCESS_DENIED);
+
+    VBOXSTRICTRC rcStrict = IOMIOPortRead(pVM, pVCpu, Port, pu32Value, cbValue);
+
+    LogFlow(("pdmR3DevHlp_IoPortRead: caller='%s'/%d: returns %Rrc\n",
+             pDevIns->pReg->szName, pDevIns->iInstance, VBOXSTRICTRC_VAL(rcStrict)));
+    return rcStrict;
+}
+
+
 /** @interface_method_impl{PDMDEVHLPR3,pfnIoPortWrite} */
 static DECLCALLBACK(VBOXSTRICTRC) pdmR3DevHlp_IoPortWrite(PPDMDEVINS pDevIns, RTIOPORT Port, uint32_t u32Value, size_t cbValue)
@@ -170 +169 @@
     VM_ASSERT_EMT_RETURN(pVM, VERR_VM_THREAD_NOT_EMT);
 
-#if defined(VBOX_VMM_TARGET_ARMV8)
-    RT_NOREF(Port, u32Value, cbValue);
-    VBOXSTRICTRC rcStrict = VERR_NOT_SUPPORTED;
-    AssertReleaseFailed();
-#else
     PVMCPU pVCpu = VMMGetCpu(pVM);
     AssertPtrReturn(pVCpu, VERR_ACCESS_DENIED);
 
     VBOXSTRICTRC rcStrict = IOMIOPortWrite(pVM, pVCpu, Port, u32Value, cbValue);
-#endif
 
     LogFlow(("pdmR3DevHlp_IoPortWrite: caller='%s'/%d: returns %Rrc\n",
@@ -2120 +2113 @@
         case PDMPCIDEV_IORGN_F_IOPORT_HANDLE:
             AssertReturn(enmType == PCI_ADDRESS_SPACE_IO, VERR_INVALID_FLAGS);
-#if defined(VBOX_VMM_TARGET_ARMV8)
-            rc = VERR_NOT_SUPPORTED;
-            AssertReleaseFailed();
-            AssertRCReturn(rc, rc);
-#else
             rc = IOMR3IoPortValidateHandle(pVM, pDevIns, (IOMIOPORTHANDLE)hHandle);
             AssertRCReturn(rc, rc);
-#endif
             break;
         case PDMPCIDEV_IORGN_F_MMIO_HANDLE:
@@ -4873 +4860 @@
     pdmR3DevHlp_IoPortUnmap,
     pdmR3DevHlp_IoPortGetMappingAddress,
+    pdmR3DevHlp_IoPortRead,
     pdmR3DevHlp_IoPortWrite,
     pdmR3DevHlp_MmioCreateEx,
@@ -5270 +5258 @@
     pdmR3DevHlpTracing_IoPortUnmap,
     pdmR3DevHlp_IoPortGetMappingAddress,
-    pdmR3DevHlp_IoPortWrite,
+    pdmR3DevHlp_IoPortRead,  /** @todo Needs tracing variants for ARM now. */
+    pdmR3DevHlp_IoPortWrite, /** @todo Needs tracing variants for ARM now. */
     pdmR3DevHlpTracing_MmioCreateEx,
     pdmR3DevHlpTracing_MmioMap,
@@ -5987 +5976 @@
     pdmR3DevHlp_IoPortUnmap,
     pdmR3DevHlp_IoPortGetMappingAddress,
+    pdmR3DevHlp_IoPortRead,
     pdmR3DevHlp_IoPortWrite,
     pdmR3DevHlp_MmioCreateEx,