Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed819e3b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-qos' 

* pm-qos:
  PM / QoS: unconditionally build the feature
  PM / QoS: Simplify PM QoS expansion/merge
parents 48ed0003 a9b542ee

include/linux/pm_qos.h

+10 −45
Original line number Diff line number Diff line
@@ -9,12 +9,16 @@ 
#include <linux/miscdevice.h>

#include <linux/device.h>



#define PM_QOS_RESERVED 0

#define PM_QOS_CPU_DMA_LATENCY 1

#define PM_QOS_NETWORK_LATENCY 2

#define PM_QOS_NETWORK_THROUGHPUT 3

enum {

	PM_QOS_RESERVED = 0,

	PM_QOS_CPU_DMA_LATENCY,

	PM_QOS_NETWORK_LATENCY,

	PM_QOS_NETWORK_THROUGHPUT,



	/* insert new class ID */

	PM_QOS_NUM_CLASSES,

};



#define PM_QOS_NUM_CLASSES 4

#define PM_QOS_DEFAULT_VALUE -1



#define PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE	(2000 * USEC_PER_SEC)
@@ -63,7 +67,6 @@ static inline int dev_pm_qos_request_active(struct dev_pm_qos_request *req) 
	return req->dev != 0;

}



#ifdef CONFIG_PM

int pm_qos_update_target(struct pm_qos_constraints *c, struct plist_node *node,

			 enum pm_qos_req_action action, int value);

void pm_qos_add_request(struct pm_qos_request *req, int pm_qos_class,
@@ -78,6 +81,7 @@ int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier); 
int pm_qos_request_active(struct pm_qos_request *req);

s32 pm_qos_read_value(struct pm_qos_constraints *c);



#ifdef CONFIG_PM

s32 __dev_pm_qos_read_value(struct device *dev);

s32 dev_pm_qos_read_value(struct device *dev);

int dev_pm_qos_add_request(struct device *dev, struct dev_pm_qos_request *req,
@@ -95,45 +99,6 @@ void dev_pm_qos_constraints_destroy(struct device *dev); 
int dev_pm_qos_add_ancestor_request(struct device *dev,

				    struct dev_pm_qos_request *req, s32 value);

#else

static inline int pm_qos_update_target(struct pm_qos_constraints *c,

				       struct plist_node *node,

				       enum pm_qos_req_action action,

				       int value)

			{ return 0; }

static inline void pm_qos_add_request(struct pm_qos_request *req,

				      int pm_qos_class, s32 value)

			{ return; }

static inline void pm_qos_update_request(struct pm_qos_request *req,

					 s32 new_value)

			{ return; }

static inline void pm_qos_remove_request(struct pm_qos_request *req)

			{ return; }



static inline int pm_qos_request(int pm_qos_class)

{

	switch (pm_qos_class) {

	case PM_QOS_CPU_DMA_LATENCY:

		return PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;

	case PM_QOS_NETWORK_LATENCY:

		return PM_QOS_NETWORK_LAT_DEFAULT_VALUE;

	case PM_QOS_NETWORK_THROUGHPUT:

		return PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE;

	default:

		return PM_QOS_DEFAULT_VALUE;

	}

}



static inline int pm_qos_add_notifier(int pm_qos_class,

				      struct notifier_block *notifier)

			{ return 0; }

static inline int pm_qos_remove_notifier(int pm_qos_class,

					 struct notifier_block *notifier)

			{ return 0; }

static inline int pm_qos_request_active(struct pm_qos_request *req)

			{ return 0; }

static inline s32 pm_qos_read_value(struct pm_qos_constraints *c)

			{ return 0; }



static inline s32 __dev_pm_qos_read_value(struct device *dev)

			{ return 0; }

static inline s32 dev_pm_qos_read_value(struct device *dev)

kernel/power/Makefile

+2 −1
Original line number Diff line number Diff line 


ccflags-$(CONFIG_PM_DEBUG)	:= -DDEBUG



obj-$(CONFIG_PM)		+= main.o qos.o

obj-y				+= qos.o

obj-$(CONFIG_PM)		+= main.o

obj-$(CONFIG_VT_CONSOLE_SLEEP)	+= console.o

obj-$(CONFIG_FREEZER)		+= process.o

obj-$(CONFIG_SUSPEND)		+= suspend.o

kernel/power/qos.c

+10 −13
Original line number Diff line number Diff line
@@ -469,21 +469,18 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf, 
static int __init pm_qos_power_init(void)

{

	int ret = 0;

	int i;



	ret = register_pm_qos_misc(&cpu_dma_pm_qos);

	BUILD_BUG_ON(ARRAY_SIZE(pm_qos_array) != PM_QOS_NUM_CLASSES);



	for (i = 1; i < PM_QOS_NUM_CLASSES; i++) {

		ret = register_pm_qos_misc(pm_qos_array[i]);

		if (ret < 0) {

		printk(KERN_ERR "pm_qos_param: cpu_dma_latency setup failed\n");

			printk(KERN_ERR "pm_qos_param: %s setup failed\n",

			       pm_qos_array[i]->name);

			return ret;

		}

	ret = register_pm_qos_misc(&network_lat_pm_qos);

	if (ret < 0) {

		printk(KERN_ERR "pm_qos_param: network_latency setup failed\n");

		return ret;

	}

	ret = register_pm_qos_misc(&network_throughput_pm_qos);

	if (ret < 0)

		printk(KERN_ERR

			"pm_qos_param: network_throughput setup failed\n");



	return ret;

}