Pull more ACPI and power management updates from Rafael Wysocki: "These are fixups on top of the previous PM+ACPI pull request, regression fixes (ACPI hotplug, cpufreq ppc-corenet), other bug fixes (ACPI reset, cpufreq), new PM trace points for system suspend profiling and a copyright notice update. Specifics: - I didn't remember correctly that the Hans de Goede's ACPI video patches actually didn't flip the video.use_native_backlight default, although we had discussed that and decided to do that. Since I said we would do that in the previous PM+ACPI pull request, make that change for real now. - ACPI bus check notifications for PCI host bridges don't cause the bus below the host bridge to be checked for changes as they should because of a mistake in the ACPI-based PCI hotplug (ACPIPHP) subsystem that forgets to add hotplug contexts to PCI host bridge ACPI device objects. Create hotplug contexts for PCI host bridges too as appropriate. - Revert recent cpufreq commit related to the big.LITTLE cpufreq driver that breaks arm64 builds. - Fix for a regression in the ppc-corenet cpufreq driver introduced during the 3.15 cycle and causing the driver to use the remainder from do_div instead of the quotient. From Ed Swarthout. - Resets triggered by panic activate a BUG_ON() in vmalloc.c on systems where the ACPI reset register is located in memory address space. Fix from Randy Wright. - Fix for a problem with cpufreq governors that decisions made by them may be suboptimal due to the fact that deferrable timers are used by them for CPU load sampling. From Srivatsa S Bhat. - Fix for a problem with the Tegra cpufreq driver where the CPU frequency is temporarily switched to a "stable" level that is different from both the initial and target frequencies during transitions which causes udelay() to expire earlier than it should sometimes. From Viresh Kumar. - New trace points and rework of some existing trace points for system suspend/resume profiling from Todd Brandt. - Assorted cpufreq fixes and cleanups from Stratos Karafotis and Viresh Kumar. - Copyright notice update for suspend-and-cpuhotplug.txt from Srivatsa S Bhat" * tag 'pm+acpi-3.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / hotplug / PCI: Add hotplug contexts to PCI host bridges PM / sleep: trace events for device PM callbacks cpufreq: cpufreq-cpu0: remove dependency on THERMAL and REGULATOR cpufreq: tegra: update comment for clarity cpufreq: intel_pstate: Remove duplicate CPU ID check cpufreq: Mark CPU0 driver with CPUFREQ_NEED_INITIAL_FREQ_CHECK flag PM / Documentation: Update copyright in suspend-and-cpuhotplug.txt cpufreq: governor: remove copy_prev_load from 'struct cpu_dbs_common_info' cpufreq: governor: Be friendly towards latency-sensitive bursty workloads PM / sleep: trace events for suspend/resume cpufreq: ppc-corenet-cpu-freq: do_div use quotient Revert "cpufreq: Enable big.LITTLE cpufreq driver on arm64" cpufreq: Tegra: implement intermediate frequency callbacks cpufreq: add support for intermediate (stable) frequencies ACPI / video: Change the default for video.use_native_backlight to 1 ACPI: Fix bug when ACPI reset register is implemented in system memory
Showing the changes to kernel/cpu.c (1 of 24 files). Show all
Unified · Split
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | #include <linux/gfp.h> | 20 | #include <linux/gfp.h> |
| 21 | #include <linux/suspend.h> | 21 | #include <linux/suspend.h> |
| 22 | #include <linux/lockdep.h> | 22 | #include <linux/lockdep.h> |
| 23 | #include <trace/events/power.h> | ||
| 23 | 24 | ||
| 24 | #include "smpboot.h" | 25 | #include "smpboot.h" |
| 25 | 26 | ||
| @@ -520,7 +521,9 @@ int disable_nonboot_cpus(void) · 494 unmodified lines | |||
| 520 | for_each_online_cpu(cpu) { | 521 | for_each_online_cpu(cpu) { |
| 521 | if (cpu == first_cpu) | 522 | if (cpu == first_cpu) |
| 522 | continue; | 523 | continue; |
| 524 | trace_suspend_resume(TPS("CPU_OFF"), cpu, true); | ||
| 523 | error = _cpu_down(cpu, 1); | 525 | error = _cpu_down(cpu, 1); |
| 526 | trace_suspend_resume(TPS("CPU_OFF"), cpu, false); | ||
| 524 | if (!error) | 527 | if (!error) |
| 525 | cpumask_set_cpu(cpu, frozen_cpus); | 528 | cpumask_set_cpu(cpu, frozen_cpus); |
| 526 | else { | 529 | else { |
| @@ -563,7 +566,9 @@ void __ref enable_nonboot_cpus(void) · 36 unmodified lines | |||
| 563 | arch_enable_nonboot_cpus_begin(); | 566 | arch_enable_nonboot_cpus_begin(); |
| 564 | 567 | ||
| 565 | for_each_cpu(cpu, frozen_cpus) { | 568 | for_each_cpu(cpu, frozen_cpus) { |
| 569 | trace_suspend_resume(TPS("CPU_ON"), cpu, true); | ||
| 566 | error = _cpu_up(cpu, 1); | 570 | error = _cpu_up(cpu, 1); |
| 571 | trace_suspend_resume(TPS("CPU_ON"), cpu, false); | ||
| 567 | if (!error) { | 572 | if (!error) { |
| 568 | pr_info("CPU%d is up\n", cpu); | 573 | pr_info("CPU%d is up\n", cpu); |
| 569 | continue; | 574 | continue; |