diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pm.h | 1 | ||||
| -rw-r--r-- | include/linux/pm_qos.h | 26 | 
2 files changed, 26 insertions, 1 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 0ce6df94221..03d7bb14531 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -546,7 +546,6 @@ struct dev_pm_info {  	unsigned long		active_jiffies;  	unsigned long		suspended_jiffies;  	unsigned long		accounting_timestamp; -	struct dev_pm_qos_request *pq_req;  #endif  	struct pm_subsys_data	*subsys_data;  /* Owned by the subsystem. */  	struct dev_pm_qos	*qos; diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h index 3af7d8573c2..5a95013905c 100644 --- a/include/linux/pm_qos.h +++ b/include/linux/pm_qos.h @@ -34,6 +34,9 @@ enum pm_qos_flags_status {  #define PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE	0  #define PM_QOS_DEV_LAT_DEFAULT_VALUE		0 +#define PM_QOS_FLAG_NO_POWER_OFF	(1 << 0) +#define PM_QOS_FLAG_REMOTE_WAKEUP	(1 << 1) +  struct pm_qos_request {  	struct plist_node node;  	int pm_qos_class; @@ -86,6 +89,8 @@ struct pm_qos_flags {  struct dev_pm_qos {  	struct pm_qos_constraints latency;  	struct pm_qos_flags flags; +	struct dev_pm_qos_request *latency_req; +	struct dev_pm_qos_request *flags_req;  };  /* Action requested to pm_qos_update_target */ @@ -187,10 +192,31 @@ static inline int dev_pm_qos_add_ancestor_request(struct device *dev,  #ifdef CONFIG_PM_RUNTIME  int dev_pm_qos_expose_latency_limit(struct device *dev, s32 value);  void dev_pm_qos_hide_latency_limit(struct device *dev); +int dev_pm_qos_expose_flags(struct device *dev, s32 value); +void dev_pm_qos_hide_flags(struct device *dev); +int dev_pm_qos_update_flags(struct device *dev, s32 mask, bool set); + +static inline s32 dev_pm_qos_requested_latency(struct device *dev) +{ +	return dev->power.qos->latency_req->data.pnode.prio; +} + +static inline s32 dev_pm_qos_requested_flags(struct device *dev) +{ +	return dev->power.qos->flags_req->data.flr.flags; +}  #else  static inline int dev_pm_qos_expose_latency_limit(struct device *dev, s32 value)  			{ return 0; }  static inline void dev_pm_qos_hide_latency_limit(struct device *dev) {} +static inline int dev_pm_qos_expose_flags(struct device *dev, s32 value) +			{ return 0; } +static inline void dev_pm_qos_hide_flags(struct device *dev) {} +static inline int dev_pm_qos_update_flags(struct device *dev, s32 m, bool set) +			{ return 0; } + +static inline s32 dev_pm_qos_requested_latency(struct device *dev) { return 0; } +static inline s32 dev_pm_qos_requested_flags(struct device *dev) { return 0; }  #endif  #endif  |