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

Pull more power management updates from Rafael Wysocki:
 "These are mostly fixes and cleanups on top of the previously merged
  power management material for 5.1-rc1 with one cpupower utility update
  that wasn't pushed earlier due to unfortunate timing.

  Specifics:

   - Fix registration of new cpuidle governors partially broken during
     the 5.0 development cycle by mistake (Rafael Wysocki).

   - Avoid integer overflows in the menu cpuidle governor by making it
     discard the overflowing data points upfront (Rafael Wysocki).

   - Fix minor mistake in the recent update of the iowait boost
     computation in the intel_pstate driver (Rafael Wysocki).

   - Drop incorrect __init annotation from one function in the pxa2xx
     cpufreq driver (Arnd Bergmann).

   - Fix the operating performance points (OPP) framework initialization
     for devices in multiple power domains if only one of them is
     scalable (Rajendra Nayak).

   - Fix mistake in dev_pm_opp_set_rate() which causes it to skip
     updating the performance state if the new frequency is the same as
     the old one (Viresh Kumar).

   - Rework the cancellation of wakeup source timers to avoid potential
     issues with it and do some cleanups unlocked by that change (Viresh
     Kumar, Rafael Wysocki).

   - Clean up the code computing the active/suspended time of devices in
     the PM-runtime framework after recent changes (Ulf Hansson).

   - Make the power management infrastructure code use pr_fmt()
     consistently (Joe Perches).

   - Clean up the generic power domains (genpd) framework somewhat
     (Aisheng Dong).

   - Improve kerneldoc comments for two functions in the cpufreq core
     (Rafael Wysocki).

   - Fix typo in a PM QoS file description comment (Aisheng Dong).

   - Update the handling of CPU boost frequencies in the cpupower
     utility (Abhishek Goel)"

* tag 'pm-5.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpuidle: governor: Add new governors to cpuidle_governors again
  cpufreq: intel_pstate: Fix up iowait_boost computation
  PM / OPP: Update performance state when freq == old_freq
  PM / wakeup: Drop wakeup_source_drop()
  PM / wakeup: Rework wakeup source timer cancellation
  PM / domains: Remove one unnecessary blank line
  PM / Domains: Return early for all errors in _genpd_power_off()
  PM / Domains: Improve warn for multiple states but no governor
  OPP: Fix handling of multiple power domains
  PM / QoS: Fix typo in file description
  cpufreq: pxa2xx: remove incorrect __init annotation
  PM-runtime: Call pm_runtime_active|suspended_time() from sysfs
  PM-runtime: Consolidate code to get active/suspended time
  PM: Add and use pr_fmt()
  cpufreq: Improve kerneldoc comments for cpufreq_cpu_get/put()
  cpuidle: menu: Avoid overflows when computing variance
  tools/power/cpupower: Display boost frequency separately

3 files changed, 50 insertions, 27 deletions

diff --git a/tools/power/cpupower/lib/cpufreq.c b/tools/power/cpupower/lib/cpufreq.c
index 0c0f3e3f0d80..80650497fb80 100644
--- a/tools/power/cpupower/lib/cpufreq.c
+++ b/tools/power/cpupower/lib/cpufreq.c
@@ -333,17 +333,20 @@ void cpufreq_put_available_governors(struct cpufreq_available_governors *any)
 }
 
 
-struct cpufreq_available_frequencies
-*cpufreq_get_available_frequencies(unsigned int cpu)
+struct cpufreq_frequencies
+*cpufreq_get_frequencies(const char *type, unsigned int cpu)
 {
-        struct cpufreq_available_frequencies *first = NULL;
-        struct cpufreq_available_frequencies *current = NULL;
+        struct cpufreq_frequencies *first = NULL;
+        struct cpufreq_frequencies *current = NULL;
         char one_value[SYSFS_PATH_MAX];
         char linebuf[MAX_LINE_LEN];
+        char fname[MAX_LINE_LEN];
         unsigned int pos, i;
         unsigned int len;
 
-        len = sysfs_cpufreq_read_file(cpu, "scaling_available_frequencies",
+        snprintf(fname, MAX_LINE_LEN, "scaling_%s_frequencies", type);
+
+        len = sysfs_cpufreq_read_file(cpu, fname,
                                 linebuf, sizeof(linebuf));
         if (len == 0)
                 return NULL;
@@ -389,9 +392,9 @@ struct cpufreq_available_frequencies
         return NULL;
 }
 
-void cpufreq_put_available_frequencies(struct cpufreq_available_frequencies
-                                *any) {
-        struct cpufreq_available_frequencies *tmp, *next;
+void cpufreq_put_frequencies(struct cpufreq_frequencies *any)
+{
+        struct cpufreq_frequencies *tmp, *next;
 
         if (!any)
                 return;
diff --git a/tools/power/cpupower/lib/cpufreq.h b/tools/power/cpupower/lib/cpufreq.h
index 60beaf5ed2ea..775738269cbf 100644
--- a/tools/power/cpupower/lib/cpufreq.h
+++ b/tools/power/cpupower/lib/cpufreq.h
@@ -28,10 +28,10 @@ struct cpufreq_available_governors {
         struct cpufreq_available_governors *first;
 };
 
-struct cpufreq_available_frequencies {
+struct cpufreq_frequencies {
         unsigned long frequency;
-        struct cpufreq_available_frequencies *next;
-        struct cpufreq_available_frequencies *first;
+        struct cpufreq_frequencies *next;
+        struct cpufreq_frequencies *first;
 };
 
 
@@ -129,14 +129,14 @@ void cpufreq_put_available_governors(
  *
  * Only present on _some_ ->target() cpufreq drivers. For information purposes
  * only. Please free allocated memory by calling
- * cpufreq_put_available_frequencies after use.
+ * cpufreq_put_frequencies after use.
  */
 
-struct cpufreq_available_frequencies
-*cpufreq_get_available_frequencies(unsigned int cpu);
+struct cpufreq_frequencies
+*cpufreq_get_frequencies(const char *type, unsigned int cpu);
 
-void cpufreq_put_available_frequencies(
-                struct cpufreq_available_frequencies *first);
+void cpufreq_put_frequencies(
+                struct cpufreq_frequencies *first);
 
 
 /* determine affected CPUs
diff --git a/tools/power/cpupower/utils/cpufreq-info.c b/tools/power/cpupower/utils/cpufreq-info.c
index c3f39d5128ee..10290b308797 100644
--- a/tools/power/cpupower/utils/cpufreq-info.c
+++ b/tools/power/cpupower/utils/cpufreq-info.c
@@ -161,19 +161,12 @@ static void print_duration(unsigned long duration)
         return;
 }
 
-/* --boost / -b */
-
-static int get_boost_mode(unsigned int cpu)
+static int get_boost_mode_x86(unsigned int cpu)
 {
         int support, active, b_states = 0, ret, pstate_no, i;
         /* ToDo: Make this more global */
         unsigned long pstates[MAX_HW_PSTATES] = {0,};
 
-        if (cpupower_cpu_info.vendor != X86_VENDOR_AMD &&
-            cpupower_cpu_info.vendor != X86_VENDOR_HYGON &&
-            cpupower_cpu_info.vendor != X86_VENDOR_INTEL)
-                return 0;
-
         ret = cpufreq_has_boost_support(cpu, &support, &active, &b_states);
         if (ret) {
                 printf(_("Error while evaluating Boost Capabilities"
@@ -248,6 +241,33 @@ static int get_boost_mode(unsigned int cpu)
         return 0;
 }
 
+/* --boost / -b */
+
+static int get_boost_mode(unsigned int cpu)
+{
+        struct cpufreq_frequencies *freqs;
+
+        if (cpupower_cpu_info.vendor == X86_VENDOR_AMD ||
+            cpupower_cpu_info.vendor == X86_VENDOR_HYGON ||
+            cpupower_cpu_info.vendor == X86_VENDOR_INTEL)
+                return get_boost_mode_x86(cpu);
+
+        freqs = cpufreq_get_frequencies("boost", cpu);
+        if (freqs) {
+                printf(_("  boost frequency steps: "));
+                while (freqs->next) {
+                        print_speed(freqs->frequency);
+                        printf(", ");
+                        freqs = freqs->next;
+                }
+                print_speed(freqs->frequency);
+                printf("\n");
+                cpufreq_put_frequencies(freqs);
+        }
+
+        return 0;
+}
+
 /* --freq / -f */
 
 static int get_freq_kernel(unsigned int cpu, unsigned int human)
@@ -456,7 +476,7 @@ static int get_latency(unsigned int cpu, unsigned int human)
 
 static void debug_output_one(unsigned int cpu)
 {
-        struct cpufreq_available_frequencies *freqs;
+        struct cpufreq_frequencies *freqs;
 
         get_driver(cpu);
         get_related_cpus(cpu);
@@ -464,7 +484,7 @@ static void debug_output_one(unsigned int cpu)
         get_latency(cpu, 1);
         get_hardware_limits(cpu, 1);
 
-        freqs = cpufreq_get_available_frequencies(cpu);
+        freqs = cpufreq_get_frequencies("available", cpu);
         if (freqs) {
                 printf(_("  available frequency steps:  "));
                 while (freqs->next) {
@@ -474,7 +494,7 @@ static void debug_output_one(unsigned int cpu)
                 }
                 print_speed(freqs->frequency);
                 printf("\n");
-                cpufreq_put_available_frequencies(freqs);
+                cpufreq_put_frequencies(freqs);
         }
 
         get_available_governors(cpu);