Changeset 37513 in vbox

Timestamp:

Jun 16, 2011 6:12:18 PM (14 years ago)

Author:

vboxsync

Message:

DevRTC: Locking adjustments.

File:

• trunk/src/VBox/Devices/PC/DevRTC.cpp (modified) (6 diffs)

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

@@ -211 +211 @@
     uint32_t freq;
 
+    Assert(TMTimerIsLockOwner(pThis->CTX_SUFF(pPeriodicTimer)));
+    Assert(PDMCritSectIsOwner(pThis->CTX_SUFF(pDevIns)->CTX_SUFF(pCritSectRo)));
+
     period_code = pThis->cmos_data[RTC_REG_A] & 0x0f;
     if (   period_code != 0
@@ -379 +382 @@
              pThis->cmos_index[bank], u32, pThis->cmos_data[pThis->cmos_index[bank]]));
 
-        switch (pThis->cmos_index[bank])
+        int const idx = pThis->cmos_index[bank];
+        switch (idx)
         {
             case RTC_SECONDS_ALARM:
@@ -401 +405 @@
 
             case RTC_REG_A:
-                /* UIP bit is read only */
-                pThis->cmos_data[RTC_REG_A] = (u32                        & ~REG_A_UIP)
-                                            | (pThis->cmos_data[RTC_REG_A] & REG_A_UIP);
-                rtc_timer_update(pThis, TMTimerGet(pThis->CTX_SUFF(pPeriodicTimer)));
-                break;
-
             case RTC_REG_B:
-                if (u32 & REG_B_SET)
+            {
+                /* We need to acquire the clock lock, because of lock ordering
+                   issues this means having to release the device lock.  Since
+                   we're letting IOM do the locking, we must not return without
+                   holding the device lock.*/
+                PDMCritSectLeave(pThis->CTX_SUFF(pDevIns)->CTX_SUFF(pCritSectRo));
+                int rc1 = TMTimerLock(pThis->CTX_SUFF(pPeriodicTimer), VINF_SUCCESS /* must get it */);
+                int rc2 = PDMCritSectEnter(pThis->CTX_SUFF(pDevIns)->CTX_SUFF(pCritSectRo), VINF_SUCCESS /* must get it */);
+                AssertRCReturn(rc1, rc1);
+                AssertRCReturnStmt(rc2, TMTimerUnlock(pThis->CTX_SUFF(pPeriodicTimer)), rc2);
+
+                if (idx == RTC_REG_A)
                 {
-                    /* set mode: reset UIP mode */
-                    pThis->cmos_data[RTC_REG_A] &= ~REG_A_UIP;
-#if 0 /* This is probably wrong as it breaks changing the time/date in OS/2. */
-                    u32 &= ~REG_B_UIE;
-#endif
+                    /* UIP bit is read only */
+                    pThis->cmos_data[RTC_REG_A] = (u32                        & ~REG_A_UIP)
+                                                | (pThis->cmos_data[RTC_REG_A] & REG_A_UIP);
                 }
                 else
                 {
-                    /* if disabling set mode, update the time */
-                    if (pThis->cmos_data[RTC_REG_B] & REG_B_SET)
-                        rtc_set_time(pThis);
+                    if (u32 & REG_B_SET)
+                    {
+                        /* set mode: reset UIP mode */
+                        pThis->cmos_data[RTC_REG_A] &= ~REG_A_UIP;
+#if 0 /* This is probably wrong as it breaks changing the time/date in OS/2. */
+                        u32 &= ~REG_B_UIE;
+#endif
+                    }
+                    else
+                    {
+                        /* if disabling set mode, update the time */
+                        if (pThis->cmos_data[RTC_REG_B] & REG_B_SET)
+                            rtc_set_time(pThis);
+                    }
+                    pThis->cmos_data[RTC_REG_B] = u32;
                 }
-                pThis->cmos_data[RTC_REG_B] = u32;
+
                 rtc_timer_update(pThis, TMTimerGet(pThis->CTX_SUFF(pPeriodicTimer)));
+
+                TMTimerUnlock(pThis->CTX_SUFF(pPeriodicTimer));
+                /* the caller leaves the other lock. */
                 break;
+            }
 
             case RTC_REG_C:
@@ -455 +478 @@
 {
     RTCState *pThis = PDMINS_2_DATA(pDevIns, RTCState *);
+    Assert(TMTimerIsLockOwner(pThis->CTX_SUFF(pPeriodicTimer)));
+    Assert(PDMCritSectIsOwner(pThis->CTX_SUFF(pDevIns)->CTX_SUFF(pCritSectRo)));
 
     rtc_timer_update(pThis, pThis->next_periodic_time);
@@ -537 +562 @@
 {
     RTCState *pThis = PDMINS_2_DATA(pDevIns, RTCState *);
+    Assert(TMTimerIsLockOwner(pThis->CTX_SUFF(pPeriodicTimer)));
+    Assert(PDMCritSectIsOwner(pThis->CTX_SUFF(pDevIns)->CTX_SUFF(pCritSectRo)));
 
     /* if the oscillator is not in normal operation, we do not update */
@@ -598 +625 @@
 {
     RTCState *pThis = PDMINS_2_DATA(pDevIns, RTCState *);
+    Assert(TMTimerIsLockOwner(pThis->CTX_SUFF(pPeriodicTimer)));
+    Assert(PDMCritSectIsOwner(pThis->CTX_SUFF(pDevIns)->CTX_SUFF(pCritSectRo)));
 
     if (!(pThis->cmos_data[RTC_REG_B] & REG_B_SET))