Merge tag 'pm+acpi-3.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

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

2 files changed, 31 insertions, 4 deletions

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 343ffad59377..bf412961a934 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -214,9 +214,6 @@ static void initcall_debug_report(struct device *dev, ktime_t calltime,
                 pr_info("call %s+ returned %d after %Ld usecs\n", dev_name(dev),
                         error, (unsigned long long)nsecs >> 10);
         }
-
-        trace_device_pm_report_time(dev, info, nsecs, pm_verb(state.event),
-                                    error);
 }
 
 /**
@@ -387,7 +384,9 @@ static int dpm_run_callback(pm_callback_t cb, struct device *dev,
         calltime = initcall_debug_start(dev);
 
         pm_dev_dbg(dev, state, info);
+        trace_device_pm_callback_start(dev, info, state.event);
         error = cb(dev);
+        trace_device_pm_callback_end(dev, error);
         suspend_report_result(cb, error);
 
         initcall_debug_report(dev, calltime, error, state, info);
@@ -545,6 +544,7 @@ static void dpm_resume_noirq(pm_message_t state)
         struct device *dev;
         ktime_t starttime = ktime_get();
 
+        trace_suspend_resume(TPS("dpm_resume_noirq"), state.event, true);
         mutex_lock(&dpm_list_mtx);
         pm_transition = state;
 
@@ -587,6 +587,7 @@ static void dpm_resume_noirq(pm_message_t state)
         dpm_show_time(starttime, state, "noirq");
         resume_device_irqs();
         cpuidle_resume();
+        trace_suspend_resume(TPS("dpm_resume_noirq"), state.event, false);
 }
 
 /**
@@ -664,6 +665,7 @@ static void dpm_resume_early(pm_message_t state)
         struct device *dev;
         ktime_t starttime = ktime_get();
 
+        trace_suspend_resume(TPS("dpm_resume_early"), state.event, true);
         mutex_lock(&dpm_list_mtx);
         pm_transition = state;
 
@@ -703,6 +705,7 @@ static void dpm_resume_early(pm_message_t state)
         mutex_unlock(&dpm_list_mtx);
         async_synchronize_full();
         dpm_show_time(starttime, state, "early");
+        trace_suspend_resume(TPS("dpm_resume_early"), state.event, false);
 }
 
 /**
@@ -834,6 +837,7 @@ void dpm_resume(pm_message_t state)
         struct device *dev;
         ktime_t starttime = ktime_get();
 
+        trace_suspend_resume(TPS("dpm_resume"), state.event, true);
         might_sleep();
 
         mutex_lock(&dpm_list_mtx);
@@ -875,6 +879,7 @@ void dpm_resume(pm_message_t state)
         dpm_show_time(starttime, state, NULL);
 
         cpufreq_resume();
+        trace_suspend_resume(TPS("dpm_resume"), state.event, false);
 }
 
 /**
@@ -913,7 +918,9 @@ static void device_complete(struct device *dev, pm_message_t state)
 
         if (callback) {
                 pm_dev_dbg(dev, state, info);
+                trace_device_pm_callback_start(dev, info, state.event);
                 callback(dev);
+                trace_device_pm_callback_end(dev, 0);
         }
 
         device_unlock(dev);
@@ -932,6 +939,7 @@ void dpm_complete(pm_message_t state)
 {
         struct list_head list;
 
+        trace_suspend_resume(TPS("dpm_complete"), state.event, true);
         might_sleep();
 
         INIT_LIST_HEAD(&list);
@@ -951,6 +959,7 @@ void dpm_complete(pm_message_t state)
         }
         list_splice(&list, &dpm_list);
         mutex_unlock(&dpm_list_mtx);
+        trace_suspend_resume(TPS("dpm_complete"), state.event, false);
 }
 
 /**
@@ -1086,6 +1095,7 @@ static int dpm_suspend_noirq(pm_message_t state)
         ktime_t starttime = ktime_get();
         int error = 0;
 
+        trace_suspend_resume(TPS("dpm_suspend_noirq"), state.event, true);
         cpuidle_pause();
         suspend_device_irqs();
         mutex_lock(&dpm_list_mtx);
@@ -1126,6 +1136,7 @@ static int dpm_suspend_noirq(pm_message_t state)
         } else {
                 dpm_show_time(starttime, state, "noirq");
         }
+        trace_suspend_resume(TPS("dpm_suspend_noirq"), state.event, false);
         return error;
 }
 
@@ -1222,6 +1233,7 @@ static int dpm_suspend_late(pm_message_t state)
         ktime_t starttime = ktime_get();
         int error = 0;
 
+        trace_suspend_resume(TPS("dpm_suspend_late"), state.event, true);
         mutex_lock(&dpm_list_mtx);
         pm_transition = state;
         async_error = 0;
@@ -1257,6 +1269,7 @@ static int dpm_suspend_late(pm_message_t state)
         } else {
                 dpm_show_time(starttime, state, "late");
         }
+        trace_suspend_resume(TPS("dpm_suspend_late"), state.event, false);
         return error;
 }
 
@@ -1295,7 +1308,9 @@ static int legacy_suspend(struct device *dev, pm_message_t state,
 
         calltime = initcall_debug_start(dev);
 
+        trace_device_pm_callback_start(dev, info, state.event);
         error = cb(dev, state);
+        trace_device_pm_callback_end(dev, error);
         suspend_report_result(cb, error);
 
         initcall_debug_report(dev, calltime, error, state, info);
@@ -1461,6 +1476,7 @@ int dpm_suspend(pm_message_t state)
         ktime_t starttime = ktime_get();
         int error = 0;
 
+        trace_suspend_resume(TPS("dpm_suspend"), state.event, true);
         might_sleep();
 
         cpufreq_suspend();
@@ -1498,6 +1514,7 @@ int dpm_suspend(pm_message_t state)
                 dpm_save_failed_step(SUSPEND_SUSPEND);
         } else
                 dpm_show_time(starttime, state, NULL);
+        trace_suspend_resume(TPS("dpm_suspend"), state.event, false);
         return error;
 }
 
@@ -1549,8 +1566,11 @@ static int device_prepare(struct device *dev, pm_message_t state)
                 callback = dev->driver->pm->prepare;
         }
 
-        if (callback)
+        if (callback) {
+                trace_device_pm_callback_start(dev, info, state.event);
                 ret = callback(dev);
+                trace_device_pm_callback_end(dev, ret);
+        }
 
         device_unlock(dev);
 
@@ -1582,6 +1602,7 @@ int dpm_prepare(pm_message_t state)
 {
         int error = 0;
 
+        trace_suspend_resume(TPS("dpm_prepare"), state.event, true);
         might_sleep();
 
         mutex_lock(&dpm_list_mtx);
@@ -1612,6 +1633,7 @@ int dpm_prepare(pm_message_t state)
                 put_device(dev);
         }
         mutex_unlock(&dpm_list_mtx);
+        trace_suspend_resume(TPS("dpm_prepare"), state.event, false);
         return error;
 }
 
diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
index e8d11b6630ee..dbb8350ea8dc 100644
--- a/drivers/base/syscore.c
+++ b/drivers/base/syscore.c
@@ -10,6 +10,7 @@
 #include <linux/mutex.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
+#include <trace/events/power.h>
 
 static LIST_HEAD(syscore_ops_list);
 static DEFINE_MUTEX(syscore_ops_lock);
@@ -49,6 +50,7 @@ int syscore_suspend(void)
         struct syscore_ops *ops;
         int ret = 0;
 
+        trace_suspend_resume(TPS("syscore_suspend"), 0, true);
         pr_debug("Checking wakeup interrupts\n");
 
         /* Return error code if there are any wakeup interrupts pending. */
@@ -70,6 +72,7 @@ int syscore_suspend(void)
                                 "Interrupts enabled after %pF\n", ops->suspend);
                 }
 
+        trace_suspend_resume(TPS("syscore_suspend"), 0, false);
         return 0;
 
  err_out:
@@ -92,6 +95,7 @@ void syscore_resume(void)
 {
         struct syscore_ops *ops;
 
+        trace_suspend_resume(TPS("syscore_resume"), 0, true);
         WARN_ONCE(!irqs_disabled(),
                 "Interrupts enabled before system core resume.\n");
 
@@ -103,6 +107,7 @@ void syscore_resume(void)
                         WARN_ONCE(!irqs_disabled(),
                                 "Interrupts enabled after %pF\n", ops->resume);
                 }
+        trace_suspend_resume(TPS("syscore_resume"), 0, false);
 }
 EXPORT_SYMBOL_GPL(syscore_resume);
 #endif /* CONFIG_PM_SLEEP */