Patched in Tegra support.

1 files changed, 35 insertions, 79 deletions

diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index 3711b34dc4f..b51629e15cf 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -13,94 +13,89 @@
 
 #include <linux/percpu.h>
 #include <linux/list.h>
+#include <linux/module.h>
 #include <linux/kobject.h>
 #include <linux/completion.h>
-#include <linux/hrtimer.h>
 
 #define CPUIDLE_STATE_MAX       8
 #define CPUIDLE_NAME_LEN        16
 #define CPUIDLE_DESC_LEN        32
 
-struct module;
-
 struct cpuidle_device;
-struct cpuidle_driver;
 
 
 /****************************
  * CPUIDLE DEVICE INTERFACE *
  ****************************/
 
-struct cpuidle_state_usage {
-        void            *driver_data;
-
-        unsigned long long      disable;
-        unsigned long long      usage;
-        unsigned long long      time; /* in US */
-};
-
 struct cpuidle_state {
         char            name[CPUIDLE_NAME_LEN];
         char            desc[CPUIDLE_DESC_LEN];
+        void            *driver_data;
 
         unsigned int    flags;
         unsigned int    exit_latency; /* in US */
-        int             power_usage; /* in mW */
+        unsigned int    power_usage; /* in mW */
         unsigned int    target_residency; /* in US */
-        bool            disabled; /* disabled on all CPUs */
 
-        int (*enter)    (struct cpuidle_device *dev,
-                        struct cpuidle_driver *drv,
-                        int index);
+        unsigned long long      usage;
+        unsigned long long      time; /* in US */
 
-        int (*enter_dead) (struct cpuidle_device *dev, int index);
+        int (*enter)    (struct cpuidle_device *dev,
+                         struct cpuidle_state *state);
 };
 
 /* Idle State Flags */
 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
-#define CPUIDLE_FLAG_COUPLED    (0x02) /* state applies to multiple cpus */
+#define CPUIDLE_FLAG_IGNORE     (0x100) /* ignore during this idle period */
 
 #define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000)
 
 /**
  * cpuidle_get_statedata - retrieves private driver state data
- * @st_usage: the state usage statistics
+ * @state: the state
  */
-static inline void *cpuidle_get_statedata(struct cpuidle_state_usage *st_usage)
+static inline void * cpuidle_get_statedata(struct cpuidle_state *state)
 {
-        return st_usage->driver_data;
+        return state->driver_data;
 }
 
 /**
  * cpuidle_set_statedata - stores private driver state data
- * @st_usage: the state usage statistics
+ * @state: the state
  * @data: the private data
  */
 static inline void
-cpuidle_set_statedata(struct cpuidle_state_usage *st_usage, void *data)
+cpuidle_set_statedata(struct cpuidle_state *state, void *data)
 {
-        st_usage->driver_data = data;
+        state->driver_data = data;
 }
 
+struct cpuidle_state_kobj {
+        struct cpuidle_state *state;
+        struct completion kobj_unregister;
+        struct kobject kobj;
+};
+
 struct cpuidle_device {
         unsigned int            registered:1;
         unsigned int            enabled:1;
+        unsigned int            power_specified:1;
         unsigned int            cpu;
 
         int                     last_residency;
         int                     state_count;
-        struct cpuidle_state_usage      states_usage[CPUIDLE_STATE_MAX];
+        struct cpuidle_state    states[CPUIDLE_STATE_MAX];
         struct cpuidle_state_kobj *kobjs[CPUIDLE_STATE_MAX];
-        struct cpuidle_driver_kobj *kobj_driver;
+        struct cpuidle_state    *last_state;
+
         struct list_head        device_list;
         struct kobject          kobj;
         struct completion       kobj_unregister;
+        void                    *governor_data;
+        struct cpuidle_state    *safe_state;
 
-#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
-        int                     safe_state_index;
-        cpumask_t               coupled_cpus;
-        struct cpuidle_coupled  *coupled;
-#endif
+        int (*prepare)          (struct cpuidle_device *dev);
 };
 
 DECLARE_PER_CPU(struct cpuidle_device *, cpuidle_devices);
@@ -122,53 +117,32 @@ static inline int cpuidle_get_last_residency(struct cpuidle_device *dev)
  ****************************/
 
 struct cpuidle_driver {
-        const char              *name;
+        char                    name[CPUIDLE_NAME_LEN];
         struct module           *owner;
-        int                     refcnt;
-
-        unsigned int            power_specified:1;
-        /* set to 1 to use the core cpuidle time keeping (for all states). */
-        unsigned int            en_core_tk_irqen:1;
-        struct cpuidle_state    states[CPUIDLE_STATE_MAX];
-        int                     state_count;
-        int                     safe_state_index;
 };
 
 #ifdef CONFIG_CPU_IDLE
 extern void disable_cpuidle(void);
 extern int cpuidle_idle_call(void);
+
 extern int cpuidle_register_driver(struct cpuidle_driver *drv);
-extern struct cpuidle_driver *cpuidle_get_driver(void);
-extern struct cpuidle_driver *cpuidle_driver_ref(void);
-extern void cpuidle_driver_unref(void);
+struct cpuidle_driver *cpuidle_get_driver(void);
 extern void cpuidle_unregister_driver(struct cpuidle_driver *drv);
 extern int cpuidle_register_device(struct cpuidle_device *dev);
 extern void cpuidle_unregister_device(struct cpuidle_device *dev);
 
 extern void cpuidle_pause_and_lock(void);
 extern void cpuidle_resume_and_unlock(void);
-extern void cpuidle_pause(void);
-extern void cpuidle_resume(void);
 extern int cpuidle_enable_device(struct cpuidle_device *dev);
 extern void cpuidle_disable_device(struct cpuidle_device *dev);
-extern int cpuidle_wrap_enter(struct cpuidle_device *dev,
-                                struct cpuidle_driver *drv, int index,
-                                int (*enter)(struct cpuidle_device *dev,
-                                        struct cpuidle_driver *drv, int index));
-extern int cpuidle_play_dead(void);
-
-extern struct cpuidle_driver *cpuidle_get_cpu_driver(struct cpuidle_device *dev);
-extern int cpuidle_register_cpu_driver(struct cpuidle_driver *drv, int cpu);
-extern void cpuidle_unregister_cpu_driver(struct cpuidle_driver *drv, int cpu);
 
 #else
 static inline void disable_cpuidle(void) { }
 static inline int cpuidle_idle_call(void) { return -ENODEV; }
+
 static inline int cpuidle_register_driver(struct cpuidle_driver *drv)
 {return -ENODEV; }
 static inline struct cpuidle_driver *cpuidle_get_driver(void) {return NULL; }
-static inline struct cpuidle_driver *cpuidle_driver_ref(void) {return NULL; }
-static inline void cpuidle_driver_unref(void) {}
 static inline void cpuidle_unregister_driver(struct cpuidle_driver *drv) { }
 static inline int cpuidle_register_device(struct cpuidle_device *dev)
 {return -ENODEV; }
@@ -176,25 +150,10 @@ static inline void cpuidle_unregister_device(struct cpuidle_device *dev) { }
 
 static inline void cpuidle_pause_and_lock(void) { }
 static inline void cpuidle_resume_and_unlock(void) { }
-static inline void cpuidle_pause(void) { }
-static inline void cpuidle_resume(void) { }
 static inline int cpuidle_enable_device(struct cpuidle_device *dev)
 {return -ENODEV; }
 static inline void cpuidle_disable_device(struct cpuidle_device *dev) { }
-static inline int cpuidle_wrap_enter(struct cpuidle_device *dev,
-                                struct cpuidle_driver *drv, int index,
-                                int (*enter)(struct cpuidle_device *dev,
-                                        struct cpuidle_driver *drv, int index))
-{ return -ENODEV; }
-static inline int cpuidle_play_dead(void) {return -ENODEV; }
-#endif
 
-#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
-void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, atomic_t *a);
-#else
-static inline void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, atomic_t *a)
-{
-}
 #endif
 
 /******************************
@@ -206,14 +165,11 @@ struct cpuidle_governor {
         struct list_head        governor_list;
         unsigned int            rating;
 
-        int  (*enable)          (struct cpuidle_driver *drv,
-                                        struct cpuidle_device *dev);
-        void (*disable)         (struct cpuidle_driver *drv,
-                                        struct cpuidle_device *dev);
+        int  (*enable)          (struct cpuidle_device *dev);
+        void (*disable)         (struct cpuidle_device *dev);
 
-        int  (*select)          (struct cpuidle_driver *drv,
-                                        struct cpuidle_device *dev);
-        void (*reflect)         (struct cpuidle_device *dev, int index);
+        int  (*select)          (struct cpuidle_device *dev);
+        void (*reflect)         (struct cpuidle_device *dev);
 
         struct module           *owner;
 };