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

Commit d031e1de authored by Alex Frid's avatar Alex Frid Committed by Rafael J. Wysocki
Browse files

PM / QoS: Simplify PM QoS expansion/merge 



 - Replace class ID #define with enumeration
 - Loop through PM QoS objects during initialization (rather than
   initializing them one-by-one)

Signed-off-by: default avatarAlex Frid <afrid@nvidia.com>
Reviewed-by: default avatarAntti Miettinen <amiettinen@nvidia.com>
Reviewed-by: default avatarDiwakar Tundlam <dtundlam@nvidia.com>
Reviewed-by: default avatarScott Williams <scwilliams@nvidia.com>
Reviewed-by: default avatarYu-Huan Hsu <yhsu@nvidia.com>
Acked-by: default avatarmarkgross <markgross@thegnar.org>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 0496c8ae

include/linux/pm_qos.h

+9 −5
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)

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;

}