These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / linux / pm_domain.h

diff --git a/kernel/include/linux/pm_domain.h b/kernel/include/linux/pm_domain.h
index 681ccb0..ba4ced3 100644 (file)
--- a/kernel/include/linux/pm_domain.h
+++ b/kernel/include/linux/pm_domain.h
@@ -15,16 +15,12 @@
 #include <linux/err.h>
 #include <linux/of.h>
 #include <linux/notifier.h>
-#include <linux/cpuidle.h>
 
 /* Defines used for the flags field in the struct generic_pm_domain */
 #define GENPD_FLAG_PM_CLK      (1U << 0) /* PM domain uses PM clk */
 
 enum gpd_status {
        GPD_STATE_ACTIVE = 0,   /* PM domain is active */
-       GPD_STATE_WAIT_MASTER,  /* PM domain's master is being waited for */
-       GPD_STATE_BUSY,         /* Something is happening to the PM domain */
-       GPD_STATE_REPEAT,       /* Power off in progress, to be repeated */
        GPD_STATE_POWER_OFF,    /* PM domain is off */
 };
 
@@ -41,11 +37,6 @@ struct gpd_dev_ops {
        bool (*active_wakeup)(struct device *dev);
 };
 
-struct gpd_cpuidle_data {
-       unsigned int saved_exit_latency;
-       struct cpuidle_state *idle_state;
-};
-
 struct generic_pm_domain {
        struct dev_pm_domain domain;    /* PM domain operations */
        struct list_head gpd_list_node; /* Node in the global PM domains list */
@@ -56,12 +47,8 @@ struct generic_pm_domain {
        struct dev_power_governor *gov;
        struct work_struct power_off_work;
        const char *name;
-       unsigned int in_progress;       /* Number of devices being suspended now */
        atomic_t sd_count;      /* Number of subdomains with power "on" */
        enum gpd_status status; /* Current state of the domain */
-       wait_queue_head_t status_wait_queue;
-       struct task_struct *poweroff_task;      /* Powering off task */
-       unsigned int resume_count;      /* Number of devices being resumed */
        unsigned int device_count;      /* Number of devices */
        unsigned int suspended_count;   /* System suspend device counter */
        unsigned int prepared_count;    /* Suspend counter of prepared devices */
@@ -74,7 +61,6 @@ struct generic_pm_domain {
        s64 max_off_time_ns;    /* Maximum allowed "suspended" time. */
        bool max_off_time_changed;
        bool cached_power_down_ok;
-       struct gpd_cpuidle_data *cpuidle_data;
        int (*attach_dev)(struct generic_pm_domain *domain,
                          struct device *dev);
        void (*detach_dev)(struct generic_pm_domain *domain,
@@ -95,10 +81,8 @@ struct gpd_link {
 };
 
 struct gpd_timing_data {
-       s64 stop_latency_ns;
-       s64 start_latency_ns;
-       s64 save_state_latency_ns;
-       s64 restore_state_latency_ns;
+       s64 suspend_latency_ns;
+       s64 resume_latency_ns;
        s64 effective_constraint_ns;
        bool constraint_changed;
        bool cached_stop_ok;
@@ -113,7 +97,6 @@ struct generic_pm_domain_data {
        struct pm_domain_data base;
        struct gpd_timing_data td;
        struct notifier_block nb;
-       int need_restore;
 };
 
 #ifdef CONFIG_PM_GENERIC_DOMAINS
@@ -132,29 +115,15 @@ extern int __pm_genpd_add_device(struct generic_pm_domain *genpd,
                                 struct device *dev,
                                 struct gpd_timing_data *td);
 
-extern int __pm_genpd_name_add_device(const char *domain_name,
-                                     struct device *dev,
-                                     struct gpd_timing_data *td);
-
 extern int pm_genpd_remove_device(struct generic_pm_domain *genpd,
                                  struct device *dev);
 extern int pm_genpd_add_subdomain(struct generic_pm_domain *genpd,
                                  struct generic_pm_domain *new_subdomain);
-extern int pm_genpd_add_subdomain_names(const char *master_name,
-                                       const char *subdomain_name);
 extern int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,
                                     struct generic_pm_domain *target);
-extern int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state);
-extern int pm_genpd_name_attach_cpuidle(const char *name, int state);
-extern int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd);
-extern int pm_genpd_name_detach_cpuidle(const char *name);
 extern void pm_genpd_init(struct generic_pm_domain *genpd,
                          struct dev_power_governor *gov, bool is_off);
 
-extern int pm_genpd_poweron(struct generic_pm_domain *genpd);
-extern int pm_genpd_name_poweron(const char *domain_name);
-extern void pm_genpd_poweroff_unused(void);
-
 extern struct dev_power_governor simple_qos_governor;
 extern struct dev_power_governor pm_domain_always_on_gov;
 #else
@@ -173,12 +142,6 @@ static inline int __pm_genpd_add_device(struct generic_pm_domain *genpd,
 {
        return -ENOSYS;
 }
-static inline int __pm_genpd_name_add_device(const char *domain_name,
-                                            struct device *dev,
-                                            struct gpd_timing_data *td)
-{
-       return -ENOSYS;
-}
 static inline int pm_genpd_remove_device(struct generic_pm_domain *genpd,
                                         struct device *dev)
 {
@@ -189,47 +152,15 @@ static inline int pm_genpd_add_subdomain(struct generic_pm_domain *genpd,
 {
        return -ENOSYS;
 }
-static inline int pm_genpd_add_subdomain_names(const char *master_name,
-                                              const char *subdomain_name)
-{
-       return -ENOSYS;
-}
 static inline int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,
                                            struct generic_pm_domain *target)
 {
        return -ENOSYS;
 }
-static inline int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int st)
-{
-       return -ENOSYS;
-}
-static inline int pm_genpd_name_attach_cpuidle(const char *name, int state)
-{
-       return -ENOSYS;
-}
-static inline int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
-{
-       return -ENOSYS;
-}
-static inline int pm_genpd_name_detach_cpuidle(const char *name)
-{
-       return -ENOSYS;
-}
 static inline void pm_genpd_init(struct generic_pm_domain *genpd,
                                 struct dev_power_governor *gov, bool is_off)
 {
 }
-static inline int pm_genpd_poweron(struct generic_pm_domain *genpd)
-{
-       return -ENOSYS;
-}
-static inline int pm_genpd_name_poweron(const char *domain_name)
-{
-       return -ENOSYS;
-}
-static inline void pm_genpd_poweroff_unused(void) {}
-#define simple_qos_governor NULL
-#define pm_domain_always_on_gov NULL
 #endif
 
 static inline int pm_genpd_add_device(struct generic_pm_domain *genpd,
@@ -238,12 +169,6 @@ static inline int pm_genpd_add_device(struct generic_pm_domain *genpd,
        return __pm_genpd_add_device(genpd, dev, NULL);
 }
 
-static inline int pm_genpd_name_add_device(const char *domain_name,
-                                          struct device *dev)
-{
-       return __pm_genpd_name_add_device(domain_name, dev, NULL);
-}
-
 #ifdef CONFIG_PM_GENERIC_DOMAINS_SLEEP
 extern void pm_genpd_syscore_poweroff(struct device *dev);
 extern void pm_genpd_syscore_poweron(struct device *dev);