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

Commit dc7fd275 authored by ShuoX Liu's avatar ShuoX Liu Committed by Rafael J. Wysocki
Browse files

cpuidle: move field disable from per-driver to per-cpu 



Andrew J.Schorr raises a question.  When he changes the disable setting on
a single CPU, it affects all the other CPUs.  Basically, currently, the
disable field is per-driver instead of per-cpu.  All the C states of the
same driver are shared by all CPU in the same machine.

The patch changes the `disable' field to per-cpu, so we could set this
separately for each cpu.

Signed-off-by: default avatarShuoX Liu <shuox.liu@intel.com>
Reported-by: default avatarAndrew J.Schorr <aschorr@telemetry-investments.com>
Reviewed-by: default avatarYanmin Zhang <yanmin_zhang@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 6887a413

drivers/cpuidle/cpuidle.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -265,7 +265,6 @@ static void poll_idle_init(struct cpuidle_driver *drv) 
	state->power_usage = -1;

	state->power_usage = -1;

	state->flags = 0;

	state->flags = 0;

	state->enter = poll_idle;

	state->enter = poll_idle;

	state->disable = 0;

}

}

#else

#else

static void poll_idle_init(struct cpuidle_driver *drv) {}

static void poll_idle_init(struct cpuidle_driver *drv) {}

drivers/cpuidle/governors/menu.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -281,7 +281,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev) 
	 * unless the timer is happening really really soon.

	 * unless the timer is happening really really soon.

	 */

	 */

	if (data->expected_us > 5 &&

	if (data->expected_us > 5 &&

		drv->states[CPUIDLE_DRIVER_STATE_START].disable == 0)

		dev->states_usage[CPUIDLE_DRIVER_STATE_START].disable == 0)

		data->last_state_idx = CPUIDLE_DRIVER_STATE_START;

		data->last_state_idx = CPUIDLE_DRIVER_STATE_START;





	/*

	/*
@@ -290,8 +290,9 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev) 
	 */

	 */

	for (i = CPUIDLE_DRIVER_STATE_START; i < drv->state_count; i++) {

	for (i = CPUIDLE_DRIVER_STATE_START; i < drv->state_count; i++) {

		struct cpuidle_state *s = &drv->states[i];

		struct cpuidle_state *s = &drv->states[i];

		struct cpuidle_state_usage *su = &dev->states_usage[i];





		if (s->disable)

		if (su->disable)

			continue;

			continue;

		if (s->target_residency > data->predicted_us)

		if (s->target_residency > data->predicted_us)

			continue;

			continue;

drivers/cpuidle/sysfs.c

+12 −9
Original line number Original line Diff line number Diff line
@@ -217,7 +217,8 @@ struct cpuidle_state_attr { 
	struct attribute attr;

	struct attribute attr;

	ssize_t (*show)(struct cpuidle_state *, \

	ssize_t (*show)(struct cpuidle_state *, \

					struct cpuidle_state_usage *, char *);

					struct cpuidle_state_usage *, char *);

	ssize_t (*store)(struct cpuidle_state *, const char *, size_t);

	ssize_t (*store)(struct cpuidle_state *, \

			struct cpuidle_state_usage *, const char *, size_t);

};

};





#define define_one_state_ro(_name, show) \

#define define_one_state_ro(_name, show) \
@@ -233,21 +234,22 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, \ 
	return sprintf(buf, "%u\n", state->_name);\

	return sprintf(buf, "%u\n", state->_name);\

}

}





#define define_store_state_function(_name) \

#define define_store_state_ull_function(_name) \

static ssize_t store_state_##_name(struct cpuidle_state *state, \

static ssize_t store_state_##_name(struct cpuidle_state *state, \

		struct cpuidle_state_usage *state_usage, \

		const char *buf, size_t size) \

		const char *buf, size_t size) \

{ \

{ \

	long value; \

	unsigned long long value; \

	int err; \

	int err; \

	if (!capable(CAP_SYS_ADMIN)) \

	if (!capable(CAP_SYS_ADMIN)) \

		return -EPERM; \

		return -EPERM; \

	err = kstrtol(buf, 0, &value); \

	err = kstrtoull(buf, 0, &value); \

	if (err) \

	if (err) \

		return err; \

		return err; \

	if (value) \

	if (value) \

		state->disable = 1; \

		state_usage->_name = 1; \

	else \

	else \

		state->disable = 0; \

		state_usage->_name = 0; \

	return size; \

	return size; \

}

}
@@ -273,8 +275,8 @@ define_show_state_ull_function(usage) 
define_show_state_ull_function(time)

define_show_state_ull_function(time)

define_show_state_str_function(name)

define_show_state_str_function(name)

define_show_state_str_function(desc)

define_show_state_str_function(desc)

define_show_state_function(disable)

define_show_state_ull_function(disable)

define_store_state_function(disable)

define_store_state_ull_function(disable)





define_one_state_ro(name, show_state_name);

define_one_state_ro(name, show_state_name);

define_one_state_ro(desc, show_state_desc);

define_one_state_ro(desc, show_state_desc);
@@ -318,10 +320,11 @@ static ssize_t cpuidle_state_store(struct kobject *kobj, 
{

{

	int ret = -EIO;

	int ret = -EIO;

	struct cpuidle_state *state = kobj_to_state(kobj);

	struct cpuidle_state *state = kobj_to_state(kobj);

	struct cpuidle_state_usage *state_usage = kobj_to_state_usage(kobj);

	struct cpuidle_state_attr *cattr = attr_to_stateattr(attr);

	struct cpuidle_state_attr *cattr = attr_to_stateattr(attr);





	if (cattr->store)

	if (cattr->store)

		ret = cattr->store(state, buf, size);

		ret = cattr->store(state, state_usage, buf, size);





	return ret;

	return ret;

}

}

include/linux/cpuidle.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ struct cpuidle_driver; 
struct cpuidle_state_usage {

struct cpuidle_state_usage {

	void		*driver_data;

	void		*driver_data;





	unsigned long long	disable;

	unsigned long long	usage;

	unsigned long long	usage;

	unsigned long long	time; /* in US */

	unsigned long long	time; /* in US */

};

};
@@ -46,7 +47,6 @@ struct cpuidle_state { 
	unsigned int	exit_latency; /* in US */

	unsigned int	exit_latency; /* in US */

	int		power_usage; /* in mW */

	int		power_usage; /* in mW */

	unsigned int	target_residency; /* in US */

	unsigned int	target_residency; /* in US */

	unsigned int    disable;





	int (*enter)	(struct cpuidle_device *dev,

	int (*enter)	(struct cpuidle_device *dev,

			struct cpuidle_driver *drv,

			struct cpuidle_driver *drv,