Changeset 44510 in vbox for trunk/src

Timestamp:

Feb 1, 2013 1:24:40 PM (12 years ago)

Author:

vboxsync

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

83547

Message:

PDM takes the RTC cirtical section before calling the PDMRTCREG callbacks. Documented DMA and IOAPIC locking.

Location:

trunk/src/VBox

Files:

• Devices/PC/DevRTC.cpp (modified) (4 diffs)
• VMM/VMMR3/PDMDevHlp.cpp (modified) (2 diffs)

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

@@ -897 +897 @@
 static void rtcCalcCRC(RTCState *pThis)
 {
-    uint16_t u16;
-    unsigned i;
-
-    for (i = RTC_CRC_START, u16 = 0; i <= RTC_CRC_LAST; i++)
+    uint16_t u16 = 0;
+    for (unsigned i = RTC_CRC_START; i <= RTC_CRC_LAST; i++)
         u16 += pThis->cmos_data[i];
+
     pThis->cmos_data[RTC_CRC_LOW]  = u16 & 0xff;
     pThis->cmos_data[RTC_CRC_HIGH] = (u16 >> 8) & 0xff;
@@ -908 +907 @@
 
 /**
- * Write to a CMOS register and update the checksum if necessary.
- *
- * @returns VBox status code.
- * @param   pDevIns     Device instance of the RTC.
- * @param   iReg        The CMOS register index; bit 8 determines bank.
- * @param   u8Value     The CMOS register value.
+ * @interface_method_impl{PDMRTCREG,pfnWrite}
  */
 static DECLCALLBACK(int) rtcCMOSWrite(PPDMDEVINS pDevIns, unsigned iReg, uint8_t u8Value)
 {
     RTCState *pThis = PDMINS_2_DATA(pDevIns, RTCState *);
+    Assert(PDMCritSectIsOwner(pDevIns->pCritSectRoR3));
     if (iReg < RT_ELEMENTS(pThis->cmos_data))
     {
-        PDMCritSectEnter(pDevIns->pCritSectRoR3, VERR_IGNORED);
-
         pThis->cmos_data[iReg] = u8Value;
 
@@ -929 +922 @@
             rtcCalcCRC(pThis);
 
-        PDMCritSectLeave(pDevIns->pCritSectRoR3);
         return VINF_SUCCESS;
     }
@@ -939 +931 @@
 
 /**
- * Read a CMOS register.
- *
- * @returns VBox status code.
- * @param   pDevIns     Device instance of the RTC.
- * @param   iReg        The CMOS register index; bit 8 determines bank.
- * @param   pu8Value    Where to store the CMOS register value.
+ * @interface_method_impl{PDMRTCREG,pfnRead}
  */
 static DECLCALLBACK(int) rtcCMOSRead(PPDMDEVINS pDevIns, unsigned iReg, uint8_t *pu8Value)
 {
     RTCState   *pThis = PDMINS_2_DATA(pDevIns, RTCState *);
+    Assert(PDMCritSectIsOwner(pDevIns->pCritSectRoR3));
+
     if (iReg < RT_ELEMENTS(pThis->cmos_data))
     {
-        PDMCritSectEnter(pDevIns->pCritSectRoR3, VERR_IGNORED);
-
         *pu8Value = pThis->cmos_data[iReg];
-
-        PDMCritSectLeave(pDevIns->pCritSectRoR3);
         return VINF_SUCCESS;
     }

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

@@ -1984 +1984 @@
     int rc;
     if (pVM->pdm.s.pRtc)
-        rc = pVM->pdm.s.pRtc->Reg.pfnWrite(pVM->pdm.s.pRtc->pDevIns, iReg, u8Value);
+    {
+        PPDMDEVINS pDevInsRtc = pVM->pdm.s.pRtc->pDevIns;
+        rc = PDMCritSectEnter(pDevInsRtc->pCritSectRoR3, VERR_IGNORED);
+        if (RT_SUCCESS(rc))
+        {
+            rc = pVM->pdm.s.pRtc->Reg.pfnWrite(pDevInsRtc, iReg, u8Value);
+            PDMCritSectLeave(pDevInsRtc->pCritSectRoR3);
+        }
+    }
     else
         rc = VERR_PDM_NO_RTC_INSTANCE;
@@ -2005 +2013 @@
     int rc;
     if (pVM->pdm.s.pRtc)
-        rc = pVM->pdm.s.pRtc->Reg.pfnRead(pVM->pdm.s.pRtc->pDevIns, iReg, pu8Value);
+    {
+        PPDMDEVINS pDevInsRtc = pVM->pdm.s.pRtc->pDevIns;
+        rc = PDMCritSectEnter(pDevInsRtc->pCritSectRoR3, VERR_IGNORED);
+        if (RT_SUCCESS(rc))
+        {
+            rc = pVM->pdm.s.pRtc->Reg.pfnRead(pDevInsRtc, iReg, pu8Value);
+            PDMCritSectLeave(pDevInsRtc->pCritSectRoR3);
+        }
+    }
     else
         rc = VERR_PDM_NO_RTC_INSTANCE;