cpuidle: fix broadcast control when broadcast can not be entered
authorNicholas Piggin <npiggin@gmail.com>
Fri, 1 Sep 2017 04:29:56 +0000 (14:29 +1000)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 28 Sep 2017 00:18:07 +0000 (02:18 +0200)
When failing to enter broadcast timer mode for an idle state that
requires it, a new state is selected that does not require broadcast,
but the broadcast variable remains set. This causes
tick_broadcast_exit to be called despite not having entered broadcast
mode.

This causes the WARN_ON_ONCE(!irqs_disabled()) to trigger in some
cases. It does not appear to cause problems for code today, but seems
to violate the interface so should be fixed.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/cpuidle/cpuidle.c

index 484cc8909d5c3630c197ae58ee4c98d2807f42c7..ed4df58a855e14057611746016ac65eba9466a16 100644 (file)
@@ -208,6 +208,7 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
                        return -EBUSY;
                }
                target_state = &drv->states[index];
+               broadcast = false;
        }
 
        /* Take note of the planned idle state. */