===================================================================
@@ -568,12 +568,30 @@ static void pm_wakeup_update_hit_counts(
}
/**
+ * __pm_wakeup_pending - Check if there are any new wakeup events.
+ * @count: Expected number of wakeup events registered so far.
+ *
+ * Compare the current number of registered wakeup events with @count and return
+ * true if they are different. Also return true if the current number of wakeup
+ * events being processed is different from zero.
+ */
+static bool __pm_wakeup_pending(unsigned int count)
+{
+ bool in_progress;
+
+ in_progress = !!atomic_read(&events_in_progress);
+ smp_rmb();
+ return in_progress || (unsigned int)atomic_read(&event_count) != count;
+}
+
+/**
* pm_wakeup_pending - Check if power transition in progress should be aborted.
*
- * Compare the current number of registered wakeup events with its preserved
- * value from the past and return true if new wakeup events have been registered
- * since the old value was stored. Also return true if the current number of
- * wakeup events being processed is different from zero.
+ * If wakeup events detection is enabled, call __pm_wakeup_pending() for
+ * saved_count (preserved number of registered wakeup events from the past) and
+ * return its result. If it is 'true' (i.e. new wakeup events have been
+ * registered since the last modification of saved_count), disable wakeup events
+ * detection and update the statistics of all wakeup sources.
*/
bool pm_wakeup_pending(void)
{
@@ -582,8 +600,7 @@ bool pm_wakeup_pending(void)
spin_lock_irqsave(&events_lock, flags);
if (events_check_enabled) {
- ret = ((unsigned int)atomic_read(&event_count) != saved_count)
- || atomic_read(&events_in_progress);
+ ret = __pm_wakeup_pending(saved_count);
events_check_enabled = !ret;
}
spin_unlock_irqrestore(&events_lock, flags);
@@ -616,6 +633,7 @@ bool pm_get_wakeup_count(unsigned int *c
}
ret = !atomic_read(&events_in_progress);
+ smp_rmb();
*count = atomic_read(&event_count);
return ret;
}
@@ -634,8 +652,7 @@ bool pm_save_wakeup_count(unsigned int c
bool ret = false;
spin_lock_irq(&events_lock);
- if (count == (unsigned int)atomic_read(&event_count)
- && !atomic_read(&events_in_progress)) {
+ if (!__pm_wakeup_pending(count)) {
saved_count = count;
events_check_enabled = true;
ret = true;