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

Commit 4202735e authored by Deepthi Dharwar's avatar Deepthi Dharwar Committed by Len Brown
Browse files

cpuidle: Split cpuidle_state structure and move per-cpu statistics fields 



This is the first step towards global registration of cpuidle
states. The statistics used primarily by the governor are per-cpu
and have to be split from rest of the fields inside cpuidle_state,
which would be made global i.e. single copy. The driver_data field
is also per-cpu and moved.

Signed-off-by: default avatarDeepthi Dharwar <deepthi@linux.vnet.ibm.com>
Signed-off-by: default avatarTrinabh Gupta <g.trinabh@gmail.com>
Tested-by: default avatarJean Pihet <j-pihet@ti.com>
Reviewed-by: default avatarKevin Hilman <khilman@ti.com>
Acked-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Acked-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent b25edc42

arch/arm/mach-davinci/cpuidle.c

+3 −2
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ static struct davinci_ops davinci_states[DAVINCI_CPUIDLE_MAX_STATES] = { 
static int davinci_enter_idle(struct cpuidle_device *dev,

						int index)

{

	struct davinci_ops *ops = cpuidle_get_statedata(&dev->states[index]);

	struct cpuidle_state_usage *state_usage = &dev->states_usage[index];

	struct davinci_ops *ops = cpuidle_get_statedata(state_usage);

	struct timeval before, after;

	int idle_time;
@@ -142,7 +143,7 @@ static int __init davinci_cpuidle_probe(struct platform_device *pdev) 
	strcpy(device->states[1].desc, "WFI and DDR Self Refresh");

	if (pdata->ddr2_pdown)

		davinci_states[1].flags |= DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN;

	cpuidle_set_statedata(&device->states[1], &davinci_states[1]);

	cpuidle_set_statedata(&device->states_usage[1], &davinci_states[1]);



	device->state_count = DAVINCI_CPUIDLE_MAX_STATES;

arch/arm/mach-omap2/cpuidle34xx.c

+7 −6
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static int omap3_enter_idle(struct cpuidle_device *dev, 
				int index)

{

	struct omap3_idle_statedata *cx =

			cpuidle_get_statedata(&dev->states[index]);

			cpuidle_get_statedata(&dev->states_usage[index]);

	struct timespec ts_preidle, ts_postidle, ts_idle;

	u32 mpu_state = cx->mpu_state, core_state = cx->core_state;

	int idle_time;
@@ -160,8 +160,9 @@ static int omap3_enter_idle(struct cpuidle_device *dev, 
static int next_valid_state(struct cpuidle_device *dev,

				int index)

{

	struct cpuidle_state_usage *curr_usage = &dev->states_usage[index];

	struct cpuidle_state *curr = &dev->states[index];

	struct omap3_idle_statedata *cx = cpuidle_get_statedata(curr);

	struct omap3_idle_statedata *cx = cpuidle_get_statedata(curr_usage);

	u32 mpu_deepest_state = PWRDM_POWER_RET;

	u32 core_deepest_state = PWRDM_POWER_RET;

	int next_index = -1;
@@ -202,7 +203,7 @@ static int next_valid_state(struct cpuidle_device *dev, 
		 */

		idx--;

		for (; idx >= 0; idx--) {

			cx = cpuidle_get_statedata(&dev->states[idx]);

			cx = cpuidle_get_statedata(&dev->states_usage[idx]);

			if ((cx->valid) &&

			    (cx->mpu_state >= mpu_deepest_state) &&

			    (cx->core_state >= core_deepest_state)) {
@@ -231,7 +232,6 @@ static int next_valid_state(struct cpuidle_device *dev, 
static int omap3_enter_idle_bm(struct cpuidle_device *dev,

			       int index)

{

	struct cpuidle_state *state = &dev->states[index];

	int new_state_idx;

	u32 core_next_state, per_next_state = 0, per_saved_state = 0, cam_state;

	struct omap3_idle_statedata *cx;
@@ -264,7 +264,7 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev, 
	 * Prevent PER off if CORE is not in retention or off as this

	 * would disable PER wakeups completely.

	 */

	cx = cpuidle_get_statedata(state);

	cx = cpuidle_get_statedata(&dev->states_usage[index]);

	core_next_state = cx->core_state;

	per_next_state = per_saved_state = pwrdm_read_next_pwrst(per_pd);

	if ((per_next_state == PWRDM_POWER_OFF) &&
@@ -318,6 +318,7 @@ static inline struct omap3_idle_statedata *_fill_cstate( 
{

	struct omap3_idle_statedata *cx = &omap3_idle_data[idx];

	struct cpuidle_state *state = &dev->states[idx];

	struct cpuidle_state_usage *state_usage = &dev->states_usage[idx];



	state->exit_latency	= cpuidle_params_table[idx].exit_latency;

	state->target_residency	= cpuidle_params_table[idx].target_residency;
@@ -326,7 +327,7 @@ static inline struct omap3_idle_statedata *_fill_cstate( 
	cx->valid		= cpuidle_params_table[idx].valid;

	sprintf(state->name, "C%d", idx + 1);

	strncpy(state->desc, descr, CPUIDLE_DESC_LEN);

	cpuidle_set_statedata(state, cx);

	cpuidle_set_statedata(state_usage, cx);



	return cx;

}

drivers/acpi/processor_idle.c

+12 −13
Original line number Diff line number Diff line
@@ -745,14 +745,13 @@ static inline void acpi_idle_do_entry(struct acpi_processor_cx *cx) 
 *

 * This is equivalent to the HALT instruction.

 */

static int acpi_idle_enter_c1(struct cpuidle_device *dev,

				int index)

static int acpi_idle_enter_c1(struct cpuidle_device *dev, int index)

{

	ktime_t  kt1, kt2;

	s64 idle_time;

	struct acpi_processor *pr;

	struct cpuidle_state *state = &dev->states[index];

	struct acpi_processor_cx *cx = cpuidle_get_statedata(state);

	struct cpuidle_state_usage *state_usage = &dev->states_usage[index];

	struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);



	pr = __this_cpu_read(processors);

	dev->last_residency = 0;
@@ -790,12 +789,11 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev, 
 * @dev: the target CPU

 * @index: the index of suggested state

 */

static int acpi_idle_enter_simple(struct cpuidle_device *dev,

				int index)

static int acpi_idle_enter_simple(struct cpuidle_device *dev, int index)

{

	struct acpi_processor *pr;

	struct cpuidle_state *state = &dev->states[index];

	struct acpi_processor_cx *cx = cpuidle_get_statedata(state);

	struct cpuidle_state_usage *state_usage = &dev->states_usage[index];

	struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);

	ktime_t  kt1, kt2;

	s64 idle_time_ns;

	s64 idle_time;
@@ -875,12 +873,11 @@ static DEFINE_SPINLOCK(c3_lock); 
 *

 * If BM is detected, the deepest non-C3 idle state is entered instead.

 */

static int acpi_idle_enter_bm(struct cpuidle_device *dev,

				int index)

static int acpi_idle_enter_bm(struct cpuidle_device *dev, int index)

{

	struct acpi_processor *pr;

	struct cpuidle_state *state = &dev->states[index];

	struct acpi_processor_cx *cx = cpuidle_get_statedata(state);

	struct cpuidle_state_usage *state_usage = &dev->states_usage[index];

	struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);

	ktime_t  kt1, kt2;

	s64 idle_time_ns;

	s64 idle_time;
@@ -1004,6 +1001,7 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr) 
	int i, count = CPUIDLE_DRIVER_STATE_START;

	struct acpi_processor_cx *cx;

	struct cpuidle_state *state;

	struct cpuidle_state_usage *state_usage;

	struct cpuidle_device *dev = &pr->power.dev;



	if (!pr->flags.power_setup_done)
@@ -1026,6 +1024,7 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr) 
	for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) {

		cx = &pr->power.states[i];

		state = &dev->states[count];

		state_usage = &dev->states_usage[count];



		if (!cx->valid)

			continue;
@@ -1036,7 +1035,7 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr) 
		    !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))

			continue;

#endif

		cpuidle_set_statedata(state, cx);

		cpuidle_set_statedata(state_usage, cx);



		snprintf(state->name, CPUIDLE_NAME_LEN, "C%d", i);

		strncpy(state->desc, cx->desc, CPUIDLE_DESC_LEN);

drivers/cpuidle/cpuidle.c

+6 −5
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ int cpuidle_idle_call(void) 
		/* This can be moved to within driver enter routine

		 * but that results in multiple copies of same code.

		 */

		dev->states[entered_state].time +=

		dev->states_usage[entered_state].time +=

				(unsigned long long)dev->last_residency;

		dev->states[entered_state].usage++;

		dev->states_usage[entered_state].usage++;

	}



	/* give the governor an opportunity to reflect on the outcome */
@@ -186,8 +186,9 @@ static int poll_idle(struct cpuidle_device *dev, int index) 
static void poll_idle_init(struct cpuidle_device *dev)

{

	struct cpuidle_state *state = &dev->states[0];

	struct cpuidle_state_usage *state_usage = &dev->states_usage[0];



	cpuidle_set_statedata(state, NULL);

	cpuidle_set_statedata(state_usage, NULL);



	snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");

	snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
@@ -235,8 +236,8 @@ int cpuidle_enable_device(struct cpuidle_device *dev) 
		goto fail_sysfs;



	for (i = 0; i < dev->state_count; i++) {

		dev->states[i].usage = 0;

		dev->states[i].time = 0;

		dev->states_usage[i].usage = 0;

		dev->states_usage[i].time = 0;

	}

	dev->last_residency = 0;

drivers/cpuidle/sysfs.c

+13 −6
Original line number Diff line number Diff line
@@ -216,7 +216,8 @@ static struct kobj_type ktype_cpuidle = { 


struct cpuidle_state_attr {

	struct attribute attr;

	ssize_t (*show)(struct cpuidle_state *, char *);

	ssize_t (*show)(struct cpuidle_state *, \

					struct cpuidle_state_usage *, char *);

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

};
@@ -224,19 +225,22 @@ struct cpuidle_state_attr { 
static struct cpuidle_state_attr attr_##_name = __ATTR(_name, 0444, show, NULL)



#define define_show_state_function(_name) \

static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \

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

			 struct cpuidle_state_usage *state_usage, char *buf) \

{ \

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

}



#define define_show_state_ull_function(_name) \

static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \

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

			struct cpuidle_state_usage *state_usage, char *buf) \

{ \

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

	return sprintf(buf, "%llu\n", state_usage->_name);\

}



#define define_show_state_str_function(_name) \

static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \

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

			struct cpuidle_state_usage *state_usage, char *buf) \

{ \

	if (state->_name[0] == '\0')\

		return sprintf(buf, "<null>\n");\
@@ -269,16 +273,18 @@ static struct attribute *cpuidle_state_default_attrs[] = { 


#define kobj_to_state_obj(k) container_of(k, struct cpuidle_state_kobj, kobj)

#define kobj_to_state(k) (kobj_to_state_obj(k)->state)

#define kobj_to_state_usage(k) (kobj_to_state_obj(k)->state_usage)

#define attr_to_stateattr(a) container_of(a, struct cpuidle_state_attr, attr)

static ssize_t cpuidle_state_show(struct kobject * kobj,

	struct attribute * attr ,char * buf)

{

	int ret = -EIO;

	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);



	if (cattr->show)

		ret = cattr->show(state, buf);

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



	return ret;

}
@@ -323,6 +329,7 @@ int cpuidle_add_state_sysfs(struct cpuidle_device *device) 
		if (!kobj)

			goto error_state;

		kobj->state = &device->states[i];

		kobj->state_usage = &device->states_usage[i];

		init_completion(&kobj->kobj_unregister);



		ret = kobject_init_and_add(&kobj->kobj, &ktype_state_cpuidle, &device->kobj,