Commit 2acabc86 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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

Pull cpupower utility updates for 7.1-rc1 from Shuah Khan:

"- Fixes errors in cpupower-frequency-info short option names
   to its manpage.
 - Fixes cpupower-idle-info perf option name to its manpage.
 - Adds boost and epp options to cpupower-frequency-info to its
   manpage.
 - Adds description for perf-bias option to cpupower-info to its
   manpage.
 - Removes unnecessary extern declarations from getopt.h in arguments
   parsing functions in cpufreq-set, cpuidle-info, cpuidle-set,
   cpupower-info, and cpupower-set utilities. These functions are
   defined getopt.h file."

* tag 'linux-cpupower-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux:
  cpupower: remove extern declarations in cmd functions
  cpupower-info.1: describe the --perf-bias option
  cpupower-frequency-info.1: document --boost and --epp options
  cpupower-frequency-info.1: use the proper name of the --perf option
  cpupower-idle-info.1: fix short option names
parents 591cd656 2fd3b83c

tools/power/cpupower/man/cpupower-frequency-info.1

+7 −1
Original line number Diff line number Diff line
@@ -32,6 +32,12 @@ Gets the currently used cpufreq policy. 
\fB\-g\fR \fB\-\-governors\fR

Determines available cpufreq governors.

.TP  

\fB\-b\fR \fB\-\-boost\fR

Gets the current boost state support.

.TP

\fB\-z\fR \fB\-\-epp\fR

Gets the current EPP (energy performance preference).

.TP

\fB\-r\fR \fB\-\-related\-cpus\fR

Determines which CPUs run at the same hardware frequency.

.TP
@@ -53,7 +59,7 @@ human\-readable output for the \-f, \-w, \-s and \-y parameters. 
\fB\-n\fR \fB\-\-no-rounding\fR

Output frequencies and latencies without rounding off values.

.TP  

\fB\-c\fR \fB\-\-perf\fR

\fB\-c\fR \fB\-\-performance\fR

Get performances and frequencies capabilities of CPPC, by reading it from hardware (only available on the hardware with CPPC).

.TP

.SH "REMARKS"

tools/power/cpupower/man/cpupower-idle-info.1

+2 −2
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ A tool which prints out per cpu idle information helpful to developers and inter 
.SH "OPTIONS"

.LP

.TP

\fB\-f\fR \fB\-\-silent\fR

\fB\-s\fR \fB\-\-silent\fR

Only print a summary of all available C-states in the system.

.TP

\fB\-e\fR \fB\-\-proc\fR

\fB\-o\fR \fB\-\-proc\fR

deprecated.

Prints out idle information in old /proc/acpi/processor/*/power format. This

interface has been removed from the kernel for quite some time, do not let

tools/power/cpupower/man/cpupower-info.1

+8 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
cpupower\-info \- Shows processor power related kernel or hardware configurations

.SH SYNOPSIS

.ft B

.B cpupower info [ \-b ]

.B cpupower info [\fIoptions\fP]



.SH DESCRIPTION

\fBcpupower info \fP shows kernel configurations or processor hardware
@@ -13,6 +13,13 @@ Some options are platform wide, some affect single cores. By default values 
of core zero are displayed only. cpupower --cpu all cpuinfo will show the

settings of all cores, see cpupower(1) how to choose specific cores.



.SH "OPTIONS"

.LP

.TP

\fB\-b\fR \fB\-\-perf-bias\fR

Gets the current performance bias value.

.TP



.SH "SEE ALSO"

Options are described in detail in:

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

+0 −2
Original line number Diff line number Diff line
@@ -542,8 +542,6 @@ static struct option info_opts[] = { 


int cmd_freq_info(int argc, char **argv)

{

	extern char *optarg;

	extern int optind, opterr, optopt;

	int ret = 0, cont = 1;

	unsigned int cpu = 0;

	unsigned int human = 0;

tools/power/cpupower/utils/cpufreq-set.c

+0 −2
Original line number Diff line number Diff line
@@ -195,8 +195,6 @@ static int do_one_cpu(unsigned int cpu, struct cpufreq_policy *new_pol, 


int cmd_freq_set(int argc, char **argv)

{

	extern char *optarg;

	extern int optind, opterr, optopt;

	int ret = 0, cont = 1;

	int double_parm = 0, related = 0, policychange = 0;

	unsigned long freq = 0;