Changeset 37237 in vbox for trunk/src/VBox

Timestamp:

May 27, 2011 2:57:54 PM (14 years ago)

Author:

vboxsync

Message:

DevACPI: attempt to make the ACPI timer SMP-safe

Location:

trunk/src/VBox/Devices

Files:

• PC/DevACPI.cpp (modified) (7 diffs)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

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

@@ -203 +203 @@
     /** Number of logical CPUs in guest */
     uint16_t            cCpus;
-    int64_t             pm_timer_initial;
+    uint64_t            u64PmTimerInitial;
+    uint64_t            u64PmTimerLastSeen;
     PTMTIMERR3          tsR3;
     PTMTIMERR0          tsR0;
@@ -1919 +1920 @@
     {
         ACPIState *s = PDMINS_2_DATA(pDevIns, ACPIState *);
-        int64_t now = TMTimerGet(s->CTX_SUFF(ts));
-        int64_t elapsed = now - s->pm_timer_initial;
-
-        *pu32 = ASMMultU64ByU32DivByU32(elapsed, PM_TMR_FREQ, TMTimerGetFreq(s->CTX_SUFF(ts)));
+        uint64_t u64Now = TMTimerGet(s->CTX_SUFF(ts));
+        uint64_t u64Seen;
+        do
+        {
+            u64Seen = ASMAtomicReadU64(&s->u64PmTimerLastSeen);
+            if (u64Now < s->u64PmTimerLastSeen)
+                u64Now = s->u64PmTimerLastSeen + 1;
+        } while (!ASMAtomicCmpXchgU64(&s->u64PmTimerLastSeen, u64Now, u64Seen));
+
+        uint64_t u64Elapsed = u64Now - s->u64PmTimerInitial;
+        *pu32 = ASMMultU64ByU32DivByU32(u64Elapsed, PM_TMR_FREQ, TMTimerGetFreq(s->CTX_SUFF(ts)));
         Log(("acpi: acpiPMTmrRead -> %#x\n", *pu32));
         return VINF_SUCCESS;
@@ -2121 +2129 @@
     SSMFIELD_ENTRY(ACPIState, pm1a_sts),
     SSMFIELD_ENTRY(ACPIState, pm1a_ctl),
-    SSMFIELD_ENTRY(ACPIState, pm_timer_initial),
+    SSMFIELD_ENTRY(ACPIState, u64PmTimerInitial),
     SSMFIELD_ENTRY(ACPIState, gpe0_en),
     SSMFIELD_ENTRY(ACPIState, gpe0_sts),
@@ -2141 +2149 @@
     SSMFIELD_ENTRY(ACPIState, pm1a_sts),
     SSMFIELD_ENTRY(ACPIState, pm1a_ctl),
-    SSMFIELD_ENTRY(ACPIState, pm_timer_initial),
+    SSMFIELD_ENTRY(ACPIState, u64PmTimerInitial),
     SSMFIELD_ENTRY(ACPIState, gpe0_en),
     SSMFIELD_ENTRY(ACPIState, gpe0_sts),
@@ -2160 +2168 @@
     SSMFIELD_ENTRY(ACPIState, pm1a_sts),
     SSMFIELD_ENTRY(ACPIState, pm1a_ctl),
-    SSMFIELD_ENTRY(ACPIState, pm_timer_initial),
+    SSMFIELD_ENTRY(ACPIState, u64PmTimerInitial),
     SSMFIELD_ENTRY(ACPIState, gpe0_en),
     SSMFIELD_ENTRY(ACPIState, gpe0_sts),
@@ -2579 +2587 @@
     s->pm1a_sts          = 0;
     s->pm1a_ctl          = 0;
-    s->pm_timer_initial  = TMTimerGet(s->CTX_SUFF(ts));
+    s->u64PmTimerInitial = TMTimerGet(s->CTX_SUFF(ts));
     acpiPMTimerReset(s);
     s->uBatteryIndex     = 0;
@@ -2889 +2897 @@
     s->tsR0 = TMTimerR0Ptr(s->tsR3);
     s->tsRC = TMTimerRCPtr(s->tsR3);
-    s->pm_timer_initial = TMTimerGet(s->tsR3);
+    s->u64PmTimerInitial = TMTimerGet(s->tsR3);
     acpiPMTimerReset(s);
 

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -480 +480 @@
     GEN_CHECK_OFF(ACPIState, pm1a_sts);
     GEN_CHECK_OFF(ACPIState, pm1a_ctl);
-    GEN_CHECK_OFF(ACPIState, pm_timer_initial);
+    GEN_CHECK_OFF(ACPIState, u64PmTimerInitial);
     GEN_CHECK_OFF(ACPIState, tsR3);
     GEN_CHECK_OFF(ACPIState, tsR0);