-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'pm+acpi-3.11-rc1-more' of git://git.kernel.org/pub/scm/lin…
…ux/kernel/git/rafael/linux-pm Pull more power management and ACPI updates from Rafael Wysocki: - Fix for a recent cpufreq regression that caused WARN() to trigger overzealously in a couple of places and spam the kernel log with useless garbage as a result. From Viresh Kumar. - ACPI dock fix removing a discrepancy between the definition of acpi_dock_init(), which says that the function returns int, and its header in the header file, which says that it is a void function. The function is now defined as void too. - ACPI PM fix for failures to update device power states as needed, for example, during resume from system suspend, because the old state was deeper than the new one, but the new one is not D0. - Fix for two debug messages in the ACPI power resources code that don't have a newline at the end and make the kernel log difficult to read. From Mika Westerberg. - Two ACPI cleanups from Naresh Bhat and Haicheng Li. - cpupower updates from Thomas Renninger, including Intel Haswell support improvements and a new idle-set subcommand among other things. * tag 'pm+acpi-3.11-rc1-more' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / power: add missing newline to debug messages cpupower: Add Haswell family 0x45 specific idle monitor to show PC8,9,10 states cpupower: Haswell also supports the C-states introduced with SandyBridge cpupower: Introduce idle-set subcommand and C-state enabling/disabling cpupower: Implement disabling of cstate interface cpupower: Make idlestate usage unsigned ACPI / fan: Initialize acpi_state variable ACPI / scan: remove unused LIST_HEAD(acpi_device_list) ACPI / dock: Actually define acpi_dock_init() as void ACPI / PM: Fix corner case in acpi_bus_update_power() cpufreq: Fix serialization of frequency transitions
- Loading branch information
Showing
18 changed files
with
502 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| #include <unistd.h> | ||
| #include <stdio.h> | ||
| #include <errno.h> | ||
| #include <stdlib.h> | ||
| #include <limits.h> | ||
| #include <string.h> | ||
| #include <ctype.h> | ||
|
|
||
| #include <getopt.h> | ||
|
|
||
| #include "cpufreq.h" | ||
| #include "helpers/helpers.h" | ||
| #include "helpers/sysfs.h" | ||
|
|
||
| static struct option info_opts[] = { | ||
| { .name = "disable", .has_arg = required_argument, .flag = NULL, .val = 'd'}, | ||
| { .name = "enable", .has_arg = required_argument, .flag = NULL, .val = 'e'}, | ||
| { }, | ||
| }; | ||
|
|
||
|
|
||
| int cmd_idle_set(int argc, char **argv) | ||
| { | ||
| extern char *optarg; | ||
| extern int optind, opterr, optopt; | ||
| int ret = 0, cont = 1, param = 0, idlestate = 0; | ||
| unsigned int cpu = 0; | ||
|
|
||
| do { | ||
| ret = getopt_long(argc, argv, "d:e:", info_opts, NULL); | ||
| if (ret == -1) | ||
| break; | ||
| switch (ret) { | ||
| case '?': | ||
| param = '?'; | ||
| cont = 0; | ||
| break; | ||
| case 'd': | ||
| if (param) { | ||
| param = -1; | ||
| cont = 0; | ||
| break; | ||
| } | ||
| param = ret; | ||
| idlestate = atoi(optarg); | ||
| break; | ||
| case 'e': | ||
| if (param) { | ||
| param = -1; | ||
| cont = 0; | ||
| break; | ||
| } | ||
| param = ret; | ||
| idlestate = atoi(optarg); | ||
| break; | ||
| case -1: | ||
| cont = 0; | ||
| break; | ||
| } | ||
| } while (cont); | ||
|
|
||
| switch (param) { | ||
| case -1: | ||
| printf(_("You can't specify more than one " | ||
| "output-specific argument\n")); | ||
| exit(EXIT_FAILURE); | ||
| case '?': | ||
| printf(_("invalid or unknown argument\n")); | ||
| exit(EXIT_FAILURE); | ||
| } | ||
|
|
||
| /* Default is: set all CPUs */ | ||
| if (bitmask_isallclear(cpus_chosen)) | ||
| bitmask_setall(cpus_chosen); | ||
|
|
||
| for (cpu = bitmask_first(cpus_chosen); | ||
| cpu <= bitmask_last(cpus_chosen); cpu++) { | ||
|
|
||
| if (!bitmask_isbitset(cpus_chosen, cpu)) | ||
| continue; | ||
|
|
||
| switch (param) { | ||
|
|
||
| case 'd': | ||
| ret = sysfs_idlestate_disable(cpu, idlestate, 1); | ||
| if (ret == 0) | ||
| printf(_("Idlestate %u disabled on CPU %u\n"), idlestate, cpu); | ||
| else if (ret == -1) | ||
| printf(_("Idlestate %u not available on CPU %u\n"), | ||
| idlestate, cpu); | ||
| else if (ret == -2) | ||
| printf(_("Idlestate disabling not supported by kernel\n")); | ||
| else | ||
| printf(_("Idlestate %u not disabled on CPU %u\n"), | ||
| idlestate, cpu); | ||
| break; | ||
| case 'e': | ||
| ret = sysfs_idlestate_disable(cpu, idlestate, 0); | ||
| if (ret == 0) | ||
| printf(_("Idlestate %u enabled on CPU %u\n"), idlestate, cpu); | ||
| else if (ret == -1) | ||
| printf(_("Idlestate %u not available on CPU %u\n"), | ||
| idlestate, cpu); | ||
| else if (ret == -2) | ||
| printf(_("Idlestate enabling not supported by kernel\n")); | ||
| else | ||
| printf(_("Idlestate %u not enabled on CPU %u\n"), | ||
| idlestate, cpu); | ||
| break; | ||
| default: | ||
| /* Not reachable with proper args checking */ | ||
| printf(_("Invalid or unknown argument\n")); | ||
| exit(EXIT_FAILURE); | ||
| break; | ||
| } | ||
| } | ||
| return EXIT_SUCCESS; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.