Changeset 81942 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Nov 18, 2019 2:10:03 PM (5 years ago)

Author:

vboxsync

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

134739

Message:

DevIoApic: Convert the MMIO handlers to new style. bugref:9218

File:

• trunk/src/VBox/Devices/PC/DevIoApic.cpp (modified) (17 diffs)

trunk/src/VBox/Devices/PC/DevIoApic.cpp

@@ -235 +235 @@
 #endif
 
+    /** The MMIO region. */
+    IOMMMIOHANDLE           hMmio;
+
 #ifdef VBOX_WITH_STATISTICS
     /** Number of MMIO reads in RZ. */
@@ -451 +454 @@
 {
     uint8_t const idxRte = (uIndex - IOAPIC_INDIRECT_INDEX_REDIR_TBL_START) >> 1;
+    AssertMsgReturn(idxRte < RT_ELEMENTS(pThis->au64RedirTable),
+                    ("Invalid index %u, expected < %u\n", idxRte, RT_ELEMENTS(pThis->au64RedirTable)),
+                    UINT32_MAX);
     uint32_t uValue;
     if (!(uIndex & 1))
@@ -465 +471 @@
  * Sets the redirection table entry.
  *
+ * @returns Strict VBox status code (VINF_IOM_R3_MMIO_WRITE / VINF_SUCCESS).
  * @param   pThis       Pointer to the IOAPIC instance.
  * @param   uIndex      The index value.
  * @param   uValue      The value to set.
  */
-static int ioapicSetRedirTableEntry(PIOAPIC pThis, uint32_t uIndex, uint32_t uValue)
+static VBOXSTRICTRC ioapicSetRedirTableEntry(PIOAPIC pThis, uint32_t uIndex, uint32_t uValue)
 {
     uint8_t const idxRte = (uIndex - IOAPIC_INDIRECT_INDEX_REDIR_TBL_START) >> 1;
-    AssertMsg(idxRte < RT_ELEMENTS(pThis->au64RedirTable), ("Invalid index %u, expected <= %u\n", idxRte,
-                                                            RT_ELEMENTS(pThis->au64RedirTable)));
-
-    int rc = IOAPIC_LOCK(pThis, VINF_IOM_R3_MMIO_WRITE);
+    AssertMsgReturn(idxRte < RT_ELEMENTS(pThis->au64RedirTable),
+                    ("Invalid index %u, expected < %u\n", idxRte, RT_ELEMENTS(pThis->au64RedirTable)),
+                    VINF_SUCCESS);
+
+    VBOXSTRICTRC rc = IOAPIC_LOCK(pThis, VINF_IOM_R3_MMIO_WRITE);
     if (rc == VINF_SUCCESS)
     {
@@ -563 +571 @@
  * Sets the data register.
  *
- * @param pThis     Pointer to the IOAPIC instance.
- * @param uValue    The value to set.
- */
-static int ioapicSetData(PIOAPIC pThis, uint32_t uValue)
+ * @returns Strict VBox status code.
+ * @param   pThis   Pointer to the IOAPIC instance.
+ * @param   uValue  The value to set.
+ */
+static VBOXSTRICTRC ioapicSetData(PIOAPIC pThis, uint32_t uValue)
 {
     uint8_t const uIndex = pThis->u8Index;
@@ -588 +597 @@
  * @interface_method_impl{PDMIOAPICREG,pfnSetEoiR3}
  */
-PDMBOTHCBDECL(int) ioapicSetEoi(PPDMDEVINS pDevIns, uint8_t u8Vector)
+static DECLCALLBACK(int) ioapicSetEoi(PPDMDEVINS pDevIns, uint8_t u8Vector)
 {
     PIOAPIC pThis = PDMDEVINS_2_DATA(pDevIns, PIOAPIC);
@@ -634 +643 @@
  * @interface_method_impl{PDMIOAPICREG,pfnSetIrqR3}
  */
-PDMBOTHCBDECL(void) ioapicSetIrq(PPDMDEVINS pDevIns, int iIrq, int iLevel, uint32_t uTagSrc)
-{
-#define IOAPIC_ASSERT_IRQ(a_idxRte, a_PinMask)       do { \
+static DECLCALLBACK(void) ioapicSetIrq(PPDMDEVINS pDevIns, int iIrq, int iLevel, uint32_t uTagSrc)
+{
+#define IOAPIC_ASSERT_IRQ(a_idxRte, a_PinMask) do { \
         pThis->au32TagSrc[(a_idxRte)] = !pThis->au32TagSrc[(a_idxRte)] ? uTagSrc : RT_BIT_32(31); \
         pThis->uIrr |= a_PinMask; \
@@ -647 +656 @@
     STAM_COUNTER_INC(&pThis->CTX_SUFF_Z(StatSetIrq));
 
-    if (RT_LIKELY(iIrq >= 0 && iIrq < (int)RT_ELEMENTS(pThis->au64RedirTable)))
+    if (RT_LIKELY((unsigned)iIrq < RT_ELEMENTS(pThis->au64RedirTable)))
     {
         int rc = IOAPIC_LOCK(pThis, VINF_SUCCESS);
@@ -729 +738 @@
  * @interface_method_impl{PDMIOAPICREG,pfnSendMsiR3}
  */
-PDMBOTHCBDECL(void) ioapicSendMsi(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, uint32_t uValue, uint32_t uTagSrc)
+static DECLCALLBACK(void) ioapicSendMsi(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, uint32_t uValue, uint32_t uTagSrc)
 {
     PCIOAPIC pThis = PDMDEVINS_2_DATA(pDevIns, PCIOAPIC);
@@ -768 +777 @@
 
 /**
- * @callback_method_impl{FNIOMMMIOREAD}
- */
-PDMBOTHCBDECL(int) ioapicMmioRead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
+ * @callback_method_impl{FNIOMMMIONEWREAD}
+ */
+static DECLCALLBACK(VBOXSTRICTRC) ioapicMmioRead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void *pv, unsigned cb)
 {
     PIOAPIC pThis = PDMDEVINS_2_DATA(pDevIns, PIOAPIC);
@@ -777 +786 @@
     RT_NOREF_PV(pvUser);
 
-    int       rc      = VINF_SUCCESS;
-    uint32_t *puValue = (uint32_t *)pv;
-    uint32_t  offReg  = GCPhysAddr & IOAPIC_MMIO_REG_MASK;
+    VBOXSTRICTRC rc      = VINF_SUCCESS;
+    uint32_t    *puValue = (uint32_t *)pv;
+    uint32_t     offReg  = off & IOAPIC_MMIO_REG_MASK;
     switch (offReg)
     {
@@ -791 +800 @@
 
         default:
-            Log2(("IOAPIC: ioapicMmioRead: Invalid offset. GCPhysAddr=%#RGp offReg=%#x\n", GCPhysAddr, offReg));
+            Log2(("IOAPIC: ioapicMmioRead: Invalid offset. off=%#RGp offReg=%#x\n", off, offReg));
             rc = VINF_IOM_MMIO_UNUSED_FF;
             break;
@@ -802 +811 @@
 
 /**
- * @callback_method_impl{FNIOMMMIOWRITE}
- */
-PDMBOTHCBDECL(int) ioapicMmioWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void const *pv, unsigned cb)
+ * @callback_method_impl{FNIOMMMIONEWWRITE}
+ */
+static DECLCALLBACK(VBOXSTRICTRC) ioapicMmioWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void const *pv, unsigned cb)
 {
     PIOAPIC pThis = PDMDEVINS_2_DATA(pDevIns, PIOAPIC);
@@ -811 +820 @@
     STAM_COUNTER_INC(&pThis->CTX_SUFF_Z(StatMmioWrite));
 
-    Assert(!(GCPhysAddr & 3));
+    Assert(!(off & 3));
     Assert(cb == 4); RT_NOREF_PV(cb); /* registered for dwords only */
 
+    VBOXSTRICTRC   rc     = VINF_SUCCESS;
     uint32_t const uValue = *(uint32_t const *)pv;
-    uint32_t const offReg = GCPhysAddr & IOAPIC_MMIO_REG_MASK;
-
-    LogFlow(("IOAPIC: ioapicMmioWrite: pThis=%p GCPhysAddr=%#RGp cb=%u uValue=%#RX32\n", pThis, GCPhysAddr, cb, uValue));
-    int rc = VINF_SUCCESS;
+    uint32_t const offReg = off & IOAPIC_MMIO_REG_MASK;
+
+    LogFlow(("IOAPIC: ioapicMmioWrite: pThis=%p off=%#RGp cb=%u uValue=%#RX32\n", pThis, off, cb, uValue));
     switch (offReg)
     {
@@ -837 +846 @@
 
         default:
-            Log2(("IOAPIC: ioapicMmioWrite: Invalid offset. GCPhysAddr=%#RGp offReg=%#x\n", GCPhysAddr, offReg));
+            Log2(("IOAPIC: ioapicMmioWrite: Invalid offset. off=%#RGp offReg=%#x\n", off, offReg));
             break;
     }
@@ -878 +887 @@
 {
     RT_NOREF(pDesc, pfMask);
-     return ioapicSetData(PDMDEVINS_2_DATA((PPDMDEVINS)pvUser, PIOAPIC), pValue->u32);
+     return VBOXSTRICTRC_VAL(ioapicSetData(PDMDEVINS_2_DATA((PPDMDEVINS)pvUser, PIOAPIC), pValue->u32));
 }
 
@@ -1266 +1275 @@
      * Register MMIO callbacks.
      */
-    rc = PDMDevHlpMMIORegister(pDevIns, IOAPIC_MMIO_BASE_PHYSADDR, IOAPIC_MMIO_SIZE, pThis,
-                               IOMMMIO_FLAGS_READ_DWORD | IOMMMIO_FLAGS_WRITE_DWORD_ZEROED, ioapicMmioWrite, ioapicMmioRead,
-                               "I/O APIC");
+    rc = PDMDevHlpMmioCreateAndMap(pDevIns, IOAPIC_MMIO_BASE_PHYSADDR, IOAPIC_MMIO_SIZE, ioapicMmioWrite, ioapicMmioRead,
+                                   IOMMMIO_FLAGS_READ_DWORD | IOMMMIO_FLAGS_WRITE_DWORD_ZEROED, "I/O APIC", &pThis->hMmio);
     AssertRCReturn(rc, rc);
-    if (pDevIns->fR0Enabled | pDevIns->fRCEnabled)
-    {
-        rc = PDMDevHlpMMIORegisterRC(pDevIns, IOAPIC_MMIO_BASE_PHYSADDR, IOAPIC_MMIO_SIZE, NIL_RTRCPTR /* pvUser */,
-                                     "ioapicMmioWrite", "ioapicMmioRead");
-        AssertRCReturn(rc, rc);
-
-        rc = PDMDevHlpMMIORegisterR0(pDevIns, IOAPIC_MMIO_BASE_PHYSADDR, IOAPIC_MMIO_SIZE, NIL_RTR0PTR /* pvUser */,
-                                     "ioapicMmioWrite", "ioapicMmioRead");
-        AssertRCReturn(rc, rc);
-    }
 
     /*
@@ -1353 +1351 @@
     IoApicReg.u32TheEnd    = PDM_IOAPICREG_VERSION;
     rc = PDMDevHlpIoApicSetUpContext(pDevIns, &IoApicReg, &pThis->CTX_SUFF(pIoApicHlp));
+    AssertRCReturn(rc, rc);
+
+    rc = PDMDevHlpMmioSetUpContext(pDevIns, pThis->hMmio, ioapicMmioWrite, ioapicMmioRead, NULL /*pvUser*/);
     AssertRCReturn(rc, rc);