cpufreq: allow ordinary boolean options to be passed on the command line

I was quite surprised to find "cpufreq=off" not doing what one would
expect it to do. Fix this.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
This commit is contained in:
Jan Beulich committed 2015-11-06 15:15:32 +01:00
1 parent 6f04de6585
commit acd9bd133c
2 files changed
+16 -9

No files matched your search

+3 -2
View File
@@ -391,11 +391,12 @@ If set, force use of the performance counters for oprofile, rather than detectin
available support.
### cpufreq
> `= dom0-kernel | none | xen[,[powersave|performance|ondemand|userspace][,<maxfreq>][,[<minfreq>][,[verbose]]]]`
> `= none | {{ <boolean> | xen } [:[powersave|performance|ondemand|userspace][,<maxfreq>][,[<minfreq>][,[verbose]]]]} | dom0-kernel`
> Default: `xen`
Indicate where the responsibility for driving power states lies.
Indicate where the responsibility for driving power states lies. Note that the
choice of `dom0-kernel` is deprecated and not supported by all Dom0 kernels.
* Default governor policy is ondemand.
* `<maxfreq>` and `<minfreq>` are integers which represent max and min processor frequencies
+13 -7
View File
@@ -64,9 +64,14 @@ enum cpufreq_controller cpufreq_controller = FREQCTL_xen;
static void __init setup_cpufreq_option(char *str)
{
char *arg;
char *arg = strpbrk(str, ",:");
int choice;
if ( !strcmp(str, "dom0-kernel") )
if ( arg )
*arg++ = '\0';
choice = parse_bool(str);
if ( choice < 0 && !strcmp(str, "dom0-kernel") )
{
xen_processor_pmbits &= ~XEN_PROCESSOR_PM_PX;
cpufreq_controller = FREQCTL_dom0_kernel;
@@ -74,19 +79,20 @@ static void __init setup_cpufreq_option(char *str)
return;
}
if ( !strcmp(str, "none") )
if ( choice == 0 || !strcmp(str, "none") )
{
xen_processor_pmbits &= ~XEN_PROCESSOR_PM_PX;
cpufreq_controller = FREQCTL_none;
return;
}
if ( (arg = strpbrk(str, ",:")) != NULL )
*arg++ = '\0';
if ( !strcmp(str, "xen") )
if ( choice > 0 || !strcmp(str, "xen") )
{
xen_processor_pmbits |= XEN_PROCESSOR_PM_PX;
cpufreq_controller = FREQCTL_xen;
if ( arg && *arg )
cpufreq_cmdline_parse(arg);
}
}
custom_param("cpufreq", setup_cpufreq_option);
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.