hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cpupower: Restore format of frequency-info limit 

The intel_pstate kselftest expects that the output of
`cpupower frequency-info -l | tail -1 | awk ' { print $1 } '`
to get frequency limits.  This does not work after the following two
changes.

 - 562e5f1a3: rework the "cpupower frequency-info" command
   (Jacob Tanenbaum) removed parsable limit output
 - ce512b840: Do not analyse offlined cpus
   (Thomas Renninger) added newline to break limit parsing more

This change preserves human readable output if wanted as well as
parsable output for scripts/tests.

Cc: Thomas Renninger <trenn@suse.com>
Cc: "Shreyas B. Prabhu" <shreyas@linux.vnet.ibm.com>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: linux-pm@vger.kernel.org
Signed-off-by: Stafford Horne <shorne@gmail.com>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
This commit is contained in:
Stafford Horne 2017-01-12 00:16:04 +09:00 committed by Shuah Khan
parent 99c21f6d00
commit 4da39ceb26
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/power/cpupower/utils/cpufreq-info.c
View File

@ -285,20 +285,24 @@ static int get_freq_hardware(unsigned int cpu, unsigned int human)
/* --hwlimits / -l */ /* --hwlimits / -l */
static int get_hardware_limits(unsigned int cpu) static int get_hardware_limits(unsigned int cpu, unsigned int human)
{ {
unsigned long min, max; unsigned long min, max;
printf(_(" hardware limits: "));
if (cpufreq_get_hardware_limits(cpu, &min, &max)) { if (cpufreq_get_hardware_limits(cpu, &min, &max)) {
printf(_("Not Available\n")); printf(_("Not Available\n"));
return -EINVAL; return -EINVAL;
} }
print_speed(min); if (human) {
printf(" - "); printf(_(" hardware limits: "));
print_speed(max); print_speed(min);
printf("\n"); printf(" - ");
print_speed(max);
printf("\n");
} else {
printf("%lu %lu\n", min, max);
}
return 0; return 0;
} }
@ -456,7 +460,7 @@ static void debug_output_one(unsigned int cpu)
get_related_cpus(cpu); get_related_cpus(cpu);
get_affected_cpus(cpu); get_affected_cpus(cpu);
get_latency(cpu, 1); get_latency(cpu, 1);
get_hardware_limits(cpu); get_hardware_limits(cpu, 1);
freqs = cpufreq_get_available_frequencies(cpu); freqs = cpufreq_get_available_frequencies(cpu);
if (freqs) { if (freqs) {
@ -622,7 +626,7 @@ int cmd_freq_info(int argc, char **argv)
ret = get_driver(cpu); ret = get_driver(cpu);
break; break;
case 'l': case 'l':
ret = get_hardware_limits(cpu); ret = get_hardware_limits(cpu, human);
break; break;
case 'w': case 'w':
ret = get_freq_hardware(cpu, human); ret = get_freq_hardware(cpu, human);
@ -639,7 +643,6 @@ int cmd_freq_info(int argc, char **argv)
} }
if (ret) if (ret)
return ret; return ret;
printf("\n");
} }
return ret; return ret;
} }