History

Merge tag 'pm-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management updates from Rafael Wysocki: "These update the cpuidle poll state definition to reduce excessive energy usage related to it, add new CPU ID to the RAPL power capping driver, update the ACPI system suspend code to handle some special cases better, extend the PM core's device links code slightly, add new sysfs attribute for better suspend-to-idle diagnostics and easier hibernation handling, update power management tools and clean up cpufreq quite a bit. Specifics: - Modify the cpuidle poll state implementation to prevent CPUs from staying in the loop in there for excessive times (Rafael Wysocki). - Add Intel Cannon Lake chips support to the RAPL power capping driver (Joe Konno). - Add reference counting to the device links handling code in the PM core (Lukas Wunner). - Avoid reconfiguring GPEs on suspend-to-idle in the ACPI system suspend code (Rafael Wysocki). - Allow devices to be put into deeper low-power states via ACPI if both _SxD and _SxW are missing (Daniel Drake). - Reorganize the core ACPI suspend-to-idle wakeup code to avoid a keyboard wakeup issue on Asus UX331UA (Chris Chiu). - Prevent the PCMCIA library code from aborting suspend-to-idle due to noirq suspend failures resulting from incorrect assumptions (Rafael Wysocki). - Add coupled cpuidle supprt to the Exynos3250 platform (Marek Szyprowski). - Add new sysfs file to make it easier to specify the image storage location during hibernation (Mario Limonciello). - Add sysfs files for collecting suspend-to-idle usage and time statistics for CPU idle states (Rafael Wysocki). - Update the pm-graph utilities (Todd Brandt). - Reduce the kernel log noise related to reporting Low-power Idle constraings by the ACPI system suspend code (Rafael Wysocki). - Make it easier to distinguish dedicated wakeup IRQs in the /proc/interrupts output (Tony Lindgren). - Add the frequency table validation in cpufreq to the core and drop it from a number of cpufreq drivers (Viresh Kumar). - Drop "cooling-{min|max}-level" for CPU nodes from a couple of DT bindings (Viresh Kumar). - Clean up the CPU online error code path in the cpufreq core (Viresh Kumar). - Fix assorted issues in the SCPI, CPPC, mediatek and tegra186 cpufreq drivers (Arnd Bergmann, Chunyu Hu, George Cherian, Viresh Kumar). - Drop memory allocation error messages from a few places in cpufreq and cpuildle drivers (Markus Elfring)" * tag 'pm-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (56 commits) ACPI / PM: Fix keyboard wakeup from suspend-to-idle on ASUS UX331UA cpufreq: CPPC: Use transition_delay_us depending transition_latency PM / hibernate: Change message when writing to /sys/power/resume PM / hibernate: Make passing hibernate offsets more friendly cpuidle: poll_state: Avoid invoking local_clock() too often PM: cpuidle/suspend: Add s2idle usage and time state attributes cpuidle: Enable coupled cpuidle support on Exynos3250 platform cpuidle: poll_state: Add time limit to poll_idle() cpufreq: tegra186: Don't validate the frequency table twice cpufreq: speedstep: Don't validate the frequency table twice cpufreq: sparc: Don't validate the frequency table twice cpufreq: sh: Don't validate the frequency table twice cpufreq: sfi: Don't validate the frequency table twice cpufreq: scpi: Don't validate the frequency table twice cpufreq: sc520: Don't validate the frequency table twice cpufreq: s3c24xx: Don't validate the frequency table twice cpufreq: qoirq: Don't validate the frequency table twice cpufreq: pxa: Don't validate the frequency table twice cpufreq: ppc_cbe: Don't validate the frequency table twice cpufreq: powernow: Don't validate the frequency table twice ...

Linus Torvalds committed 8 years ago

Commit f2d28562 parents be55375 103cf0e75 files · +2916 −915Browse files

Showing the changes to kernel/power (1 of 75 files). Show all

Unified · Split

kernel/power/hibernate.c+25−1
@@ -1053,7 +1053,7 @@ static ssize_t resume_store(struct kobject *kobj, struct kobj_attribute *attr, · 1052 unmodified lines
10531053 lock_system_sleep();
10541054 swsusp_resume_device = res;
10551055 unlock_system_sleep();
1056− pr_info("Starting manual resume from disk\n");
1056+ pm_pr_dbg("Configured resume from disk to %u\n", swsusp_resume_device);
10571057 noresume = 0;
10581058 software_resume();
10591059 return n;
@@ -1061,6 +1061,29 @@ static ssize_t resume_store(struct kobject *kobj, struct kobj_attribute *attr, · 1 unmodified line
10611061
10621062 power_attr(resume);
10631063
1064+static ssize_t resume_offset_show(struct kobject *kobj,
1065+ struct kobj_attribute *attr, char *buf)
1066+{
1067+ return sprintf(buf, "%llu\n", (unsigned long long)swsusp_resume_block);
1068+}
1069+
1070+static ssize_t resume_offset_store(struct kobject *kobj,
1071+ struct kobj_attribute *attr, const char *buf,
1072+ size_t n)
1073+{
1074+ unsigned long long offset;
1075+ int rc;
1076+
1077+ rc = kstrtoull(buf, 0, &offset);
1078+ if (rc)
1079+ return rc;
1080+ swsusp_resume_block = offset;
1081+
1082+ return n;
1083+}
1084+
1085+power_attr(resume_offset);
1086+
10641087 static ssize_t image_size_show(struct kobject *kobj, struct kobj_attribute *attr,
10651088 char *buf)
10661089 {
@@ -1106,6 +1129,7 @@ power_attr(reserved_size); · 39 unmodified lines
11061129
11071130 static struct attribute * g[] = {
11081131 &disk_attr.attr,
1132+ &resume_offset_attr.attr,
11091133 &resume_attr.attr,
11101134 &image_size_attr.attr,
11111135 &reserved_size_attr.attr,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t