Changeset 99743 in vbox for trunk/src/VBox/VMM

Timestamp:

May 11, 2023 9:59:52 AM (21 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/src/VBox/VMM

Files:

• Makefile.kmk (modified) (1 diff)
• VMMR3/PDMDevHlp.cpp (modified) (10 diffs)

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,