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

Merge tag 'linux-cpupower-6.12-rc1' of... 

Merge tag 'linux-cpupower-6.12-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shuah/linux

Merge a cpupower utility update for 6.12 from Shuah Khan:

"This cpupower update for Linux 6.12-rc1 consists of an enhancement
 to cpuidle tool to display the residency value of cpuidle states.
 This addition provides a clearer and more detailed view of idle
 state information when using cpuidle-info."

* tag 'linux-cpupower-6.12-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shuah/linux:
  tools/cpupower: display residency value in idle-info
parents 387ce37e 76fb981a

tools/power/cpupower/lib/cpuidle.c

+8 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ enum idlestate_value { 
	IDLESTATE_USAGE,

	IDLESTATE_POWER,

	IDLESTATE_LATENCY,

	IDLESTATE_RESIDENCY,

	IDLESTATE_TIME,

	IDLESTATE_DISABLE,

	MAX_IDLESTATE_VALUE_FILES
@@ -125,6 +126,7 @@ static const char *idlestate_value_files[MAX_IDLESTATE_VALUE_FILES] = { 
	[IDLESTATE_USAGE] = "usage",

	[IDLESTATE_POWER] = "power",

	[IDLESTATE_LATENCY] = "latency",

	[IDLESTATE_RESIDENCY] = "residency",

	[IDLESTATE_TIME]  = "time",

	[IDLESTATE_DISABLE]  = "disable",

};
@@ -254,6 +256,12 @@ unsigned long cpuidle_state_latency(unsigned int cpu, 
	return cpuidle_state_get_one_value(cpu, idlestate, IDLESTATE_LATENCY);

}



unsigned long cpuidle_state_residency(unsigned int cpu,

					  unsigned int idlestate)

{

	return cpuidle_state_get_one_value(cpu, idlestate, IDLESTATE_RESIDENCY);

}



unsigned long cpuidle_state_usage(unsigned int cpu,

					unsigned int idlestate)

{

tools/power/cpupower/lib/cpuidle.h

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ int cpuidle_state_disable(unsigned int cpu, unsigned int idlestate, 
				   unsigned int disable);

unsigned long cpuidle_state_latency(unsigned int cpu,

						unsigned int idlestate);

unsigned long cpuidle_state_residency(unsigned int cpu,

						unsigned int idlestate);

unsigned long cpuidle_state_usage(unsigned int cpu,

					unsigned int idlestate);

unsigned long long cpuidle_state_time(unsigned int cpu,

tools/power/cpupower/utils/cpuidle-info.c

+4 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ static void cpuidle_cpu_output(unsigned int cpu, int verbose) 


		printf(_("Latency: %lu\n"),

		       cpuidle_state_latency(cpu, idlestate));

		printf(_("Residency: %lu\n"),

		       cpuidle_state_residency(cpu, idlestate));

		printf(_("Usage: %lu\n"),

		       cpuidle_state_usage(cpu, idlestate));

		printf(_("Duration: %llu\n"),
@@ -115,6 +117,8 @@ static void proc_cpuidle_cpu_output(unsigned int cpu) 
		printf(_("promotion[--] demotion[--] "));

		printf(_("latency[%03lu] "),

		       cpuidle_state_latency(cpu, cstate));

		printf(_("residency[%05lu] "),

		       cpuidle_state_residency(cpu, cstate));

		printf(_("usage[%08lu] "),

		       cpuidle_state_usage(cpu, cstate));

		printf(_("duration[%020Lu] \n"),