Changeset 82214 in vbox for trunk/src

Timestamp:

Nov 26, 2019 2:51:43 AM (5 years ago)

Author:

vboxsync

Message:

DevEFI: Converted I/O port handler. bugref:9218

File:

• trunk/src/VBox/Devices/EFI/DevEFI.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -143 +143 @@
     /** The flash device containing the NVRAM. */
     FLASHCORE               Flash;
+    /** The 8 I/O ports at 0xEF10 (EFI_PORT_BASE). */
+    IOMIOPORTHANDLE         hIoPorts;
     /** The flash MMIO handle. */
     IOMMMIOHANDLE           hMmioFlash;
@@ -1338 +1340 @@
         case EFI_IMAGE_EVT_CMD_COMPLETE:
         {
-#ifdef IN_RING3
+# ifdef IN_RING3
             AssertBreak(EFI_IMAGE_EVT_GET_PAYLOAD(u32) == 0);
 
@@ -1386 +1388 @@
             }
             return VINF_SUCCESS;
-#else
+# else
             return VINF_IOM_R3_IOPORT_WRITE;
-#endif
+# endif
         }
 
@@ -1431 +1433 @@
 
 /**
- * Port I/O Handler for IN operations.
- *
- * @returns VBox status code.
- *
- * @param   pDevIns     The device instance.
- * @param   pvUser      User argument - ignored.
- * @param   Port        Port number used for the IN operation.
- * @param   pu32        Where to store the result.
- * @param   cb          Number of bytes read.
- */
-static DECLCALLBACK(int) efiIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
+ * @callback_method_impl{FNIOMIOPORTNEWIN}
+ *
+ * @note The @a offPort parameter is absolute!
+ */
+static DECLCALLBACK(VBOXSTRICTRC) efiR3IoPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t *pu32, unsigned cb)
 {
     RT_NOREF(pvUser);
     PDEVEFIR3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVEFIR3);
-    Log4(("EFI in: %x %x\n", Port, cb));
-
-    switch (Port)
+    Log4(("EFI in: %x %x\n", offPort, cb));
+
+    switch (offPort)
     {
         case EFI_INFO_PORT:
@@ -1468 +1464 @@
 
         case EFI_PANIC_PORT:
-#ifdef IN_RING3
+# ifdef IN_RING3
            LogRel(("EFI panic port read!\n"));
            /* Insert special code here on panic reads */
            return PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "EFI Panic: panic port read!\n");
-#else
+# else
            /* Reschedule to R3 */
            return VINF_IOM_R3_IOPORT_READ;
-#endif
+# endif
 
         case EFI_PORT_VARIABLE_OP:
@@ -1517 +1513 @@
 
 /**
- * Port I/O Handler for OUT operations.
- *
- * @returns VBox status code.
- *
- * @param   pDevIns     The device instance.
- * @param   pvUser      User argument - ignored.
- * @param   Port        Port number used for the IN operation.
- * @param   u32         The value to output.
- * @param   cb          The value size in bytes.
- */
-static DECLCALLBACK(int) efiIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
+ * @callback_method_impl{FNIOMIOPORTNEWOUT}
+ *
+ * @note The @a offPort parameter is absolute!
+ */
+static DECLCALLBACK(VBOXSTRICTRC) efiR3IoPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t u32, unsigned cb)
 {
     RT_NOREF(pvUser);
     PDEVEFIR3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVEFIR3);
-    int     rc    = VINF_SUCCESS;
-    Log4(("efi: out %x %x %d\n", Port, u32, cb));
-
-    switch (Port)
+    VBOXSTRICTRC rc   = VINF_SUCCESS;
+    Log4(("efi: out %x %x %d\n", offPort, u32, cb));
+
+    switch (offPort)
     {
         case EFI_INFO_PORT:
@@ -1656 +1646 @@
 
         case EFI_PORT_DEBUG_POINT:
-#ifdef IN_RING3
+# ifdef IN_RING3
             if (u32 > EFIDBGPOINT_INVALID && u32 < EFIDBGPOINT_END)
             {
@@ -1666 +1656 @@
                 rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "Invalid debug point %#x\n", u32);
             break;
-#else
+# else
             return VINF_IOM_R3_IOPORT_WRITE;
-#endif
+# endif
 
         case EFI_PORT_IMAGE_EVENT:
@@ -1675 +1665 @@
 
         default:
-            Log(("EFI: Write to reserved port %RTiop: %#x (cb=%d)\n", Port, u32, cb));
+            Log(("EFI: Write to reserved port %RTiop: %#x (cb=%d)\n", offPort, u32, cb));
             break;
     }
@@ -2640 +2630 @@
      * Register our I/O ports.
      */
-    rc = PDMDevHlpIOPortRegister(pDevIns, EFI_PORT_BASE, EFI_PORT_COUNT, NULL,
-                                 efiIOPortWrite, efiIOPortRead,
-                                 NULL, NULL, "EFI communication ports");
-    if (RT_FAILURE(rc))
-        return rc;
+    rc = PDMDevHlpIoPortCreateFlagsAndMap(pDevIns, EFI_PORT_BASE, EFI_PORT_COUNT, IOM_IOPORT_F_ABS,
+                                          efiR3IoPortWrite, efiR3IoPortRead,
+                                          "EFI communication ports", NULL /*paExtDescs*/, &pThis->hIoPorts);
+    AssertRCReturn(rc, rc);
 
     /*