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

Pull more power management updates from Rafael Wysocki:
 "A few more fixes and cleanups in the x86-64 low-level hibernation
  code, PM core, cpufreq (Kconfig and intel_pstate), and the operating
  points framework.

  Specifics:

   - Prevent the low-level assembly hibernate code on x86-64 from
     referring to __PAGE_OFFSET directly as a symbol which doesn't work
     when the kernel identity mapping base is randomized, in which case
     __PAGE_OFFSET is a variable (Rafael Wysocki).

   - Avoid selecting CPU_FREQ_STAT by default as the statistics are not
     required for proper cpufreq operation (Borislav Petkov).

   - Add Skylake-X and Broadwell-X IDs to the intel_pstate's list of
     processors where out-of-band (OBB) control of P-states is possible
     and if that is in use, intel_pstate should not attempt to manage
     P-states (Srinivas Pandruvada).

   - Drop some unnecessary checks from the wakeup IRQ handling code in
     the PM core (Markus Elfring).

   - Reduce the number operating performance point (OPP) lookups in one
     of the OPP framework's helper functions (Jisheng Zhang)"

* tag 'pm-extra-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  x86/power/64: Do not refer to __PAGE_OFFSET from assembly code
  cpufreq: Do not default-yes CPU_FREQ_STAT
  cpufreq: intel_pstate: Add more out-of-band IDs
  PM / OPP: optimize dev_pm_opp_set_rate() performance a bit
  PM-wakeup: Delete unnecessary checks before three function calls

2 files changed, 26 insertions, 23 deletions

diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
index 7c04c87738a6..df0c70963d9e 100644
--- a/drivers/base/power/opp/core.c
+++ b/drivers/base/power/opp/core.c
@@ -402,6 +402,22 @@ struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,
 }
 EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_exact);
 
+static noinline struct dev_pm_opp *_find_freq_ceil(struct opp_table *opp_table,
+                                                   unsigned long *freq)
+{
+        struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);
+
+        list_for_each_entry_rcu(temp_opp, &opp_table->opp_list, node) {
+                if (temp_opp->available && temp_opp->rate >= *freq) {
+                        opp = temp_opp;
+                        *freq = opp->rate;
+                        break;
+                }
+        }
+
+        return opp;
+}
+
 /**
  * dev_pm_opp_find_freq_ceil() - Search for an rounded ceil freq
  * @dev:        device for which we do this operation
@@ -427,7 +443,6 @@ struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev,
                                              unsigned long *freq)
 {
         struct opp_table *opp_table;
-        struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);
 
         opp_rcu_lockdep_assert();
 
@@ -440,15 +455,7 @@ struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev,
         if (IS_ERR(opp_table))
                 return ERR_CAST(opp_table);
 
-        list_for_each_entry_rcu(temp_opp, &opp_table->opp_list, node) {
-                if (temp_opp->available && temp_opp->rate >= *freq) {
-                        opp = temp_opp;
-                        *freq = opp->rate;
-                        break;
-                }
-        }
-
-        return opp;
+        return _find_freq_ceil(opp_table, freq);
 }
 EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_ceil);
 
@@ -612,7 +619,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
                 return PTR_ERR(opp_table);
         }
 
-        old_opp = dev_pm_opp_find_freq_ceil(dev, &old_freq);
+        old_opp = _find_freq_ceil(opp_table, &old_freq);
         if (!IS_ERR(old_opp)) {
                 ou_volt = old_opp->u_volt;
                 ou_volt_min = old_opp->u_volt_min;
@@ -622,7 +629,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
                         __func__, old_freq, PTR_ERR(old_opp));
         }
 
-        opp = dev_pm_opp_find_freq_ceil(dev, &freq);
+        opp = _find_freq_ceil(opp_table, &freq);
         if (IS_ERR(opp)) {
                 ret = PTR_ERR(opp);
                 dev_err(dev, "%s: failed to find OPP for freq %lu (%d)\n",
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index 5fb7718f256c..62e4de2aa8d1 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -334,10 +334,9 @@ void device_wakeup_arm_wake_irqs(void)
         struct wakeup_source *ws;
 
         rcu_read_lock();
-        list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
-                if (ws->wakeirq)
-                        dev_pm_arm_wake_irq(ws->wakeirq);
-        }
+        list_for_each_entry_rcu(ws, &wakeup_sources, entry)
+                dev_pm_arm_wake_irq(ws->wakeirq);
+
         rcu_read_unlock();
 }
 
@@ -351,10 +350,9 @@ void device_wakeup_disarm_wake_irqs(void)
         struct wakeup_source *ws;
 
         rcu_read_lock();
-        list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
-                if (ws->wakeirq)
-                        dev_pm_disarm_wake_irq(ws->wakeirq);
-        }
+        list_for_each_entry_rcu(ws, &wakeup_sources, entry)
+                dev_pm_disarm_wake_irq(ws->wakeirq);
+
         rcu_read_unlock();
 }
 
@@ -390,9 +388,7 @@ int device_wakeup_disable(struct device *dev)
                 return -EINVAL;
 
         ws = device_wakeup_detach(dev);
-        if (ws)
-                wakeup_source_unregister(ws);
-
+        wakeup_source_unregister(ws);
         return 0;
 }
 EXPORT_SYMBOL_GPL(device_wakeup_disable);