1 files changed, 34 insertions, 3 deletions

diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index 96c280b2c263..597a1e836f22 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -37,12 +37,15 @@ enum clock_event_mode {
  *              reached from DETACHED or SHUTDOWN.
  * ONESHOT:     Device is programmed to generate event only once. Can be reached
  *              from DETACHED or SHUTDOWN.
+ * ONESHOT_STOPPED: Device was programmed in ONESHOT mode and is temporarily
+ *                  stopped.
  */
 enum clock_event_state {
         CLOCK_EVT_STATE_DETACHED,
         CLOCK_EVT_STATE_SHUTDOWN,
         CLOCK_EVT_STATE_PERIODIC,
         CLOCK_EVT_STATE_ONESHOT,
+        CLOCK_EVT_STATE_ONESHOT_STOPPED,
 };
 
 /*
@@ -84,12 +87,13 @@ enum clock_event_state {
  * @mult:               nanosecond to cycles multiplier
  * @shift:              nanoseconds to cycles divisor (power of two)
  * @mode:               operating mode, relevant only to ->set_mode(), OBSOLETE
- * @state:              current state of the device, assigned by the core code
+ * @state_use_accessors:current state of the device, assigned by the core code
  * @features:           features
  * @retries:            number of forced programming retries
  * @set_mode:           legacy set mode function, only for modes <= CLOCK_EVT_MODE_RESUME.
  * @set_state_periodic: switch state to periodic, if !set_mode
  * @set_state_oneshot:  switch state to oneshot, if !set_mode
+ * @set_state_oneshot_stopped: switch state to oneshot_stopped, if !set_mode
  * @set_state_shutdown: switch state to shutdown, if !set_mode
  * @tick_resume:        resume clkevt device, if !set_mode
  * @broadcast:          function to broadcast events
@@ -113,7 +117,7 @@ struct clock_event_device {
         u32                     mult;
         u32                     shift;
         enum clock_event_mode   mode;
-        enum clock_event_state  state;
+        enum clock_event_state  state_use_accessors;
         unsigned int            features;
         unsigned long           retries;
 
@@ -121,11 +125,12 @@ struct clock_event_device {
          * State transition callback(s): Only one of the two groups should be
          * defined:
          * - set_mode(), only for modes <= CLOCK_EVT_MODE_RESUME.
-         * - set_state_{shutdown|periodic|oneshot}(), tick_resume().
+         * - set_state_{shutdown|periodic|oneshot|oneshot_stopped}(), tick_resume().
          */
         void                    (*set_mode)(enum clock_event_mode mode, struct clock_event_device *);
         int                     (*set_state_periodic)(struct clock_event_device *);
         int                     (*set_state_oneshot)(struct clock_event_device *);
+        int                     (*set_state_oneshot_stopped)(struct clock_event_device *);
         int                     (*set_state_shutdown)(struct clock_event_device *);
         int                     (*tick_resume)(struct clock_event_device *);
 
@@ -144,6 +149,32 @@ struct clock_event_device {
         struct module           *owner;
 } ____cacheline_aligned;
 
+/* Helpers to verify state of a clockevent device */
+static inline bool clockevent_state_detached(struct clock_event_device *dev)
+{
+        return dev->state_use_accessors == CLOCK_EVT_STATE_DETACHED;
+}
+
+static inline bool clockevent_state_shutdown(struct clock_event_device *dev)
+{
+        return dev->state_use_accessors == CLOCK_EVT_STATE_SHUTDOWN;
+}
+
+static inline bool clockevent_state_periodic(struct clock_event_device *dev)
+{
+        return dev->state_use_accessors == CLOCK_EVT_STATE_PERIODIC;
+}
+
+static inline bool clockevent_state_oneshot(struct clock_event_device *dev)
+{
+        return dev->state_use_accessors == CLOCK_EVT_STATE_ONESHOT;
+}
+
+static inline bool clockevent_state_oneshot_stopped(struct clock_event_device *dev)
+{
+        return dev->state_use_accessors == CLOCK_EVT_STATE_ONESHOT_STOPPED;
+}
+
 /*
  * Calculate a multiplication factor for scaled math, which is used to convert
  * nanoseconds based values to clock ticks: