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

Pull power management updates from Rafael Wysocki:
 "The majority of changes go into the cpufreq subsystem this time.

  To me, quite obviously, the biggest ticket item is the new "schedutil"
  governor.  Interestingly enough, it's the first new cpufreq governor
  since the beginning of the git era (except for some out-of-the-tree
  ones).

  There are two main differences between it and the existing governors.
  First, it uses the information provided by the scheduler directly for
  making its decisions, so it doesn't have to track anything by itself.
  Second, it can invoke drivers (supporting that feature) to adjust CPU
  performance right away without having to spawn work items to be
  executed in process context or similar.  Currently, the acpi-cpufreq
  driver is the only one supporting that mode of operation, but then it
  is used on a large number of systems.

  The "schedutil" governor as included here is very simple and mostly
  regarded as a foundation for future work on the integration of the
  scheduler with CPU power management (in fact, there is work in
  progress on top of it already).  Nevertheless it works and the
  preliminary results obtained with it are encouraging.

  There also is some consolidation of CPU frequency management for ARM
  platforms that can add their machine IDs the the new stub dt-platdev
  driver now and that will take care of creating the requisite platform
  device for cpufreq-dt, so it is not necessary to do that in platform
  code any more.  Several ARM platforms are switched over to using this
  generic mechanism.

  In addition to that, the intel_pstate driver is now going to respect
  CPU frequency limits set by the platform firmware (or a BMC) and
  provided via the ACPI _PPC object.

  The devfreq subsystem is getting a new "passive" governor for SoCs
  subsystems that will depend on somebody else to manage their voltage
  rails and its support for Samsung Exynos SoCs is consolidated.

  The rest is support for new hardware (Intel Broxton support in
  intel_idle for one example), bug fixes, optimizations and cleanups in
  a number of places.

  Specifics:

   - New cpufreq "schedutil" governor (making decisions based on CPU
     utilization information provided by the scheduler and capable of
     switching CPU frequencies right away if the underlying driver
     supports that) and support for fast frequency switching in the
     acpi-cpufreq driver (Rafael Wysocki)

   - Consolidation of CPU frequency management on ARM platforms allowing
     them to get rid of some platform-specific boilerplate code if they
     are going to use the cpufreq-dt driver (Viresh Kumar, Finley Xiao,
     Marc Gonzalez)

   - Support for ACPI _PPC and CPU frequency limits in the intel_pstate
     driver (Srinivas Pandruvada)

   - Fixes and cleanups in the cpufreq core and generic governor code
     (Rafael Wysocki, Sai Gurrappadi)

   - intel_pstate driver optimizations and cleanups (Rafael Wysocki,
     Philippe Longepe, Chen Yu, Joe Perches)

   - cpufreq powernv driver fixes and cleanups (Akshay Adiga, Shilpasri
     Bhat)

   - cpufreq qoriq driver fixes and cleanups (Jia Hongtao)

   - ACPI cpufreq driver cleanups (Viresh Kumar)

   - Assorted cpufreq driver updates (Ashwin Chaugule, Geliang Tang,
     Javier Martinez Canillas, Paul Gortmaker, Sudeep Holla)

   - Assorted cpufreq fixes and cleanups (Joe Perches, Arnd Bergmann)

   - Fixes and cleanups in the OPP (Operating Performance Points)
     framework, mostly related to OPP sharing, and reorganization of
     OF-dependent code in it (Viresh Kumar, Arnd Bergmann, Sudeep Holla)

   - New "passive" governor for devfreq (for SoC subsystems that will
     rely on someone else for the management of their power resources)
     and consolidation of devfreq support for Exynos platforms, coding
     style and typo fixes for devfreq (Chanwoo Choi, MyungJoo Ham)

   - PM core fixes and cleanups, mostly to make it work better with the
     generic power domains (genpd) framework, and updates for that
     framework (Ulf Hansson, Thierry Reding, Colin Ian King)

   - Intel Broxton support for the intel_idle driver (Len Brown)

   - cpuidle core optimization and fix (Daniel Lezcano, Dave Gerlach)

   - ARM cpuidle cleanups (Jisheng Zhang)

   - Intel Kabylake support for the RAPL power capping driver (Jacob
     Pan)

   - AVS (Adaptive Voltage Switching) rockchip-io driver update (Heiko
     Stuebner)

   - Updates for the cpupower tool (Arjun Sreedharan, Colin Ian King,
     Mattia Dongili, Thomas Renninger)"

* tag 'pm-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (112 commits)
  intel_pstate: Clean up get_target_pstate_use_performance()
  intel_pstate: Use sample.core_avg_perf in get_avg_pstate()
  intel_pstate: Clarify average performance computation
  intel_pstate: Avoid unnecessary synchronize_sched() during initialization
  cpufreq: schedutil: Make default depend on CONFIG_SMP
  cpufreq: powernv: del_timer_sync when global and local pstate are equal
  cpufreq: powernv: Move smp_call_function_any() out of irq safe block
  intel_pstate: Clean up intel_pstate_get()
  cpufreq: schedutil: Make it depend on CONFIG_SMP
  cpufreq: governor: Fix handling of special cases in dbs_update()
  PM / OPP: Move CONFIG_OF dependent code in a separate file
  cpufreq: intel_pstate: Ignore _PPC processing under HWP
  cpufreq: arm_big_little: use generic OPP functions for {init, free}_opp_table
  PM / OPP: add non-OF versions of dev_pm_opp_{cpumask_, }remove_table
  cpufreq: tango: Use generic platdev driver
  PM / OPP: pass cpumask by reference
  cpufreq: Fix GOV_LIMITS handling for the userspace governor
  cpupower: fix potential memory leak
  PM / devfreq: style/typo fixes
  PM / devfreq: exynos: Add the detailed correlation for Exynos5422 bus
  ..

1 files changed, 35 insertions, 49 deletions

diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c
index 247bfa8eaddb..c46a12df40dd 100644
--- a/drivers/cpufreq/longhaul.c
+++ b/drivers/cpufreq/longhaul.c
@@ -21,6 +21,8 @@
  *  BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -40,8 +42,6 @@
 
 #include "longhaul.h"
 
-#define PFX "longhaul: "
-
 #define TYPE_LONGHAUL_V1        1
 #define TYPE_LONGHAUL_V2        2
 #define TYPE_POWERSAVER         3
@@ -347,14 +347,13 @@ retry_loop:
         freqs.new = calc_speed(longhaul_get_cpu_mult());
         /* Check if requested frequency is set. */
         if (unlikely(freqs.new != speed)) {
-                printk(KERN_INFO PFX "Failed to set requested frequency!\n");
+                pr_info("Failed to set requested frequency!\n");
                 /* Revision ID = 1 but processor is expecting revision key
                  * equal to 0. Jumpers at the bottom of processor will change
                  * multiplier and FSB, but will not change bits in Longhaul
                  * MSR nor enable voltage scaling. */
                 if (!revid_errata) {
-                        printk(KERN_INFO PFX "Enabling \"Ignore Revision ID\" "
-                                                "option.\n");
+                        pr_info("Enabling \"Ignore Revision ID\" option\n");
                         revid_errata = 1;
                         msleep(200);
                         goto retry_loop;
@@ -364,11 +363,10 @@ retry_loop:
                  * but it doesn't change frequency. I tried poking various
                  * bits in northbridge registers, but without success. */
                 if (longhaul_flags & USE_ACPI_C3) {
-                        printk(KERN_INFO PFX "Disabling ACPI C3 support.\n");
+                        pr_info("Disabling ACPI C3 support\n");
                         longhaul_flags &= ~USE_ACPI_C3;
                         if (revid_errata) {
-                                printk(KERN_INFO PFX "Disabling \"Ignore "
-                                                "Revision ID\" option.\n");
+                                pr_info("Disabling \"Ignore Revision ID\" option\n");
                                 revid_errata = 0;
                         }
                         msleep(200);
@@ -379,7 +377,7 @@ retry_loop:
                  * RevID = 1. RevID errata will make things right. Just
                  * to be 100% sure. */
                 if (longhaul_version == TYPE_LONGHAUL_V2) {
-                        printk(KERN_INFO PFX "Switching to Longhaul ver. 1\n");
+                        pr_info("Switching to Longhaul ver. 1\n");
                         longhaul_version = TYPE_LONGHAUL_V1;
                         msleep(200);
                         goto retry_loop;
@@ -387,8 +385,7 @@ retry_loop:
         }
 
         if (!bm_timeout) {
-                printk(KERN_INFO PFX "Warning: Timeout while waiting for "
-                                "idle PCI bus.\n");
+                pr_info("Warning: Timeout while waiting for idle PCI bus\n");
                 return -EBUSY;
         }
 
@@ -433,12 +430,12 @@ static int longhaul_get_ranges(void)
         /* Get current frequency */
         mult = longhaul_get_cpu_mult();
         if (mult == -1) {
-                printk(KERN_INFO PFX "Invalid (reserved) multiplier!\n");
+                pr_info("Invalid (reserved) multiplier!\n");
                 return -EINVAL;
         }
         fsb = guess_fsb(mult);
         if (fsb == 0) {
-                printk(KERN_INFO PFX "Invalid (reserved) FSB!\n");
+                pr_info("Invalid (reserved) FSB!\n");
                 return -EINVAL;
         }
         /* Get max multiplier - as we always did.
@@ -468,11 +465,11 @@ static int longhaul_get_ranges(void)
                  print_speed(highest_speed/1000));
 
         if (lowest_speed == highest_speed) {
-                printk(KERN_INFO PFX "highestspeed == lowest, aborting.\n");
+                pr_info("highestspeed == lowest, aborting\n");
                 return -EINVAL;
         }
         if (lowest_speed > highest_speed) {
-                printk(KERN_INFO PFX "nonsense! lowest (%d > %d) !\n",
+                pr_info("nonsense! lowest (%d > %d) !\n",
                         lowest_speed, highest_speed);
                 return -EINVAL;
         }
@@ -538,16 +535,16 @@ static void longhaul_setup_voltagescaling(void)
 
         rdmsrl(MSR_VIA_LONGHAUL, longhaul.val);
         if (!(longhaul.bits.RevisionID & 1)) {
-                printk(KERN_INFO PFX "Voltage scaling not supported by CPU.\n");
+                pr_info("Voltage scaling not supported by CPU\n");
                 return;
         }
 
         if (!longhaul.bits.VRMRev) {
-                printk(KERN_INFO PFX "VRM 8.5\n");
+                pr_info("VRM 8.5\n");
                 vrm_mV_table = &vrm85_mV[0];
                 mV_vrm_table = &mV_vrm85[0];
         } else {
-                printk(KERN_INFO PFX "Mobile VRM\n");
+                pr_info("Mobile VRM\n");
                 if (cpu_model < CPU_NEHEMIAH)
                         return;
                 vrm_mV_table = &mobilevrm_mV[0];
@@ -558,27 +555,21 @@ static void longhaul_setup_voltagescaling(void)
         maxvid = vrm_mV_table[longhaul.bits.MaximumVID];
 
         if (minvid.mV == 0 || maxvid.mV == 0 || minvid.mV > maxvid.mV) {
-                printk(KERN_INFO PFX "Bogus values Min:%d.%03d Max:%d.%03d. "
-                                        "Voltage scaling disabled.\n",
-                                        minvid.mV/1000, minvid.mV%1000,
-                                        maxvid.mV/1000, maxvid.mV%1000);
+                pr_info("Bogus values Min:%d.%03d Max:%d.%03d - Voltage scaling disabled\n",
+                        minvid.mV/1000, minvid.mV%1000,
+                        maxvid.mV/1000, maxvid.mV%1000);
                 return;
         }
 
         if (minvid.mV == maxvid.mV) {
-                printk(KERN_INFO PFX "Claims to support voltage scaling but "
-                                "min & max are both %d.%03d. "
-                                "Voltage scaling disabled\n",
-                                maxvid.mV/1000, maxvid.mV%1000);
+                pr_info("Claims to support voltage scaling but min & max are both %d.%03d - Voltage scaling disabled\n",
+                        maxvid.mV/1000, maxvid.mV%1000);
                 return;
         }
 
         /* How many voltage steps*/
         numvscales = maxvid.pos - minvid.pos + 1;
-        printk(KERN_INFO PFX
-                "Max VID=%d.%03d  "
-                "Min VID=%d.%03d, "
-                "%d possible voltage scales\n",
+        pr_info("Max VID=%d.%03d  Min VID=%d.%03d, %d possible voltage scales\n",
                 maxvid.mV/1000, maxvid.mV%1000,
                 minvid.mV/1000, minvid.mV%1000,
                 numvscales);
@@ -617,12 +608,12 @@ static void longhaul_setup_voltagescaling(void)
                         pos = minvid.pos;
                 freq_pos->driver_data |= mV_vrm_table[pos] << 8;
                 vid = vrm_mV_table[mV_vrm_table[pos]];
-                printk(KERN_INFO PFX "f: %d kHz, index: %d, vid: %d mV\n",
+                pr_info("f: %d kHz, index: %d, vid: %d mV\n",
                         speed, (int)(freq_pos - longhaul_table), vid.mV);
         }
 
         can_scale_voltage = 1;
-        printk(KERN_INFO PFX "Voltage scaling enabled.\n");
+        pr_info("Voltage scaling enabled\n");
 }
 
 
@@ -720,8 +711,7 @@ static int enable_arbiter_disable(void)
                         pci_write_config_byte(dev, reg, pci_cmd);
                         pci_read_config_byte(dev, reg, &pci_cmd);
                         if (!(pci_cmd & 1<<7)) {
-                                printk(KERN_ERR PFX
-                                        "Can't enable access to port 0x22.\n");
+                                pr_err("Can't enable access to port 0x22\n");
                                 status = 0;
                         }
                 }
@@ -758,8 +748,7 @@ static int longhaul_setup_southbridge(void)
                 if (pci_cmd & 1 << 7) {
                         pci_read_config_dword(dev, 0x88, &acpi_regs_addr);
                         acpi_regs_addr &= 0xff00;
-                        printk(KERN_INFO PFX "ACPI I/O at 0x%x\n",
-                                        acpi_regs_addr);
+                        pr_info("ACPI I/O at 0x%x\n", acpi_regs_addr);
                 }
 
                 pci_dev_put(dev);
@@ -853,14 +842,14 @@ static int longhaul_cpu_init(struct cpufreq_policy *policy)
                         longhaul_version = TYPE_LONGHAUL_V1;
         }
 
-        printk(KERN_INFO PFX "VIA %s CPU detected.  ", cpuname);
+        pr_info("VIA %s CPU detected.  ", cpuname);
         switch (longhaul_version) {
         case TYPE_LONGHAUL_V1:
         case TYPE_LONGHAUL_V2:
-                printk(KERN_CONT "Longhaul v%d supported.\n", longhaul_version);
+                pr_cont("Longhaul v%d supported\n", longhaul_version);
                 break;
         case TYPE_POWERSAVER:
-                printk(KERN_CONT "Powersaver supported.\n");
+                pr_cont("Powersaver supported\n");
                 break;
         };
 
@@ -889,15 +878,14 @@ static int longhaul_cpu_init(struct cpufreq_policy *policy)
         if (!(longhaul_flags & USE_ACPI_C3
              || longhaul_flags & USE_NORTHBRIDGE)
             && ((pr == NULL) || !(pr->flags.bm_control))) {
-                printk(KERN_ERR PFX
-                        "No ACPI support. Unsupported northbridge.\n");
+                pr_err("No ACPI support: Unsupported northbridge\n");
                 return -ENODEV;
         }
 
         if (longhaul_flags & USE_NORTHBRIDGE)
-                printk(KERN_INFO PFX "Using northbridge support.\n");
+                pr_info("Using northbridge support\n");
         if (longhaul_flags & USE_ACPI_C3)
-                printk(KERN_INFO PFX "Using ACPI support.\n");
+                pr_info("Using ACPI support\n");
 
         ret = longhaul_get_ranges();
         if (ret != 0)
@@ -934,20 +922,18 @@ static int __init longhaul_init(void)
                 return -ENODEV;
 
         if (!enable) {
-                printk(KERN_ERR PFX "Option \"enable\" not set. Aborting.\n");
+                pr_err("Option \"enable\" not set - Aborting\n");
                 return -ENODEV;
         }
 #ifdef CONFIG_SMP
         if (num_online_cpus() > 1) {
-                printk(KERN_ERR PFX "More than 1 CPU detected, "
-                                "longhaul disabled.\n");
+                pr_err("More than 1 CPU detected, longhaul disabled\n");
                 return -ENODEV;
         }
 #endif
 #ifdef CONFIG_X86_IO_APIC
         if (boot_cpu_has(X86_FEATURE_APIC)) {
-                printk(KERN_ERR PFX "APIC detected. Longhaul is currently "
-                                "broken in this configuration.\n");
+                pr_err("APIC detected. Longhaul is currently broken in this configuration.\n");
                 return -ENODEV;
         }
 #endif
@@ -955,7 +941,7 @@ static int __init longhaul_init(void)
         case 6 ... 9:
                 return cpufreq_register_driver(&longhaul_driver);
         case 10:
-                printk(KERN_ERR PFX "Use acpi-cpufreq driver for VIA C7\n");
+                pr_err("Use acpi-cpufreq driver for VIA C7\n");
         default:
                 ;
         }