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

Pull more power management updates from Rafael Wysocki:
 "These modify the Intel RAPL driver to allow it to use an MMIO
  interface to the hardware, make the int340X thermal driver provide
  such an interface for it, add Intel Ice Lake CPU IDs to the RAPL
  driver (these changes depend on the previously merged x86 arch
  changes), update cpufreq to use the PM QoS framework for managing the
  min and max frequency limits, and add update the imx-cpufreq-dt
  cpufreq driver to support i.MX8MN.

  Specifics:

   - Add MMIO interface support to the Intel RAPL power capping driver
     and update the int340X thermal driver to provide a RAPL MMIO
     interface (Zhang Rui, Stephen Rothwell).

   - Add Intel Ice Lake CPU IDs to the RAPL driver (Zhang Rui, Rajneesh
     Bhardwaj).

   - Make cpufreq use the PM QoS framework (instead of notifiers) for
     managing the min and max frequency constraints (Viresh Kumar).

   - Add i.MX8MN support to the imx-cpufreq-dt cpufreq driver (Anson
     Huang)"

* tag 'pm-5.3-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (27 commits)
  cpufreq: Make cpufreq_generic_init() return void
  intel_rapl: need linux/cpuhotplug.h for enum cpuhp_state
  powercap/rapl: Add Ice Lake NNPI support to RAPL driver
  powercap/intel_rapl: add support for ICX-D
  powercap/intel_rapl: add support for ICX
  powercap/intel_rapl: add support for IceLake desktop
  intel_rapl: Fix module autoloading issue
  int340X/processor_thermal_device: add support for MMIO RAPL
  intel_rapl: support two power limits for every RAPL domain
  intel_rapl: support 64 bit register
  intel_rapl: abstract RAPL common code
  intel_rapl: cleanup hardcoded MSR access
  intel_rapl: cleanup some functions
  intel_rapl: abstract register access operations
  intel_rapl: abstract register address
  intel_rapl: introduce struct rapl_if_private
  intel_rapl: introduce intel_rapl.h
  intel_rapl: remove hardcoded register index
  intel_rapl: use reg instead of msr
  cpufreq: imx-cpufreq-dt: Add i.MX8MN support
  ...

37 files changed, 1196 insertions, 699 deletions

diff --git a/Documentation/power/pm_qos_interface.rst b/Documentation/power/pm_qos_interface.rst
index 945fc6d760c9..69921f072ce1 100644
--- a/Documentation/power/pm_qos_interface.rst
+++ b/Documentation/power/pm_qos_interface.rst
@@ -129,7 +129,7 @@ int dev_pm_qos_remove_request(handle):
   and call the notification trees if the target was changed as a result of
   removing the request.
 
-s32 dev_pm_qos_read_value(device):
+s32 dev_pm_qos_read_value(device, type):
   Returns the aggregated value for a given device's constraints list.
 
 enum pm_qos_flags_status dev_pm_qos_flags(device, mask)
@@ -176,12 +176,14 @@ Notification mechanisms:
 
 The per-device PM QoS framework has a per-device notification tree.
 
-int dev_pm_qos_add_notifier(device, notifier):
-  Adds a notification callback function for the device.
+int dev_pm_qos_add_notifier(device, notifier, type):
+  Adds a notification callback function for the device for a particular request
+  type.
+
   The callback is called when the aggregated value of the device constraints list
-  is changed (for resume latency device PM QoS only).
+  is changed.
 
-int dev_pm_qos_remove_notifier(device, notifier):
+int dev_pm_qos_remove_notifier(device, notifier, type):
   Removes the notification callback function for the device.
 
 
diff --git a/MAINTAINERS b/MAINTAINERS
index 0d0d5c03f770..d51808468713 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12840,6 +12840,7 @@ F:	drivers/base/power/
 F:      include/linux/pm.h
 F:      include/linux/pm_*
 F:      include/linux/powercap.h
+F:      include/linux/intel_rapl.h
 F:      drivers/powercap/
 F:      kernel/configs/nopm.config
 
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 33c30c1e6a30..b063bc41b0a9 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1536,7 +1536,8 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
         if (ret)
                 genpd_free_dev_data(dev, gpd_data);
         else
-                dev_pm_qos_add_notifier(dev, &gpd_data->nb);
+                dev_pm_qos_add_notifier(dev, &gpd_data->nb,
+                                        DEV_PM_QOS_RESUME_LATENCY);
 
         return ret;
 }
@@ -1569,7 +1570,8 @@ static int genpd_remove_device(struct generic_pm_domain *genpd,
 
         pdd = dev->power.subsys_data->domain_data;
         gpd_data = to_gpd_data(pdd);
-        dev_pm_qos_remove_notifier(dev, &gpd_data->nb);
+        dev_pm_qos_remove_notifier(dev, &gpd_data->nb,
+                                   DEV_PM_QOS_RESUME_LATENCY);
 
         genpd_lock(genpd);
 
@@ -1597,7 +1599,7 @@ static int genpd_remove_device(struct generic_pm_domain *genpd,
 
  out:
         genpd_unlock(genpd);
-        dev_pm_qos_add_notifier(dev, &gpd_data->nb);
+        dev_pm_qos_add_notifier(dev, &gpd_data->nb, DEV_PM_QOS_RESUME_LATENCY);
 
         return ret;
 }
diff --git a/drivers/base/power/domain_governor.c b/drivers/base/power/domain_governor.c
index 3838045c9277..daa8c7689f7e 100644
--- a/drivers/base/power/domain_governor.c
+++ b/drivers/base/power/domain_governor.c
@@ -33,7 +33,7 @@ static int dev_update_qos_constraint(struct device *dev, void *data)
                  * take its current PM QoS constraint (that's the only thing
                  * known at this point anyway).
                  */
-                constraint_ns = dev_pm_qos_read_value(dev);
+                constraint_ns = dev_pm_qos_read_value(dev, DEV_PM_QOS_RESUME_LATENCY);
                 constraint_ns *= NSEC_PER_USEC;
         }
 
@@ -66,7 +66,7 @@ static bool default_suspend_ok(struct device *dev)
         td->constraint_changed = false;
         td->cached_suspend_ok = false;
         td->effective_constraint_ns = 0;
-        constraint_ns = __dev_pm_qos_read_value(dev);
+        constraint_ns = __dev_pm_qos_resume_latency(dev);
 
         spin_unlock_irqrestore(&dev->power.lock, flags);
 
diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index 6c91f8df1d59..6c90fd7e2ff8 100644
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@ -90,29 +90,49 @@ enum pm_qos_flags_status dev_pm_qos_flags(struct device *dev, s32 mask)
 EXPORT_SYMBOL_GPL(dev_pm_qos_flags);
 
 /**
- * __dev_pm_qos_read_value - Get PM QoS constraint for a given device.
+ * __dev_pm_qos_resume_latency - Get resume latency constraint for a given device.
  * @dev: Device to get the PM QoS constraint value for.
  *
  * This routine must be called with dev->power.lock held.
  */
-s32 __dev_pm_qos_read_value(struct device *dev)
+s32 __dev_pm_qos_resume_latency(struct device *dev)
 {
         lockdep_assert_held(&dev->power.lock);
 
-        return dev_pm_qos_raw_read_value(dev);
+        return dev_pm_qos_raw_resume_latency(dev);
 }
 
 /**
  * dev_pm_qos_read_value - Get PM QoS constraint for a given device (locked).
  * @dev: Device to get the PM QoS constraint value for.
+ * @type: QoS request type.
  */
-s32 dev_pm_qos_read_value(struct device *dev)
+s32 dev_pm_qos_read_value(struct device *dev, enum dev_pm_qos_req_type type)
 {
+        struct dev_pm_qos *qos = dev->power.qos;
         unsigned long flags;
         s32 ret;
 
         spin_lock_irqsave(&dev->power.lock, flags);
-        ret = __dev_pm_qos_read_value(dev);
+
+        switch (type) {
+        case DEV_PM_QOS_RESUME_LATENCY:
+                ret = IS_ERR_OR_NULL(qos) ? PM_QOS_RESUME_LATENCY_NO_CONSTRAINT
+                        : pm_qos_read_value(&qos->resume_latency);
+                break;
+        case DEV_PM_QOS_MIN_FREQUENCY:
+                ret = IS_ERR_OR_NULL(qos) ? PM_QOS_MIN_FREQUENCY_DEFAULT_VALUE
+                        : pm_qos_read_value(&qos->min_frequency);
+                break;
+        case DEV_PM_QOS_MAX_FREQUENCY:
+                ret = IS_ERR_OR_NULL(qos) ? PM_QOS_MAX_FREQUENCY_DEFAULT_VALUE
+                        : pm_qos_read_value(&qos->max_frequency);
+                break;
+        default:
+                WARN_ON(1);
+                ret = 0;
+        }
+
         spin_unlock_irqrestore(&dev->power.lock, flags);
 
         return ret;
@@ -149,6 +169,14 @@ static int apply_constraint(struct dev_pm_qos_request *req,
                         req->dev->power.set_latency_tolerance(req->dev, value);
                 }
                 break;
+        case DEV_PM_QOS_MIN_FREQUENCY:
+                ret = pm_qos_update_target(&qos->min_frequency,
+                                           &req->data.pnode, action, value);
+                break;
+        case DEV_PM_QOS_MAX_FREQUENCY:
+                ret = pm_qos_update_target(&qos->max_frequency,
+                                           &req->data.pnode, action, value);
+                break;
         case DEV_PM_QOS_FLAGS:
                 ret = pm_qos_update_flags(&qos->flags, &req->data.flr,
                                           action, value);
@@ -177,12 +205,11 @@ static int dev_pm_qos_constraints_allocate(struct device *dev)
         if (!qos)
                 return -ENOMEM;
 
-        n = kzalloc(sizeof(*n), GFP_KERNEL);
+        n = kzalloc(3 * sizeof(*n), GFP_KERNEL);
         if (!n) {
                 kfree(qos);
                 return -ENOMEM;
         }
-        BLOCKING_INIT_NOTIFIER_HEAD(n);
 
         c = &qos->resume_latency;
         plist_head_init(&c->list);
@@ -191,6 +218,7 @@ static int dev_pm_qos_constraints_allocate(struct device *dev)
         c->no_constraint_value = PM_QOS_RESUME_LATENCY_NO_CONSTRAINT;
         c->type = PM_QOS_MIN;
         c->notifiers = n;
+        BLOCKING_INIT_NOTIFIER_HEAD(n);
 
         c = &qos->latency_tolerance;
         plist_head_init(&c->list);
@@ -199,6 +227,24 @@ static int dev_pm_qos_constraints_allocate(struct device *dev)
         c->no_constraint_value = PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT;
         c->type = PM_QOS_MIN;
 
+        c = &qos->min_frequency;
+        plist_head_init(&c->list);
+        c->target_value = PM_QOS_MIN_FREQUENCY_DEFAULT_VALUE;
+        c->default_value = PM_QOS_MIN_FREQUENCY_DEFAULT_VALUE;
+        c->no_constraint_value = PM_QOS_MIN_FREQUENCY_DEFAULT_VALUE;
+        c->type = PM_QOS_MAX;
+        c->notifiers = ++n;
+        BLOCKING_INIT_NOTIFIER_HEAD(n);
+
+        c = &qos->max_frequency;
+        plist_head_init(&c->list);
+        c->target_value = PM_QOS_MAX_FREQUENCY_DEFAULT_VALUE;
+        c->default_value = PM_QOS_MAX_FREQUENCY_DEFAULT_VALUE;
+        c->no_constraint_value = PM_QOS_MAX_FREQUENCY_DEFAULT_VALUE;
+        c->type = PM_QOS_MIN;
+        c->notifiers = ++n;
+        BLOCKING_INIT_NOTIFIER_HEAD(n);
+
         INIT_LIST_HEAD(&qos->flags.list);
 
         spin_lock_irq(&dev->power.lock);
@@ -252,11 +298,25 @@ void dev_pm_qos_constraints_destroy(struct device *dev)
                 apply_constraint(req, PM_QOS_REMOVE_REQ, PM_QOS_DEFAULT_VALUE);
                 memset(req, 0, sizeof(*req));
         }
+
         c = &qos->latency_tolerance;
         plist_for_each_entry_safe(req, tmp, &c->list, data.pnode) {
                 apply_constraint(req, PM_QOS_REMOVE_REQ, PM_QOS_DEFAULT_VALUE);
                 memset(req, 0, sizeof(*req));
         }
+
+        c = &qos->min_frequency;
+        plist_for_each_entry_safe(req, tmp, &c->list, data.pnode) {
+                apply_constraint(req, PM_QOS_REMOVE_REQ, PM_QOS_MIN_FREQUENCY_DEFAULT_VALUE);
+                memset(req, 0, sizeof(*req));
+        }
+
+        c = &qos->max_frequency;
+        plist_for_each_entry_safe(req, tmp, &c->list, data.pnode) {
+                apply_constraint(req, PM_QOS_REMOVE_REQ, PM_QOS_MAX_FREQUENCY_DEFAULT_VALUE);
+                memset(req, 0, sizeof(*req));
+        }
+
         f = &qos->flags;
         list_for_each_entry_safe(req, tmp, &f->list, data.flr.node) {
                 apply_constraint(req, PM_QOS_REMOVE_REQ, PM_QOS_DEFAULT_VALUE);
@@ -368,6 +428,8 @@ static int __dev_pm_qos_update_request(struct dev_pm_qos_request *req,
         switch(req->type) {
         case DEV_PM_QOS_RESUME_LATENCY:
         case DEV_PM_QOS_LATENCY_TOLERANCE:
+        case DEV_PM_QOS_MIN_FREQUENCY:
+        case DEV_PM_QOS_MAX_FREQUENCY:
                 curr_value = req->data.pnode.prio;
                 break;
         case DEV_PM_QOS_FLAGS:
@@ -467,6 +529,7 @@ EXPORT_SYMBOL_GPL(dev_pm_qos_remove_request);
  *
  * @dev: target device for the constraint
  * @notifier: notifier block managed by caller.
+ * @type: request type.
  *
  * Will register the notifier into a notification chain that gets called
  * upon changes to the target value for the device.
@@ -474,7 +537,8 @@ EXPORT_SYMBOL_GPL(dev_pm_qos_remove_request);
  * If the device's constraints object doesn't exist when this routine is called,
  * it will be created (or error code will be returned if that fails).
  */
-int dev_pm_qos_add_notifier(struct device *dev, struct notifier_block *notifier)
+int dev_pm_qos_add_notifier(struct device *dev, struct notifier_block *notifier,
+                            enum dev_pm_qos_req_type type)
 {
         int ret = 0;
 
@@ -485,10 +549,28 @@ int dev_pm_qos_add_notifier(struct device *dev, struct notifier_block *notifier)
         else if (!dev->power.qos)
                 ret = dev_pm_qos_constraints_allocate(dev);
 
-        if (!ret)
+        if (ret)
+                goto unlock;
+
+        switch (type) {
+        case DEV_PM_QOS_RESUME_LATENCY:
                 ret = blocking_notifier_chain_register(dev->power.qos->resume_latency.notifiers,
                                                        notifier);
+                break;
+        case DEV_PM_QOS_MIN_FREQUENCY:
+                ret = blocking_notifier_chain_register(dev->power.qos->min_frequency.notifiers,
+                                                       notifier);
+                break;
+        case DEV_PM_QOS_MAX_FREQUENCY:
+                ret = blocking_notifier_chain_register(dev->power.qos->max_frequency.notifiers,
+                                                       notifier);
+                break;
+        default:
+                WARN_ON(1);
+                ret = -EINVAL;
+        }
 
+unlock:
         mutex_unlock(&dev_pm_qos_mtx);
         return ret;
 }
@@ -500,24 +582,44 @@ EXPORT_SYMBOL_GPL(dev_pm_qos_add_notifier);
  *
  * @dev: target device for the constraint
  * @notifier: notifier block to be removed.
+ * @type: request type.
  *
  * Will remove the notifier from the notification chain that gets called
  * upon changes to the target value.
  */
 int dev_pm_qos_remove_notifier(struct device *dev,
-                               struct notifier_block *notifier)
+                               struct notifier_block *notifier,
+                               enum dev_pm_qos_req_type type)
 {
-        int retval = 0;
+        int ret = 0;
 
         mutex_lock(&dev_pm_qos_mtx);
 
         /* Silently return if the constraints object is not present. */
-        if (!IS_ERR_OR_NULL(dev->power.qos))
-                retval = blocking_notifier_chain_unregister(dev->power.qos->resume_latency.notifiers,
-                                                            notifier);
+        if (IS_ERR_OR_NULL(dev->power.qos))
+                goto unlock;
+
+        switch (type) {
+        case DEV_PM_QOS_RESUME_LATENCY:
+                ret = blocking_notifier_chain_unregister(dev->power.qos->resume_latency.notifiers,
+                                                         notifier);
+                break;
+        case DEV_PM_QOS_MIN_FREQUENCY:
+                ret = blocking_notifier_chain_unregister(dev->power.qos->min_frequency.notifiers,
+                                                         notifier);
+                break;
+        case DEV_PM_QOS_MAX_FREQUENCY:
+                ret = blocking_notifier_chain_unregister(dev->power.qos->max_frequency.notifiers,
+                                                         notifier);
+                break;
+        default:
+                WARN_ON(1);
+                ret = -EINVAL;
+        }
 
+unlock:
         mutex_unlock(&dev_pm_qos_mtx);
-        return retval;
+        return ret;
 }
 EXPORT_SYMBOL_GPL(dev_pm_qos_remove_notifier);
 
@@ -577,6 +679,9 @@ static void __dev_pm_qos_drop_user_request(struct device *dev,
                 req = dev->power.qos->flags_req;
                 dev->power.qos->flags_req = NULL;
                 break;
+        default:
+                WARN_ON(1);
+                return;
         }
         __dev_pm_qos_remove_request(req);
         kfree(req);
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 952a1e7057c7..b75335508d2c 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -275,7 +275,7 @@ static int rpm_check_suspend_allowed(struct device *dev)
             || (dev->power.request_pending
                         && dev->power.request == RPM_REQ_RESUME))
                 retval = -EAGAIN;
-        else if (__dev_pm_qos_read_value(dev) == 0)
+        else if (__dev_pm_qos_resume_latency(dev) == 0)
                 retval = -EPERM;
         else if (dev->power.runtime_status == RPM_SUSPENDED)
                 retval = 1;
diff --git a/drivers/cpufreq/bmips-cpufreq.c b/drivers/cpufreq/bmips-cpufreq.c
index 56a4ebbf00e0..f7c23fa468f0 100644
--- a/drivers/cpufreq/bmips-cpufreq.c
+++ b/drivers/cpufreq/bmips-cpufreq.c
@@ -131,23 +131,18 @@ static int bmips_cpufreq_exit(struct cpufreq_policy *policy)
 static int bmips_cpufreq_init(struct cpufreq_policy *policy)
 {
         struct cpufreq_frequency_table *freq_table;
-        int ret;
 
         freq_table = bmips_cpufreq_get_freq_table(policy);
         if (IS_ERR(freq_table)) {
-                ret = PTR_ERR(freq_table);
-                pr_err("%s: couldn't determine frequency table (%d).\n",
-                        BMIPS_CPUFREQ_NAME, ret);
-                return ret;
+                pr_err("%s: couldn't determine frequency table (%ld).\n",
+                        BMIPS_CPUFREQ_NAME, PTR_ERR(freq_table));
+                return PTR_ERR(freq_table);
         }
 
-        ret = cpufreq_generic_init(policy, freq_table, TRANSITION_LATENCY);
-        if (ret)
-                bmips_cpufreq_exit(policy);
-        else
-                pr_info("%s: registered\n", BMIPS_CPUFREQ_NAME);
+        cpufreq_generic_init(policy, freq_table, TRANSITION_LATENCY);
+        pr_info("%s: registered\n", BMIPS_CPUFREQ_NAME);
 
-        return ret;
+        return 0;
 }
 
 static struct cpufreq_driver bmips_cpufreq_driver = {
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 0a9f675f2af4..8dda62367816 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -23,6 +23,7 @@
 #include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/pm_qos.h>
 #include <linux/slab.h>
 #include <linux/suspend.h>
 #include <linux/syscore_ops.h>
@@ -158,7 +159,7 @@ EXPORT_SYMBOL_GPL(arch_set_freq_scale);
  * - set policies transition latency
  * - policy->cpus with all possible CPUs
  */
-int cpufreq_generic_init(struct cpufreq_policy *policy,
+void cpufreq_generic_init(struct cpufreq_policy *policy,
                 struct cpufreq_frequency_table *table,
                 unsigned int transition_latency)
 {
@@ -170,8 +171,6 @@ int cpufreq_generic_init(struct cpufreq_policy *policy,
          * share the clock and voltage and clock.
          */
         cpumask_setall(policy->cpus);
-
-        return 0;
 }
 EXPORT_SYMBOL_GPL(cpufreq_generic_init);
 
@@ -714,23 +713,15 @@ static ssize_t show_scaling_cur_freq(struct cpufreq_policy *policy, char *buf)
 static ssize_t store_##file_name                                        \
 (struct cpufreq_policy *policy, const char *buf, size_t count)          \
 {                                                                       \
-        int ret, temp;                                                  \
-        struct cpufreq_policy new_policy;                               \
+        unsigned long val;                                              \
+        int ret;                                                        \
                                                                         \
-        memcpy(&new_policy, policy, sizeof(*policy));                   \
-        new_policy.min = policy->user_policy.min;                       \
-        new_policy.max = policy->user_policy.max;                       \
-                                                                        \
-        ret = sscanf(buf, "%u", &new_policy.object);                    \
+        ret = sscanf(buf, "%lu", &val);                                 \
         if (ret != 1)                                                   \
                 return -EINVAL;                                         \
                                                                         \
-        temp = new_policy.object;                                       \
-        ret = cpufreq_set_policy(policy, &new_policy);          \
-        if (!ret)                                                       \
-                policy->user_policy.object = temp;                      \
-                                                                        \
-        return ret ? ret : count;                                       \
+        ret = dev_pm_qos_update_request(policy->object##_freq_req, val);\
+        return ret >= 0 ? count : ret;                                  \
 }
 
 store_one(scaling_min_freq, min);
@@ -996,7 +987,7 @@ static void add_cpu_dev_symlink(struct cpufreq_policy *policy, unsigned int cpu)
 {
         struct device *dev = get_cpu_device(cpu);
 
-        if (!dev)
+        if (unlikely(!dev))
                 return;
 
         if (cpumask_test_and_set_cpu(cpu, policy->real_cpus))
@@ -1112,17 +1103,18 @@ static int cpufreq_add_policy_cpu(struct cpufreq_policy *policy, unsigned int cp
         return ret;
 }
 
-static void refresh_frequency_limits(struct cpufreq_policy *policy)
+void refresh_frequency_limits(struct cpufreq_policy *policy)
 {
-        struct cpufreq_policy new_policy = *policy;
-
-        pr_debug("updating policy for CPU %u\n", policy->cpu);
+        struct cpufreq_policy new_policy;
 
-        new_policy.min = policy->user_policy.min;
-        new_policy.max = policy->user_policy.max;
+        if (!policy_is_inactive(policy)) {
+                new_policy = *policy;
+                pr_debug("updating policy for CPU %u\n", policy->cpu);
 
-        cpufreq_set_policy(policy, &new_policy);
+                cpufreq_set_policy(policy, &new_policy);
+        }
 }
+EXPORT_SYMBOL(refresh_frequency_limits);
 
 static void handle_update(struct work_struct *work)
 {
@@ -1130,14 +1122,60 @@ static void handle_update(struct work_struct *work)
                 container_of(work, struct cpufreq_policy, update);
 
         pr_debug("handle_update for cpu %u called\n", policy->cpu);
+        down_write(&policy->rwsem);
         refresh_frequency_limits(policy);
+        up_write(&policy->rwsem);
+}
+
+static int cpufreq_notifier_min(struct notifier_block *nb, unsigned long freq,
+                                void *data)
+{
+        struct cpufreq_policy *policy = container_of(nb, struct cpufreq_policy, nb_min);
+
+        schedule_work(&policy->update);
+        return 0;
+}
+
+static int cpufreq_notifier_max(struct notifier_block *nb, unsigned long freq,
+                                void *data)
+{
+        struct cpufreq_policy *policy = container_of(nb, struct cpufreq_policy, nb_max);
+
+        schedule_work(&policy->update);
+        return 0;
+}
+
+static void cpufreq_policy_put_kobj(struct cpufreq_policy *policy)
+{
+        struct kobject *kobj;
+        struct completion *cmp;
+
+        down_write(&policy->rwsem);
+        cpufreq_stats_free_table(policy);
+        kobj = &policy->kobj;
+        cmp = &policy->kobj_unregister;
+        up_write(&policy->rwsem);
+        kobject_put(kobj);
+
+        /*
+         * We need to make sure that the underlying kobj is
+         * actually not referenced anymore by anybody before we
+         * proceed with unloading.
+         */
+        pr_debug("waiting for dropping of refcount\n");
+        wait_for_completion(cmp);
+        pr_debug("wait complete\n");
 }
 
 static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu)
 {
         struct cpufreq_policy *policy;
+        struct device *dev = get_cpu_device(cpu);
         int ret;
 
+        if (!dev)
+                return NULL;
+
         policy = kzalloc(sizeof(*policy), GFP_KERNEL);
         if (!policy)
                 return NULL;
@@ -1154,7 +1192,7 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu)
         ret = kobject_init_and_add(&policy->kobj, &ktype_cpufreq,
                                    cpufreq_global_kobject, "policy%u", cpu);
         if (ret) {
-                pr_err("%s: failed to init policy->kobj: %d\n", __func__, ret);
+                dev_err(dev, "%s: failed to init policy->kobj: %d\n", __func__, ret);
                 /*
                  * The entire policy object will be freed below, but the extra
                  * memory allocated for the kobject name needs to be freed by
@@ -1164,6 +1202,25 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu)
                 goto err_free_real_cpus;
         }
 
+        policy->nb_min.notifier_call = cpufreq_notifier_min;
+        policy->nb_max.notifier_call = cpufreq_notifier_max;
+
+        ret = dev_pm_qos_add_notifier(dev, &policy->nb_min,
+                                      DEV_PM_QOS_MIN_FREQUENCY);
+        if (ret) {
+                dev_err(dev, "Failed to register MIN QoS notifier: %d (%*pbl)\n",
+                        ret, cpumask_pr_args(policy->cpus));
+                goto err_kobj_remove;
+        }
+
+        ret = dev_pm_qos_add_notifier(dev, &policy->nb_max,
+                                      DEV_PM_QOS_MAX_FREQUENCY);
+        if (ret) {
+                dev_err(dev, "Failed to register MAX QoS notifier: %d (%*pbl)\n",
+                        ret, cpumask_pr_args(policy->cpus));
+                goto err_min_qos_notifier;
+        }
+
         INIT_LIST_HEAD(&policy->policy_list);
         init_rwsem(&policy->rwsem);
         spin_lock_init(&policy->transition_lock);
@@ -1174,6 +1231,11 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu)
         policy->cpu = cpu;
         return policy;
 
+err_min_qos_notifier:
+        dev_pm_qos_remove_notifier(dev, &policy->nb_min,
+                                   DEV_PM_QOS_MIN_FREQUENCY);
+err_kobj_remove:
+        cpufreq_policy_put_kobj(policy);
 err_free_real_cpus:
         free_cpumask_var(policy->real_cpus);
 err_free_rcpumask:
@@ -1186,30 +1248,9 @@ err_free_policy:
         return NULL;
 }
 
-static void cpufreq_policy_put_kobj(struct cpufreq_policy *policy)
-{
-        struct kobject *kobj;
-        struct completion *cmp;
-
-        down_write(&policy->rwsem);
-        cpufreq_stats_free_table(policy);
-        kobj = &policy->kobj;
-        cmp = &policy->kobj_unregister;
-        up_write(&policy->rwsem);
-        kobject_put(kobj);
-
-        /*
-         * We need to make sure that the underlying kobj is
-         * actually not referenced anymore by anybody before we
-         * proceed with unloading.
-         */
-        pr_debug("waiting for dropping of refcount\n");
-        wait_for_completion(cmp);
-        pr_debug("wait complete\n");
-}
-
 static void cpufreq_policy_free(struct cpufreq_policy *policy)
 {
+        struct device *dev = get_cpu_device(policy->cpu);
         unsigned long flags;
         int cpu;
 
@@ -1221,6 +1262,14 @@ static void cpufreq_policy_free(struct cpufreq_policy *policy)
                 per_cpu(cpufreq_cpu_data, cpu) = NULL;
         write_unlock_irqrestore(&cpufreq_driver_lock, flags);
 
+        dev_pm_qos_remove_notifier(dev, &policy->nb_max,
+                                   DEV_PM_QOS_MAX_FREQUENCY);
+        dev_pm_qos_remove_notifier(dev, &policy->nb_min,
+                                   DEV_PM_QOS_MIN_FREQUENCY);
+        dev_pm_qos_remove_request(policy->max_freq_req);
+        dev_pm_qos_remove_request(policy->min_freq_req);
+        kfree(policy->min_freq_req);
+
         cpufreq_policy_put_kobj(policy);
         free_cpumask_var(policy->real_cpus);
         free_cpumask_var(policy->related_cpus);
@@ -1298,16 +1347,50 @@ static int cpufreq_online(unsigned int cpu)
         cpumask_and(policy->cpus, policy->cpus, cpu_online_mask);
 
         if (new_policy) {
-                policy->user_policy.min = policy->min;
-                policy->user_policy.max = policy->max;
+                struct device *dev = get_cpu_device(cpu);
 
                 for_each_cpu(j, policy->related_cpus) {
                         per_cpu(cpufreq_cpu_data, j) = policy;
                         add_cpu_dev_symlink(policy, j);
                 }
-        } else {
-                policy->min = policy->user_policy.min;
-                policy->max = policy->user_policy.max;
+
+                policy->min_freq_req = kzalloc(2 * sizeof(*policy->min_freq_req),
+                                               GFP_KERNEL);
+                if (!policy->min_freq_req)
+                        goto out_destroy_policy;
+
+                ret = dev_pm_qos_add_request(dev, policy->min_freq_req,
+                                             DEV_PM_QOS_MIN_FREQUENCY,
+                                             policy->min);
+                if (ret < 0) {
+                        /*
+                         * So we don't call dev_pm_qos_remove_request() for an
+                         * uninitialized request.
+                         */
+                        kfree(policy->min_freq_req);
+                        policy->min_freq_req = NULL;
+
+                        dev_err(dev, "Failed to add min-freq constraint (%d)\n",
+                                ret);
+                        goto out_destroy_policy;
+                }
+
+                /*
+                 * This must be initialized right here to avoid calling
+                 * dev_pm_qos_remove_request() on uninitialized request in case
+                 * of errors.
+                 */
+                policy->max_freq_req = policy->min_freq_req + 1;
+
+                ret = dev_pm_qos_add_request(dev, policy->max_freq_req,
+                                             DEV_PM_QOS_MAX_FREQUENCY,
+                                             policy->max);
+                if (ret < 0) {
+                        policy->max_freq_req = NULL;
+                        dev_err(dev, "Failed to add max-freq constraint (%d)\n",
+                                ret);
+                        goto out_destroy_policy;
+                }
         }
 
         if (cpufreq_driver->get && has_target()) {
@@ -2280,6 +2363,7 @@ int cpufreq_set_policy(struct cpufreq_policy *policy,
                        struct cpufreq_policy *new_policy)
 {
         struct cpufreq_governor *old_gov;
+        struct device *cpu_dev = get_cpu_device(policy->cpu);
         int ret;
 
         pr_debug("setting new policy for CPU %u: %u - %u kHz\n",
@@ -2288,17 +2372,21 @@ int cpufreq_set_policy(struct cpufreq_policy *policy,
         memcpy(&new_policy->cpuinfo, &policy->cpuinfo, sizeof(policy->cpuinfo));
 
         /*
-        * This check works well when we store new min/max freq attributes,
-        * because new_policy is a copy of policy with one field updated.
-        */
-        if (new_policy->min > new_policy->max)
-                return -EINVAL;
+         * PM QoS framework collects all the requests from users and provide us
+         * the final aggregated value here.
+         */
+        new_policy->min = dev_pm_qos_read_value(cpu_dev, DEV_PM_QOS_MIN_FREQUENCY);
+        new_policy->max = dev_pm_qos_read_value(cpu_dev, DEV_PM_QOS_MAX_FREQUENCY);
 
         /* verify the cpu speed can be set within this limit */
         ret = cpufreq_driver->verify(new_policy);
         if (ret)
                 return ret;
 
+        /*
+         * The notifier-chain shall be removed once all the users of
+         * CPUFREQ_ADJUST are moved to use the QoS framework.
+         */
         /* adjust if necessary - all reasons */
         blocking_notifier_call_chain(&cpufreq_policy_notifier_list,
                         CPUFREQ_ADJUST, new_policy);
@@ -2377,10 +2465,9 @@ int cpufreq_set_policy(struct cpufreq_policy *policy,
  * @cpu: CPU to re-evaluate the policy for.
  *
  * Update the current frequency for the cpufreq policy of @cpu and use
- * cpufreq_set_policy() to re-apply the min and max limits saved in the
- * user_policy sub-structure of that policy, which triggers the evaluation
- * of policy notifiers and the cpufreq driver's ->verify() callback for the
- * policy in question, among other things.
+ * cpufreq_set_policy() to re-apply the min and max limits, which triggers the
+ * evaluation of policy notifiers and the cpufreq driver's ->verify() callback
+ * for the policy in question, among other things.
  */
 void cpufreq_update_policy(unsigned int cpu)
 {
@@ -2440,10 +2527,9 @@ static int cpufreq_boost_set_sw(int state)
                         break;
                 }
 
-                down_write(&policy->rwsem);
-                policy->user_policy.max = policy->max;
-                cpufreq_governor_limits(policy);
-                up_write(&policy->rwsem);
+                ret = dev_pm_qos_update_request(policy->max_freq_req, policy->max);
+                if (ret)
+                        break;
         }
 
         return ret;
diff --git a/drivers/cpufreq/davinci-cpufreq.c b/drivers/cpufreq/davinci-cpufreq.c
index 3de48ae60c29..297d23cad8b5 100644
--- a/drivers/cpufreq/davinci-cpufreq.c
+++ b/drivers/cpufreq/davinci-cpufreq.c
@@ -90,7 +90,8 @@ static int davinci_cpu_init(struct cpufreq_policy *policy)
          * Setting the latency to 2000 us to accommodate addition of drivers
          * to pre/post change notification list.
          */
-        return cpufreq_generic_init(policy, freq_table, 2000 * 1000);
+        cpufreq_generic_init(policy, freq_table, 2000 * 1000);
+        return 0;
 }
 
 static struct cpufreq_driver davinci_driver = {
diff --git a/drivers/cpufreq/imx-cpufreq-dt.c b/drivers/cpufreq/imx-cpufreq-dt.c
index b54fd26ea7df..4f85f3112784 100644
--- a/drivers/cpufreq/imx-cpufreq-dt.c
+++ b/drivers/cpufreq/imx-cpufreq-dt.c
@@ -44,10 +44,11 @@ static int imx_cpufreq_dt_probe(struct platform_device *pdev)
          * According to datasheet minimum speed grading is not supported for
          * consumer parts so clamp to 1 to avoid warning for "no OPPs"
          *
-         * Applies to 8mq and 8mm.
+         * Applies to i.MX8M series SoCs.
          */
         if (mkt_segment == 0 && speed_grade == 0 && (
                         of_machine_is_compatible("fsl,imx8mm") ||
+                        of_machine_is_compatible("fsl,imx8mn") ||
                         of_machine_is_compatible("fsl,imx8mq")))
                 speed_grade = 1;
 
diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index 47ccfa6b17b7..648a09a1778a 100644
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -190,14 +190,12 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index)
 
 static int imx6q_cpufreq_init(struct cpufreq_policy *policy)
 {
-        int ret;
-
         policy->clk = clks[ARM].clk;
-        ret = cpufreq_generic_init(policy, freq_table, transition_latency);
+        cpufreq_generic_init(policy, freq_table, transition_latency);
         policy->suspend_freq = max_freq;
         dev_pm_opp_of_register_em(policy->cpus);
 
-        return ret;
+        return 0;
 }
 
 static struct cpufreq_driver imx6q_cpufreq_driver = {
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index f2ff5de988c1..cc27d4c59dca 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -898,7 +898,6 @@ static void intel_pstate_update_policies(void)
 static void intel_pstate_update_max_freq(unsigned int cpu)
 {
         struct cpufreq_policy *policy = cpufreq_cpu_acquire(cpu);
-        struct cpufreq_policy new_policy;
         struct cpudata *cpudata;
 
         if (!policy)
@@ -908,11 +907,7 @@ static void intel_pstate_update_max_freq(unsigned int cpu)
         policy->cpuinfo.max_freq = global.turbo_disabled_mf ?
                         cpudata->pstate.max_freq : cpudata->pstate.turbo_freq;
 
-        memcpy(&new_policy, policy, sizeof(*policy));
-        new_policy.max = min(policy->user_policy.max, policy->cpuinfo.max_freq);
-        new_policy.min = min(policy->user_policy.min, new_policy.max);
-
-        cpufreq_set_policy(policy, &new_policy);
+        refresh_frequency_limits(policy);
 
         cpufreq_cpu_release(policy);
 }
diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c
index 7ab564c1f7ae..cb74bdc5baaa 100644
--- a/drivers/cpufreq/kirkwood-cpufreq.c
+++ b/drivers/cpufreq/kirkwood-cpufreq.c
@@ -85,7 +85,8 @@ static int kirkwood_cpufreq_target(struct cpufreq_policy *policy,
 /* Module init and exit code */
 static int kirkwood_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
-        return cpufreq_generic_init(policy, kirkwood_freq_table, 5000);
+        cpufreq_generic_init(policy, kirkwood_freq_table, 5000);
+        return 0;
 }
 
 static struct cpufreq_driver kirkwood_cpufreq_driver = {
diff --git a/drivers/cpufreq/loongson1-cpufreq.c b/drivers/cpufreq/loongson1-cpufreq.c
index 21c9ce8526c0..0ea88778882a 100644
--- a/drivers/cpufreq/loongson1-cpufreq.c
+++ b/drivers/cpufreq/loongson1-cpufreq.c
@@ -81,7 +81,7 @@ static int ls1x_cpufreq_init(struct cpufreq_policy *policy)
         struct device *cpu_dev = get_cpu_device(policy->cpu);
         struct cpufreq_frequency_table *freq_tbl;
         unsigned int pll_freq, freq;
-        int steps, i, ret;
+        int steps, i;
 
         pll_freq = clk_get_rate(cpufreq->pll_clk) / 1000;
 
@@ -103,11 +103,9 @@ static int ls1x_cpufreq_init(struct cpufreq_policy *policy)
         freq_tbl[i].frequency = CPUFREQ_TABLE_END;
 
         policy->clk = cpufreq->clk;
-        ret = cpufreq_generic_init(policy, freq_tbl, 0);
-        if (ret)
-                kfree(freq_tbl);
+        cpufreq_generic_init(policy, freq_tbl, 0);
 
-        return ret;
+        return 0;
 }
 
 static int ls1x_cpufreq_exit(struct cpufreq_policy *policy)
diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c
index da344696beed..890813e0bb76 100644
--- a/drivers/cpufreq/loongson2_cpufreq.c
+++ b/drivers/cpufreq/loongson2_cpufreq.c
@@ -95,7 +95,8 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)
         }
 
         policy->clk = cpuclk;
-        return cpufreq_generic_init(policy, &loongson2_clockmod_table[0], 0);
+        cpufreq_generic_init(policy, &loongson2_clockmod_table[0], 0);
+        return 0;
 }
 
 static int loongson2_cpufreq_exit(struct cpufreq_policy *policy)
diff --git a/drivers/cpufreq/maple-cpufreq.c b/drivers/cpufreq/maple-cpufreq.c
index f5220b3d4ec5..28d346062166 100644
--- a/drivers/cpufreq/maple-cpufreq.c
+++ b/drivers/cpufreq/maple-cpufreq.c
@@ -140,7 +140,8 @@ static unsigned int maple_cpufreq_get_speed(unsigned int cpu)
 
 static int maple_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
-        return cpufreq_generic_init(policy, maple_cpu_freqs, 12000);
+        cpufreq_generic_init(policy, maple_cpu_freqs, 12000);
+        return 0;
 }
 
 static struct cpufreq_driver maple_cpufreq_driver = {
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
index 29643f06a3c3..8d14b42a8c6f 100644
--- a/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@ -122,23 +122,18 @@ static int omap_cpu_init(struct cpufreq_policy *policy)
                         dev_err(mpu_dev,
                                 "%s: cpu%d: failed creating freq table[%d]\n",
                                 __func__, policy->cpu, result);
-                        goto fail;
+                        clk_put(policy->clk);
+                        return result;
                 }
         }
 
         atomic_inc_return(&freq_table_users);
 
         /* FIXME: what's the actual transition time? */
-        result = cpufreq_generic_init(policy, freq_table, 300 * 1000);
-        if (!result) {
-                dev_pm_opp_of_register_em(policy->cpus);
-                return 0;
-        }
+        cpufreq_generic_init(policy, freq_table, 300 * 1000);
+        dev_pm_opp_of_register_em(policy->cpus);
 
-        freq_table_free();
-fail:
-        clk_put(policy->clk);
-        return result;
+        return 0;
 }
 
 static int omap_cpu_exit(struct cpufreq_policy *policy)
diff --git a/drivers/cpufreq/pasemi-cpufreq.c b/drivers/cpufreq/pasemi-cpufreq.c
index 6b1e4abe3248..93f39a1d4c3d 100644
--- a/drivers/cpufreq/pasemi-cpufreq.c
+++ b/drivers/cpufreq/pasemi-cpufreq.c
@@ -196,7 +196,8 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
         policy->cur = pas_freqs[cur_astate].frequency;
         ppc_proc_freq = policy->cur * 1000ul;
 
-        return cpufreq_generic_init(policy, pas_freqs, get_gizmo_latency());
+        cpufreq_generic_init(policy, pas_freqs, get_gizmo_latency());
+        return 0;
 
 out_unmap_sdcpwr:
         iounmap(sdcpwr_mapbase);
diff --git a/drivers/cpufreq/pmac32-cpufreq.c b/drivers/cpufreq/pmac32-cpufreq.c
index 650104d729f3..73621bc11976 100644
--- a/drivers/cpufreq/pmac32-cpufreq.c
+++ b/drivers/cpufreq/pmac32-cpufreq.c
@@ -372,7 +372,8 @@ static int pmac_cpufreq_target(	struct cpufreq_policy *policy,
 
 static int pmac_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
-        return cpufreq_generic_init(policy, pmac_cpu_freqs, transition_latency);
+        cpufreq_generic_init(policy, pmac_cpu_freqs, transition_latency);
+        return 0;
 }
 
 static u32 read_gpio(struct device_node *np)
diff --git a/drivers/cpufreq/pmac64-cpufreq.c b/drivers/cpufreq/pmac64-cpufreq.c
index 1af3492a000d..d7542a106e6b 100644
--- a/drivers/cpufreq/pmac64-cpufreq.c
+++ b/drivers/cpufreq/pmac64-cpufreq.c
@@ -321,7 +321,8 @@ static unsigned int g5_cpufreq_get_speed(unsigned int cpu)
 
 static int g5_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
-        return cpufreq_generic_init(policy, g5_cpu_freqs, transition_latency);
+        cpufreq_generic_init(policy, g5_cpu_freqs, transition_latency);
+        return 0;
 }
 
 static struct cpufreq_driver g5_cpufreq_driver = {
diff --git a/drivers/cpufreq/s3c2416-cpufreq.c b/drivers/cpufreq/s3c2416-cpufreq.c
index f7ff1ed7fef1..106910351c41 100644
--- a/drivers/cpufreq/s3c2416-cpufreq.c
+++ b/drivers/cpufreq/s3c2416-cpufreq.c
@@ -447,21 +447,16 @@ static int s3c2416_cpufreq_driver_init(struct cpufreq_policy *policy)
         /* Datasheet says PLL stabalisation time must be at least 300us,
          * so but add some fudge. (reference in LOCKCON0 register description)
          */
-        ret = cpufreq_generic_init(policy, s3c_freq->freq_table,
+        cpufreq_generic_init(policy, s3c_freq->freq_table,
                         (500 * 1000) + s3c_freq->regulator_latency);
-        if (ret)
-                goto err_freq_table;
-
         register_reboot_notifier(&s3c2416_cpufreq_reboot_notifier);
 
         return 0;
 
-err_freq_table:
 #ifdef CONFIG_ARM_S3C2416_CPUFREQ_VCORESCALE
-        regulator_put(s3c_freq->vddarm);
 err_vddarm:
-#endif
         clk_put(s3c_freq->armclk);
+#endif
 err_armclk:
         clk_put(s3c_freq->hclk);
 err_hclk:
diff --git a/drivers/cpufreq/s3c64xx-cpufreq.c b/drivers/cpufreq/s3c64xx-cpufreq.c
index 37df2d892eb0..af0c00dabb22 100644
--- a/drivers/cpufreq/s3c64xx-cpufreq.c
+++ b/drivers/cpufreq/s3c64xx-cpufreq.c
@@ -144,7 +144,6 @@ out:
 
 static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)
 {
-        int ret;
         struct cpufreq_frequency_table *freq;
 
         if (policy->cpu != 0)
@@ -165,8 +164,7 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)
 #ifdef CONFIG_REGULATOR
         vddarm = regulator_get(NULL, "vddarm");
         if (IS_ERR(vddarm)) {
-                ret = PTR_ERR(vddarm);
-                pr_err("Failed to obtain VDDARM: %d\n", ret);
+                pr_err("Failed to obtain VDDARM: %ld\n", PTR_ERR(vddarm));
                 pr_err("Only frequency scaling available\n");
                 vddarm = NULL;
         } else {
@@ -196,16 +194,9 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)
          * the PLLs, which we don't currently) is ~300us worst case,
          * but add some fudge.
          */
-        ret = cpufreq_generic_init(policy, s3c64xx_freq_table,
+        cpufreq_generic_init(policy, s3c64xx_freq_table,
                         (500 * 1000) + regulator_latency);
-        if (ret != 0) {
-                pr_err("Failed to configure frequency table: %d\n",
-                       ret);
-                regulator_put(vddarm);
-                clk_put(policy->clk);
-        }
-
-        return ret;
+        return 0;
 }
 
 static struct cpufreq_driver s3c64xx_cpufreq_driver = {
diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c
index e5cb17d4be7b..5d10030f2560 100644
--- a/drivers/cpufreq/s5pv210-cpufreq.c
+++ b/drivers/cpufreq/s5pv210-cpufreq.c
@@ -541,7 +541,8 @@ static int s5pv210_cpu_init(struct cpufreq_policy *policy)
         s5pv210_dram_conf[1].freq = clk_get_rate(dmc1_clk);
 
         policy->suspend_freq = SLEEP_FREQ;
-        return cpufreq_generic_init(policy, s5pv210_freq_table, 40000);
+        cpufreq_generic_init(policy, s5pv210_freq_table, 40000);
+        return 0;
 
 out_dmc1:
         clk_put(dmc0_clk);
diff --git a/drivers/cpufreq/sa1100-cpufreq.c b/drivers/cpufreq/sa1100-cpufreq.c
index ab5cab93e638..5c075ef6adc0 100644
--- a/drivers/cpufreq/sa1100-cpufreq.c
+++ b/drivers/cpufreq/sa1100-cpufreq.c
@@ -181,7 +181,8 @@ static int sa1100_target(struct cpufreq_policy *policy, unsigned int ppcr)
 
 static int __init sa1100_cpu_init(struct cpufreq_policy *policy)
 {
-        return cpufreq_generic_init(policy, sa11x0_freq_table, 0);
+        cpufreq_generic_init(policy, sa11x0_freq_table, 0);
+        return 0;
 }
 
 static struct cpufreq_driver sa1100_driver __refdata = {
diff --git a/drivers/cpufreq/sa1110-cpufreq.c b/drivers/cpufreq/sa1110-cpufreq.c
index dab54e051c0e..d9d04d935b3a 100644
--- a/drivers/cpufreq/sa1110-cpufreq.c
+++ b/drivers/cpufreq/sa1110-cpufreq.c
@@ -303,7 +303,8 @@ static int sa1110_target(struct cpufreq_policy *policy, unsigned int ppcr)
 
 static int __init sa1110_cpu_init(struct cpufreq_policy *policy)
 {
-        return cpufreq_generic_init(policy, sa11x0_freq_table, 0);
+        cpufreq_generic_init(policy, sa11x0_freq_table, 0);
+        return 0;
 }
 
 /* sa1110_driver needs __refdata because it must remain after init registers
diff --git a/drivers/cpufreq/spear-cpufreq.c b/drivers/cpufreq/spear-cpufreq.c
index 4074e2615522..73bd8dc47074 100644
--- a/drivers/cpufreq/spear-cpufreq.c
+++ b/drivers/cpufreq/spear-cpufreq.c
@@ -153,8 +153,9 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy,
 static int spear_cpufreq_init(struct cpufreq_policy *policy)
 {
         policy->clk = spear_cpufreq.clk;
-        return cpufreq_generic_init(policy, spear_cpufreq.freq_tbl,
+        cpufreq_generic_init(policy, spear_cpufreq.freq_tbl,
                         spear_cpufreq.transition_latency);
+        return 0;
 }
 
 static struct cpufreq_driver spear_cpufreq_driver = {
diff --git a/drivers/cpufreq/tegra20-cpufreq.c b/drivers/cpufreq/tegra20-cpufreq.c
index 3c32cc7b0671..f84ecd22f488 100644
--- a/drivers/cpufreq/tegra20-cpufreq.c
+++ b/drivers/cpufreq/tegra20-cpufreq.c
@@ -118,17 +118,11 @@ static int tegra_target(struct cpufreq_policy *policy, unsigned int index)
 static int tegra_cpu_init(struct cpufreq_policy *policy)
 {
         struct tegra20_cpufreq *cpufreq = cpufreq_get_driver_data();
-        int ret;
 
         clk_prepare_enable(cpufreq->cpu_clk);
 
         /* FIXME: what's the actual transition time? */
-        ret = cpufreq_generic_init(policy, freq_table, 300 * 1000);
-        if (ret) {
-                clk_disable_unprepare(cpufreq->cpu_clk);
-                return ret;
-        }
-
+        cpufreq_generic_init(policy, freq_table, 300 * 1000);
         policy->clk = cpufreq->cpu_clk;
         policy->suspend_freq = freq_table[0].frequency;
         return 0;
diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
index 9fddf828a76f..2e3e14192bee 100644
--- a/drivers/cpuidle/governor.c
+++ b/drivers/cpuidle/governor.c
@@ -110,7 +110,7 @@ int cpuidle_governor_latency_req(unsigned int cpu)
 {
         int global_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY);
         struct device *device = get_cpu_device(cpu);
-        int device_req = dev_pm_qos_raw_read_value(device);
+        int device_req = dev_pm_qos_raw_resume_latency(device);
 
         return device_req < global_req ? device_req : global_req;
 }
diff --git a/drivers/powercap/Kconfig b/drivers/powercap/Kconfig
index 42d3798c88f0..dc1c1381d7fa 100644
--- a/drivers/powercap/Kconfig
+++ b/drivers/powercap/Kconfig
@@ -16,14 +16,17 @@ menuconfig POWERCAP
 
 if POWERCAP
 # Client driver configurations go here.
+config INTEL_RAPL_CORE
+        tristate
+
 config INTEL_RAPL
-        tristate "Intel RAPL Support"
+        tristate "Intel RAPL Support via MSR Interface"
         depends on X86 && IOSF_MBI
-        default n
+        select INTEL_RAPL_CORE
         ---help---
           This enables support for the Intel Running Average Power Limit (RAPL)
-          technology which allows power limits to be enforced and monitored on
-          modern Intel processors (Sandy Bridge and later).
+          technology via MSR interface, which allows power limits to be enforced
+          and monitored on modern Intel processors (Sandy Bridge and later).
 
           In RAPL, the platform level settings are divided into domains for
           fine grained control. These domains include processor package, DRAM
diff --git a/drivers/powercap/Makefile b/drivers/powercap/Makefile
index 81c8ccaba6e7..7255c94ec61c 100644
--- a/drivers/powercap/Makefile
+++ b/drivers/powercap/Makefile
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_POWERCAP)  += powercap_sys.o
-obj-$(CONFIG_INTEL_RAPL) += intel_rapl.o
+obj-$(CONFIG_INTEL_RAPL_CORE) += intel_rapl_common.o
+obj-$(CONFIG_INTEL_RAPL) += intel_rapl_msr.o
 obj-$(CONFIG_IDLE_INJECT) += idle_inject.o
diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl_common.c
index 8692f6b79f93..9fd6dd342169 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Intel Running Average Power Limit (RAPL) Driver
- * Copyright (c) 2013, Intel Corporation.
+ * Common code for Intel Running Average Power Limit (RAPL) support.
+ * Copyright (c) 2019, Intel Corporation.
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
@@ -18,9 +18,11 @@
 #include <linux/cpu.h>
 #include <linux/powercap.h>
 #include <linux/suspend.h>
-#include <asm/iosf_mbi.h>
+#include <linux/intel_rapl.h>
+#include <linux/processor.h>
+#include <linux/platform_device.h>
 
-#include <asm/processor.h>
+#include <asm/iosf_mbi.h>
 #include <asm/cpu_device_id.h>
 #include <asm/intel-family.h>
 
@@ -37,8 +39,8 @@
 #define POWER_LIMIT2_MASK       (0x7FFFULL<<32)
 #define POWER_LIMIT2_ENABLE     BIT_ULL(47)
 #define POWER_LIMIT2_CLAMP      BIT_ULL(48)
-#define POWER_PACKAGE_LOCK      BIT_ULL(63)
-#define POWER_PP_LOCK           BIT(31)
+#define POWER_HIGH_LOCK         BIT_ULL(63)
+#define POWER_LOW_LOCK          BIT(31)
 
 #define TIME_WINDOW1_MASK       (0x7FULL<<17)
 #define TIME_WINDOW2_MASK       (0x7FULL<<49)
@@ -61,143 +63,38 @@
 #define PP_POLICY_MASK         0x1F
 
 /* Non HW constants */
-#define RAPL_PRIMITIVE_DERIVED       BIT(1) /* not from raw data */
+#define RAPL_PRIMITIVE_DERIVED       BIT(1)     /* not from raw data */
 #define RAPL_PRIMITIVE_DUMMY         BIT(2)
 
 #define TIME_WINDOW_MAX_MSEC 40000
 #define TIME_WINDOW_MIN_MSEC 250
-#define ENERGY_UNIT_SCALE    1000 /* scale from driver unit to powercap unit */
+#define ENERGY_UNIT_SCALE    1000       /* scale from driver unit to powercap unit */
 enum unit_type {
-        ARBITRARY_UNIT, /* no translation */
+        ARBITRARY_UNIT,         /* no translation */
         POWER_UNIT,
         ENERGY_UNIT,
         TIME_UNIT,
 };
 
-enum rapl_domain_type {
-        RAPL_DOMAIN_PACKAGE, /* entire package/socket */
-        RAPL_DOMAIN_PP0, /* core power plane */
-        RAPL_DOMAIN_PP1, /* graphics uncore */
-        RAPL_DOMAIN_DRAM,/* DRAM control_type */
-        RAPL_DOMAIN_PLATFORM, /* PSys control_type */
-        RAPL_DOMAIN_MAX,
-};
-
-enum rapl_domain_msr_id {
-        RAPL_DOMAIN_MSR_LIMIT,
-        RAPL_DOMAIN_MSR_STATUS,
-        RAPL_DOMAIN_MSR_PERF,
-        RAPL_DOMAIN_MSR_POLICY,
-        RAPL_DOMAIN_MSR_INFO,
-        RAPL_DOMAIN_MSR_MAX,
-};
-
 /* per domain data, some are optional */
-enum rapl_primitives {
-        ENERGY_COUNTER,
-        POWER_LIMIT1,
-        POWER_LIMIT2,
-        FW_LOCK,
-
-        PL1_ENABLE,  /* power limit 1, aka long term */
-        PL1_CLAMP,   /* allow frequency to go below OS request */
-        PL2_ENABLE,  /* power limit 2, aka short term, instantaneous */
-        PL2_CLAMP,
-
-        TIME_WINDOW1, /* long term */
-        TIME_WINDOW2, /* short term */
-        THERMAL_SPEC_POWER,
-        MAX_POWER,
-
-        MIN_POWER,
-        MAX_TIME_WINDOW,
-        THROTTLED_TIME,
-        PRIORITY_LEVEL,
-
-        /* below are not raw primitive data */
-        AVERAGE_POWER,
-        NR_RAPL_PRIMITIVES,
-};
-
 #define NR_RAW_PRIMITIVES (NR_RAPL_PRIMITIVES - 2)
 
-/* Can be expanded to include events, etc.*/
-struct rapl_domain_data {
-        u64 primitives[NR_RAPL_PRIMITIVES];
-        unsigned long timestamp;
-};
-
-struct msrl_action {
-        u32 msr_no;
-        u64 clear_mask;
-        u64 set_mask;
-        int err;
-};
-
 #define DOMAIN_STATE_INACTIVE           BIT(0)
 #define DOMAIN_STATE_POWER_LIMIT_SET    BIT(1)
 #define DOMAIN_STATE_BIOS_LOCKED        BIT(2)
 
-#define NR_POWER_LIMITS (2)
-struct rapl_power_limit {
-        struct powercap_zone_constraint *constraint;
-        int prim_id; /* primitive ID used to enable */
-        struct rapl_domain *domain;
-        const char *name;
-        u64 last_power_limit;
-};
-
 static const char pl1_name[] = "long_term";
 static const char pl2_name[] = "short_term";
 
-struct rapl_package;
-struct rapl_domain {
-        const char *name;
-        enum rapl_domain_type id;
-        int msrs[RAPL_DOMAIN_MSR_MAX];
-        struct powercap_zone power_zone;
-        struct rapl_domain_data rdd;
-        struct rapl_power_limit rpl[NR_POWER_LIMITS];
-        u64 attr_map; /* track capabilities */
-        unsigned int state;
-        unsigned int domain_energy_unit;
-        struct rapl_package *rp;
-};
 #define power_zone_to_rapl_domain(_zone) \
         container_of(_zone, struct rapl_domain, power_zone)
 
-/* maximum rapl package domain name: package-%d-die-%d */
-#define PACKAGE_DOMAIN_NAME_LENGTH 30
-
-
-/* Each rapl package contains multiple domains, these are the common
- * data across RAPL domains within a package.
- */
-struct rapl_package {
-        unsigned int id; /* logical die id, equals physical 1-die systems */
-        unsigned int nr_domains;
-        unsigned long domain_map; /* bit map of active domains */
-        unsigned int power_unit;
-        unsigned int energy_unit;
-        unsigned int time_unit;
-        struct rapl_domain *domains; /* array of domains, sized at runtime */
-        struct powercap_zone *power_zone; /* keep track of parent zone */
-        unsigned long power_limit_irq; /* keep track of package power limit
-                                        * notify interrupt enable status.
-                                        */
-        struct list_head plist;
-        int lead_cpu; /* one active cpu per package for access */
-        /* Track active cpus */
-        struct cpumask cpumask;
-        char name[PACKAGE_DOMAIN_NAME_LENGTH];
-};
-
 struct rapl_defaults {
         u8 floor_freq_reg_addr;
         int (*check_unit)(struct rapl_package *rp, int cpu);
         void (*set_floor_freq)(struct rapl_domain *rd, bool mode);
         u64 (*compute_time_window)(struct rapl_package *rp, u64 val,
-                                bool to_raw);
+                                    bool to_raw);
         unsigned int dram_domain_energy_unit;
 };
 static struct rapl_defaults *rapl_defaults;
@@ -216,7 +113,7 @@ struct rapl_primitive_info {
         const char *name;
         u64 mask;
         int shift;
-        enum rapl_domain_msr_id id;
+        enum rapl_domain_reg_id id;
         enum unit_type unit;
         u32 flag;
 };
@@ -232,19 +129,18 @@ struct rapl_primitive_info {
 
 static void rapl_init_domains(struct rapl_package *rp);
 static int rapl_read_data_raw(struct rapl_domain *rd,
-                        enum rapl_primitives prim,
-                        bool xlate, u64 *data);
+                              enum rapl_primitives prim,
+                              bool xlate, u64 *data);
 static int rapl_write_data_raw(struct rapl_domain *rd,
-                        enum rapl_primitives prim,
-                        unsigned long long value);
+                               enum rapl_primitives prim,
+                               unsigned long long value);
 static u64 rapl_unit_xlate(struct rapl_domain *rd,
-                        enum unit_type type, u64 value,
-                        int to_raw);
+                           enum unit_type type, u64 value, int to_raw);
 static void package_power_limit_irq_save(struct rapl_package *rp);
 
-static LIST_HEAD(rapl_packages); /* guarded by CPU hotplug lock */
+static LIST_HEAD(rapl_packages);        /* guarded by CPU hotplug lock */
 
-static const char * const rapl_domain_names[] = {
+static const char *const rapl_domain_names[] = {
         "package",
         "core",
         "uncore",
@@ -252,24 +148,8 @@ static const char * const rapl_domain_names[] = {
         "psys",
 };
 
-static struct powercap_control_type *control_type; /* PowerCap Controller */
-static struct rapl_domain *platform_rapl_domain; /* Platform (PSys) domain */
-
-/* caller to ensure CPU hotplug lock is held */
-static struct rapl_package *rapl_find_package_domain(int cpu)
-{
-        int id = topology_logical_die_id(cpu);
-        struct rapl_package *rp;
-
-        list_for_each_entry(rp, &rapl_packages, plist) {
-                if (rp->id == id)
-                        return rp;
-        }
-
-        return NULL;
-}
-
-static int get_energy_counter(struct powercap_zone *power_zone, u64 *energy_raw)
+static int get_energy_counter(struct powercap_zone *power_zone,
+                              u64 *energy_raw)
 {
         struct rapl_domain *rd;
         u64 energy_now;
@@ -368,50 +248,49 @@ static int get_domain_enable(struct powercap_zone *power_zone, bool *mode)
 static const struct powercap_zone_ops zone_ops[] = {
         /* RAPL_DOMAIN_PACKAGE */
         {
-                .get_energy_uj = get_energy_counter,
-                .get_max_energy_range_uj = get_max_energy_counter,
-                .release = release_zone,
-                .set_enable = set_domain_enable,
-                .get_enable = get_domain_enable,
-        },
+         .get_energy_uj = get_energy_counter,
+         .get_max_energy_range_uj = get_max_energy_counter,
+         .release = release_zone,
+         .set_enable = set_domain_enable,
+         .get_enable = get_domain_enable,
+         },
         /* RAPL_DOMAIN_PP0 */
         {
-                .get_energy_uj = get_energy_counter,
-                .get_max_energy_range_uj = get_max_energy_counter,
-                .release = release_zone,
-                .set_enable = set_domain_enable,
-                .get_enable = get_domain_enable,
-        },
+         .get_energy_uj = get_energy_counter,
+         .get_max_energy_range_uj = get_max_energy_counter,
+         .release = release_zone,
+         .set_enable = set_domain_enable,
+         .get_enable = get_domain_enable,
+         },
         /* RAPL_DOMAIN_PP1 */
         {
-                .get_energy_uj = get_energy_counter,
-                .get_max_energy_range_uj = get_max_energy_counter,
-                .release = release_zone,
-                .set_enable = set_domain_enable,
-                .get_enable = get_domain_enable,
-        },
+         .get_energy_uj = get_energy_counter,
+         .get_max_energy_range_uj = get_max_energy_counter,
+         .release = release_zone,
+         .set_enable = set_domain_enable,
+         .get_enable = get_domain_enable,
+         },
         /* RAPL_DOMAIN_DRAM */
         {
-                .get_energy_uj = get_energy_counter,
-                .get_max_energy_range_uj = get_max_energy_counter,
-                .release = release_zone,
-                .set_enable = set_domain_enable,
-                .get_enable = get_domain_enable,
-        },
+         .get_energy_uj = get_energy_counter,
+         .get_max_energy_range_uj = get_max_energy_counter,
+         .release = release_zone,
+         .set_enable = set_domain_enable,
+         .get_enable = get_domain_enable,
+         },
         /* RAPL_DOMAIN_PLATFORM */
         {
-                .get_energy_uj = get_energy_counter,
-                .get_max_energy_range_uj = get_max_energy_counter,
-                .release = release_zone,
-                .set_enable = set_domain_enable,
-                .get_enable = get_domain_enable,
-        },
+         .get_energy_uj = get_energy_counter,
+         .get_max_energy_range_uj = get_max_energy_counter,
+         .release = release_zone,
+         .set_enable = set_domain_enable,
+         .get_enable = get_domain_enable,
+         },
 };
 
-
 /*
  * Constraint index used by powercap can be different than power limit (PL)
- * index in that some  PLs maybe missing due to non-existant MSRs. So we
+ * index in that some  PLs maybe missing due to non-existent MSRs. So we
  * need to convert here by finding the valid PLs only (name populated).
  */
 static int contraint_to_pl(struct rapl_domain *rd, int cid)
@@ -430,7 +309,7 @@ static int contraint_to_pl(struct rapl_domain *rd, int cid)
 }
 
 static int set_power_limit(struct powercap_zone *power_zone, int cid,
-                        u64 power_limit)
+                           u64 power_limit)
 {
         struct rapl_domain *rd;
         struct rapl_package *rp;
@@ -448,8 +327,8 @@ static int set_power_limit(struct powercap_zone *power_zone, int cid,
         rp = rd->rp;
 
         if (rd->state & DOMAIN_STATE_BIOS_LOCKED) {
-                dev_warn(&power_zone->dev, "%s locked by BIOS, monitoring only\n",
-                        rd->name);
+                dev_warn(&power_zone->dev,
+                         "%s locked by BIOS, monitoring only\n", rd->name);
                 ret = -EACCES;
                 goto set_exit;
         }
@@ -472,7 +351,7 @@ set_exit:
 }
 
 static int get_current_power_limit(struct powercap_zone *power_zone, int cid,
-                                        u64 *data)
+                                   u64 *data)
 {
         struct rapl_domain *rd;
         u64 val;
@@ -511,7 +390,7 @@ get_exit:
 }
 
 static int set_time_window(struct powercap_zone *power_zone, int cid,
-                                                                u64 window)
+                           u64 window)
 {
         struct rapl_domain *rd;
         int ret = 0;
@@ -541,7 +420,8 @@ set_time_exit:
         return ret;
 }
 
-static int get_time_window(struct powercap_zone *power_zone, int cid, u64 *data)
+static int get_time_window(struct powercap_zone *power_zone, int cid,
+                           u64 *data)
 {
         struct rapl_domain *rd;
         u64 val;
@@ -576,7 +456,8 @@ get_time_exit:
         return ret;
 }
 
-static const char *get_constraint_name(struct powercap_zone *power_zone, int cid)
+static const char *get_constraint_name(struct powercap_zone *power_zone,
+                                       int cid)
 {
         struct rapl_domain *rd;
         int id;
@@ -589,9 +470,7 @@ static const char *get_constraint_name(struct powercap_zone *power_zone, int cid
         return NULL;
 }
 
-
-static int get_max_power(struct powercap_zone *power_zone, int id,
-                                        u64 *data)
+static int get_max_power(struct powercap_zone *power_zone, int id, u64 *data)
 {
         struct rapl_domain *rd;
         u64 val;
@@ -633,73 +512,43 @@ static const struct powercap_zone_constraint_ops constraint_ops = {
 /* called after domain detection and package level data are set */
 static void rapl_init_domains(struct rapl_package *rp)
 {
-        int i;
+        enum rapl_domain_type i;
+        enum rapl_domain_reg_id j;
         struct rapl_domain *rd = rp->domains;
 
         for (i = 0; i < RAPL_DOMAIN_MAX; i++) {
                 unsigned int mask = rp->domain_map & (1 << i);
-                switch (mask) {
-                case BIT(RAPL_DOMAIN_PACKAGE):
-                        rd->name = rapl_domain_names[RAPL_DOMAIN_PACKAGE];
-                        rd->id = RAPL_DOMAIN_PACKAGE;
-                        rd->msrs[0] = MSR_PKG_POWER_LIMIT;
-                        rd->msrs[1] = MSR_PKG_ENERGY_STATUS;
-                        rd->msrs[2] = MSR_PKG_PERF_STATUS;
-                        rd->msrs[3] = 0;
-                        rd->msrs[4] = MSR_PKG_POWER_INFO;
-                        rd->rpl[0].prim_id = PL1_ENABLE;
-                        rd->rpl[0].name = pl1_name;
+
+                if (!mask)
+                        continue;
+
+                rd->rp = rp;
+                rd->name = rapl_domain_names[i];
+                rd->id = i;
+                rd->rpl[0].prim_id = PL1_ENABLE;
+                rd->rpl[0].name = pl1_name;
+                /* some domain may support two power limits */
+                if (rp->priv->limits[i] == 2) {
                         rd->rpl[1].prim_id = PL2_ENABLE;
                         rd->rpl[1].name = pl2_name;
-                        break;
-                case BIT(RAPL_DOMAIN_PP0):
-                        rd->name = rapl_domain_names[RAPL_DOMAIN_PP0];
-                        rd->id = RAPL_DOMAIN_PP0;
-                        rd->msrs[0] = MSR_PP0_POWER_LIMIT;
-                        rd->msrs[1] = MSR_PP0_ENERGY_STATUS;
-                        rd->msrs[2] = 0;
-                        rd->msrs[3] = MSR_PP0_POLICY;
-                        rd->msrs[4] = 0;
-                        rd->rpl[0].prim_id = PL1_ENABLE;
-                        rd->rpl[0].name = pl1_name;
-                        break;
-                case BIT(RAPL_DOMAIN_PP1):
-                        rd->name = rapl_domain_names[RAPL_DOMAIN_PP1];
-                        rd->id = RAPL_DOMAIN_PP1;
-                        rd->msrs[0] = MSR_PP1_POWER_LIMIT;
-                        rd->msrs[1] = MSR_PP1_ENERGY_STATUS;
-                        rd->msrs[2] = 0;
-                        rd->msrs[3] = MSR_PP1_POLICY;
-                        rd->msrs[4] = 0;
-                        rd->rpl[0].prim_id = PL1_ENABLE;
-                        rd->rpl[0].name = pl1_name;
-                        break;
-                case BIT(RAPL_DOMAIN_DRAM):
-                        rd->name = rapl_domain_names[RAPL_DOMAIN_DRAM];
-                        rd->id = RAPL_DOMAIN_DRAM;
-                        rd->msrs[0] = MSR_DRAM_POWER_LIMIT;
-                        rd->msrs[1] = MSR_DRAM_ENERGY_STATUS;
-                        rd->msrs[2] = MSR_DRAM_PERF_STATUS;
-                        rd->msrs[3] = 0;
-                        rd->msrs[4] = MSR_DRAM_POWER_INFO;
-                        rd->rpl[0].prim_id = PL1_ENABLE;
-                        rd->rpl[0].name = pl1_name;
+                }
+
+                for (j = 0; j < RAPL_DOMAIN_REG_MAX; j++)
+                        rd->regs[j] = rp->priv->regs[i][j];
+
+                if (i == RAPL_DOMAIN_DRAM) {
                         rd->domain_energy_unit =
-                                rapl_defaults->dram_domain_energy_unit;
+                            rapl_defaults->dram_domain_energy_unit;
                         if (rd->domain_energy_unit)
                                 pr_info("DRAM domain energy unit %dpj\n",
                                         rd->domain_energy_unit);
-                        break;
-                }
-                if (mask) {
-                        rd->rp = rp;
-                        rd++;
                 }
+                rd++;
         }
 }
 
 static u64 rapl_unit_xlate(struct rapl_domain *rd, enum unit_type type,
-                        u64 value, int to_raw)
+                           u64 value, int to_raw)
 {
         u64 units = 1;
         struct rapl_package *rp = rd->rp;
@@ -736,40 +585,40 @@ static u64 rapl_unit_xlate(struct rapl_domain *rd, enum unit_type type,
 static struct rapl_primitive_info rpi[] = {
         /* name, mask, shift, msr index, unit divisor */
         PRIMITIVE_INFO_INIT(ENERGY_COUNTER, ENERGY_STATUS_MASK, 0,
-                                RAPL_DOMAIN_MSR_STATUS, ENERGY_UNIT, 0),
+                            RAPL_DOMAIN_REG_STATUS, ENERGY_UNIT, 0),
         PRIMITIVE_INFO_INIT(POWER_LIMIT1, POWER_LIMIT1_MASK, 0,
-                                RAPL_DOMAIN_MSR_LIMIT, POWER_UNIT, 0),
+                            RAPL_DOMAIN_REG_LIMIT, POWER_UNIT, 0),
         PRIMITIVE_INFO_INIT(POWER_LIMIT2, POWER_LIMIT2_MASK, 32,
-                                RAPL_DOMAIN_MSR_LIMIT, POWER_UNIT, 0),
-        PRIMITIVE_INFO_INIT(FW_LOCK, POWER_PP_LOCK, 31,
-                                RAPL_DOMAIN_MSR_LIMIT, ARBITRARY_UNIT, 0),
+                            RAPL_DOMAIN_REG_LIMIT, POWER_UNIT, 0),
+        PRIMITIVE_INFO_INIT(FW_LOCK, POWER_LOW_LOCK, 31,
+                            RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
         PRIMITIVE_INFO_INIT(PL1_ENABLE, POWER_LIMIT1_ENABLE, 15,
-                                RAPL_DOMAIN_MSR_LIMIT, ARBITRARY_UNIT, 0),
+                            RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
         PRIMITIVE_INFO_INIT(PL1_CLAMP, POWER_LIMIT1_CLAMP, 16,
-                                RAPL_DOMAIN_MSR_LIMIT, ARBITRARY_UNIT, 0),
+                            RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
         PRIMITIVE_INFO_INIT(PL2_ENABLE, POWER_LIMIT2_ENABLE, 47,
-                                RAPL_DOMAIN_MSR_LIMIT, ARBITRARY_UNIT, 0),
+                            RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
         PRIMITIVE_INFO_INIT(PL2_CLAMP, POWER_LIMIT2_CLAMP, 48,
-                                RAPL_DOMAIN_MSR_LIMIT, ARBITRARY_UNIT, 0),
+                            RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
         PRIMITIVE_INFO_INIT(TIME_WINDOW1, TIME_WINDOW1_MASK, 17,
-                                RAPL_DOMAIN_MSR_LIMIT, TIME_UNIT, 0),
+                            RAPL_DOMAIN_REG_LIMIT, TIME_UNIT, 0),
         PRIMITIVE_INFO_INIT(TIME_WINDOW2, TIME_WINDOW2_MASK, 49,
-                                RAPL_DOMAIN_MSR_LIMIT, TIME_UNIT, 0),
+                            RAPL_DOMAIN_REG_LIMIT, TIME_UNIT, 0),
         PRIMITIVE_INFO_INIT(THERMAL_SPEC_POWER, POWER_INFO_THERMAL_SPEC_MASK,
-                                0, RAPL_DOMAIN_MSR_INFO, POWER_UNIT, 0),
+                            0, RAPL_DOMAIN_REG_INFO, POWER_UNIT, 0),
         PRIMITIVE_INFO_INIT(MAX_POWER, POWER_INFO_MAX_MASK, 32,
-                                RAPL_DOMAIN_MSR_INFO, POWER_UNIT, 0),
+                            RAPL_DOMAIN_REG_INFO, POWER_UNIT, 0),
         PRIMITIVE_INFO_INIT(MIN_POWER, POWER_INFO_MIN_MASK, 16,
-                                RAPL_DOMAIN_MSR_INFO, POWER_UNIT, 0),
+                            RAPL_DOMAIN_REG_INFO, POWER_UNIT, 0),
         PRIMITIVE_INFO_INIT(MAX_TIME_WINDOW, POWER_INFO_MAX_TIME_WIN_MASK, 48,
-                                RAPL_DOMAIN_MSR_INFO, TIME_UNIT, 0),
+                            RAPL_DOMAIN_REG_INFO, TIME_UNIT, 0),
         PRIMITIVE_INFO_INIT(THROTTLED_TIME, PERF_STATUS_THROTTLE_TIME_MASK, 0,
-                                RAPL_DOMAIN_MSR_PERF, TIME_UNIT, 0),
+                            RAPL_DOMAIN_REG_PERF, TIME_UNIT, 0),
         PRIMITIVE_INFO_INIT(PRIORITY_LEVEL, PP_POLICY_MASK, 0,
-                                RAPL_DOMAIN_MSR_POLICY, ARBITRARY_UNIT, 0),
+                            RAPL_DOMAIN_REG_POLICY, ARBITRARY_UNIT, 0),
         /* non-hardware */
         PRIMITIVE_INFO_INIT(AVERAGE_POWER, 0, 0, 0, POWER_UNIT,
-                                RAPL_PRIMITIVE_DERIVED),
+                            RAPL_PRIMITIVE_DERIVED),
         {NULL, 0, 0, 0},
 };
 
@@ -787,26 +636,25 @@ static struct rapl_primitive_info rpi[] = {
  * 63-------------------------- 31--------------------------- 0
  */
 static int rapl_read_data_raw(struct rapl_domain *rd,
-                        enum rapl_primitives prim,
-                        bool xlate, u64 *data)
+                              enum rapl_primitives prim, bool xlate, u64 *data)
 {
-        u64 value, final;
-        u32 msr;
+        u64 value;
         struct rapl_primitive_info *rp = &rpi[prim];
+        struct reg_action ra;
         int cpu;
 
         if (!rp->name || rp->flag & RAPL_PRIMITIVE_DUMMY)
                 return -EINVAL;
 
-        msr = rd->msrs[rp->id];
-        if (!msr)
+        ra.reg = rd->regs[rp->id];
+        if (!ra.reg)
                 return -EINVAL;
 
         cpu = rd->rp->lead_cpu;
 
-        /* special-case package domain, which uses a different bit*/
-        if (prim == FW_LOCK && rd->id == RAPL_DOMAIN_PACKAGE) {
-                rp->mask = POWER_PACKAGE_LOCK;
+        /* domain with 2 limits has different bit */
+        if (prim == FW_LOCK && rd->rp->priv->limits[rd->id] == 2) {
+                rp->mask = POWER_HIGH_LOCK;
                 rp->shift = 63;
         }
         /* non-hardware data are collected by the polling thread */
@@ -815,56 +663,32 @@ static int rapl_read_data_raw(struct rapl_domain *rd,
                 return 0;
         }
 
-        if (rdmsrl_safe_on_cpu(cpu, msr, &value)) {
-                pr_debug("failed to read msr 0x%x on cpu %d\n", msr, cpu);
+        ra.mask = rp->mask;
+
+        if (rd->rp->priv->read_raw(cpu, &ra)) {
+                pr_debug("failed to read reg 0x%llx on cpu %d\n", ra.reg, cpu);
                 return -EIO;
         }
 
-        final = value & rp->mask;
-        final = final >> rp->shift;
+        value = ra.value >> rp->shift;
+
         if (xlate)
-                *data = rapl_unit_xlate(rd, rp->unit, final, 0);
+                *data = rapl_unit_xlate(rd, rp->unit, value, 0);
         else
-                *data = final;
+                *data = value;
 
         return 0;
 }
 
-
-static int msrl_update_safe(u32 msr_no, u64 clear_mask, u64 set_mask)
-{
-        int err;
-        u64 val;
-
-        err = rdmsrl_safe(msr_no, &val);
-        if (err)
-                goto out;
-
-        val &= ~clear_mask;
-        val |= set_mask;
-
-        err = wrmsrl_safe(msr_no, val);
-
-out:
-        return err;
-}
-
-static void msrl_update_func(void *info)
-{
-        struct msrl_action *ma = info;
-
-        ma->err = msrl_update_safe(ma->msr_no, ma->clear_mask, ma->set_mask);
-}
-
 /* Similar use of primitive info in the read counterpart */
 static int rapl_write_data_raw(struct rapl_domain *rd,
-                        enum rapl_primitives prim,
-                        unsigned long long value)
+                               enum rapl_primitives prim,
+                               unsigned long long value)
 {
         struct rapl_primitive_info *rp = &rpi[prim];
         int cpu;
         u64 bits;
-        struct msrl_action ma;
+        struct reg_action ra;
         int ret;
 
         cpu = rd->rp->lead_cpu;
@@ -872,17 +696,13 @@ static int rapl_write_data_raw(struct rapl_domain *rd,
         bits <<= rp->shift;
         bits &= rp->mask;
 
-        memset(&ma, 0, sizeof(ma));
+        memset(&ra, 0, sizeof(ra));
 
-        ma.msr_no = rd->msrs[rp->id];
-        ma.clear_mask = rp->mask;
-        ma.set_mask = bits;
+        ra.reg = rd->regs[rp->id];
+        ra.mask = rp->mask;
+        ra.value = bits;
 
-        ret = smp_call_function_single(cpu, msrl_update_func, &ma, 1);
-        if (ret)
-                WARN_ON_ONCE(ret);
-        else
-                ret = ma.err;
+        ret = rd->rp->priv->write_raw(cpu, &ra);
 
         return ret;
 }
@@ -900,51 +720,56 @@ static int rapl_write_data_raw(struct rapl_domain *rd,
  */
 static int rapl_check_unit_core(struct rapl_package *rp, int cpu)
 {
-        u64 msr_val;
+        struct reg_action ra;
         u32 value;
 
-        if (rdmsrl_safe_on_cpu(cpu, MSR_RAPL_POWER_UNIT, &msr_val)) {
-                pr_err("Failed to read power unit MSR 0x%x on CPU %d, exit.\n",
-                        MSR_RAPL_POWER_UNIT, cpu);
+        ra.reg = rp->priv->reg_unit;
+        ra.mask = ~0;
+        if (rp->priv->read_raw(cpu, &ra)) {
+                pr_err("Failed to read power unit REG 0x%llx on CPU %d, exit.\n",
+                       rp->priv->reg_unit, cpu);
                 return -ENODEV;
         }
 
-        value = (msr_val & ENERGY_UNIT_MASK) >> ENERGY_UNIT_OFFSET;
+        value = (ra.value & ENERGY_UNIT_MASK) >> ENERGY_UNIT_OFFSET;
         rp->energy_unit = ENERGY_UNIT_SCALE * 1000000 / (1 << value);
 
-        value = (msr_val & POWER_UNIT_MASK) >> POWER_UNIT_OFFSET;
+        value = (ra.value & POWER_UNIT_MASK) >> POWER_UNIT_OFFSET;
         rp->power_unit = 1000000 / (1 << value);
 
-        value = (msr_val & TIME_UNIT_MASK) >> TIME_UNIT_OFFSET;
+        value = (ra.value & TIME_UNIT_MASK) >> TIME_UNIT_OFFSET;
         rp->time_unit = 1000000 / (1 << value);
 
         pr_debug("Core CPU %s energy=%dpJ, time=%dus, power=%duW\n",
-                rp->name, rp->energy_unit, rp->time_unit, rp->power_unit);
+                 rp->name, rp->energy_unit, rp->time_unit, rp->power_unit);
 
         return 0;
 }
 
 static int rapl_check_unit_atom(struct rapl_package *rp, int cpu)
 {
-        u64 msr_val;
+        struct reg_action ra;
         u32 value;
 
-        if (rdmsrl_safe_on_cpu(cpu, MSR_RAPL_POWER_UNIT, &msr_val)) {
-                pr_err("Failed to read power unit MSR 0x%x on CPU %d, exit.\n",
-                        MSR_RAPL_POWER_UNIT, cpu);
+        ra.reg = rp->priv->reg_unit;
+        ra.mask = ~0;
+        if (rp->priv->read_raw(cpu, &ra)) {
+                pr_err("Failed to read power unit REG 0x%llx on CPU %d, exit.\n",
+                       rp->priv->reg_unit, cpu);
                 return -ENODEV;
         }
-        value = (msr_val & ENERGY_UNIT_MASK) >> ENERGY_UNIT_OFFSET;
+
+        value = (ra.value & ENERGY_UNIT_MASK) >> ENERGY_UNIT_OFFSET;
         rp->energy_unit = ENERGY_UNIT_SCALE * 1 << value;
 
-        value = (msr_val & POWER_UNIT_MASK) >> POWER_UNIT_OFFSET;
+        value = (ra.value & POWER_UNIT_MASK) >> POWER_UNIT_OFFSET;
         rp->power_unit = (1 << value) * 1000;
 
-        value = (msr_val & TIME_UNIT_MASK) >> TIME_UNIT_OFFSET;
+        value = (ra.value & TIME_UNIT_MASK) >> TIME_UNIT_OFFSET;
         rp->time_unit = 1000000 / (1 << value);
 
         pr_debug("Atom %s energy=%dpJ, time=%dus, power=%duW\n",
-                rp->name, rp->energy_unit, rp->time_unit, rp->power_unit);
+                 rp->name, rp->energy_unit, rp->time_unit, rp->power_unit);
 
         return 0;
 }
@@ -964,7 +789,6 @@ static void power_limit_irq_save_cpu(void *info)
         wrmsr_safe(MSR_IA32_PACKAGE_THERM_INTERRUPT, l, h);
 }
 
-
 /* REVISIT:
  * When package power limit is set artificially low by RAPL, LVT
  * thermal interrupt for package power limit should be ignored
@@ -1048,9 +872,9 @@ static void set_floor_freq_atom(struct rapl_domain *rd, bool enable)
 }
 
 static u64 rapl_compute_time_window_core(struct rapl_package *rp, u64 value,
-                                        bool to_raw)
+                                         bool to_raw)
 {
-        u64 f, y; /* fraction and exp. used for time unit */
+        u64 f, y;               /* fraction and exp. used for time unit */
 
         /*
          * Special processing based on 2^Y*(1+F/4), refer
@@ -1070,7 +894,7 @@ static u64 rapl_compute_time_window_core(struct rapl_package *rp, u64 value,
 }
 
 static u64 rapl_compute_time_window_atom(struct rapl_package *rp, u64 value,
-                                        bool to_raw)
+                                         bool to_raw)
 {
         /*
          * Atom time unit encoding is straight forward val * time_unit,
@@ -1078,8 +902,8 @@ static u64 rapl_compute_time_window_atom(struct rapl_package *rp, u64 value,
          */
         if (!to_raw)
                 return (value) ? value *= rp->time_unit : rp->time_unit;
-        else
-                value = div64_u64(value, rp->time_unit);
+
+        value = div64_u64(value, rp->time_unit);
 
         return value;
 }
@@ -1127,43 +951,48 @@ static const struct rapl_defaults rapl_defaults_cht = {
 };
 
 static const struct x86_cpu_id rapl_ids[] __initconst = {
-        INTEL_CPU_FAM6(SANDYBRIDGE,             rapl_defaults_core),
-        INTEL_CPU_FAM6(SANDYBRIDGE_X,           rapl_defaults_core),
-
-        INTEL_CPU_FAM6(IVYBRIDGE,               rapl_defaults_core),
-        INTEL_CPU_FAM6(IVYBRIDGE_X,             rapl_defaults_core),
-
-        INTEL_CPU_FAM6(HASWELL_CORE,            rapl_defaults_core),
-        INTEL_CPU_FAM6(HASWELL_ULT,             rapl_defaults_core),
-        INTEL_CPU_FAM6(HASWELL_GT3E,            rapl_defaults_core),
-        INTEL_CPU_FAM6(HASWELL_X,               rapl_defaults_hsw_server),
-
-        INTEL_CPU_FAM6(BROADWELL_CORE,          rapl_defaults_core),
-        INTEL_CPU_FAM6(BROADWELL_GT3E,          rapl_defaults_core),
-        INTEL_CPU_FAM6(BROADWELL_XEON_D,        rapl_defaults_core),
-        INTEL_CPU_FAM6(BROADWELL_X,             rapl_defaults_hsw_server),
-
-        INTEL_CPU_FAM6(SKYLAKE_DESKTOP,         rapl_defaults_core),
-        INTEL_CPU_FAM6(SKYLAKE_MOBILE,          rapl_defaults_core),
-        INTEL_CPU_FAM6(SKYLAKE_X,               rapl_defaults_hsw_server),
-        INTEL_CPU_FAM6(KABYLAKE_MOBILE,         rapl_defaults_core),
-        INTEL_CPU_FAM6(KABYLAKE_DESKTOP,        rapl_defaults_core),
-        INTEL_CPU_FAM6(CANNONLAKE_MOBILE,       rapl_defaults_core),
-        INTEL_CPU_FAM6(ICELAKE_MOBILE,          rapl_defaults_core),
-
-        INTEL_CPU_FAM6(ATOM_SILVERMONT,         rapl_defaults_byt),
-        INTEL_CPU_FAM6(ATOM_AIRMONT,            rapl_defaults_cht),
-        INTEL_CPU_FAM6(ATOM_SILVERMONT_MID,     rapl_defaults_tng),
-        INTEL_CPU_FAM6(ATOM_AIRMONT_MID,        rapl_defaults_ann),
-        INTEL_CPU_FAM6(ATOM_GOLDMONT,           rapl_defaults_core),
-        INTEL_CPU_FAM6(ATOM_GOLDMONT_PLUS,      rapl_defaults_core),
-        INTEL_CPU_FAM6(ATOM_GOLDMONT_X,         rapl_defaults_core),
-        INTEL_CPU_FAM6(ATOM_TREMONT_X,          rapl_defaults_core),
-
-        INTEL_CPU_FAM6(XEON_PHI_KNL,            rapl_defaults_hsw_server),
-        INTEL_CPU_FAM6(XEON_PHI_KNM,            rapl_defaults_hsw_server),
+        INTEL_CPU_FAM6(SANDYBRIDGE, rapl_defaults_core),
+        INTEL_CPU_FAM6(SANDYBRIDGE_X, rapl_defaults_core),
+
+        INTEL_CPU_FAM6(IVYBRIDGE, rapl_defaults_core),
+        INTEL_CPU_FAM6(IVYBRIDGE_X, rapl_defaults_core),
+
+        INTEL_CPU_FAM6(HASWELL_CORE, rapl_defaults_core),
+        INTEL_CPU_FAM6(HASWELL_ULT, rapl_defaults_core),
+        INTEL_CPU_FAM6(HASWELL_GT3E, rapl_defaults_core),
+        INTEL_CPU_FAM6(HASWELL_X, rapl_defaults_hsw_server),
+
+        INTEL_CPU_FAM6(BROADWELL_CORE, rapl_defaults_core),
+        INTEL_CPU_FAM6(BROADWELL_GT3E, rapl_defaults_core),
+        INTEL_CPU_FAM6(BROADWELL_XEON_D, rapl_defaults_core),
+        INTEL_CPU_FAM6(BROADWELL_X, rapl_defaults_hsw_server),
+
+        INTEL_CPU_FAM6(SKYLAKE_DESKTOP, rapl_defaults_core),
+        INTEL_CPU_FAM6(SKYLAKE_MOBILE, rapl_defaults_core),
+        INTEL_CPU_FAM6(SKYLAKE_X, rapl_defaults_hsw_server),
+        INTEL_CPU_FAM6(KABYLAKE_MOBILE, rapl_defaults_core),
+        INTEL_CPU_FAM6(KABYLAKE_DESKTOP, rapl_defaults_core),
+        INTEL_CPU_FAM6(CANNONLAKE_MOBILE, rapl_defaults_core),
+        INTEL_CPU_FAM6(ICELAKE_MOBILE, rapl_defaults_core),
+        INTEL_CPU_FAM6(ICELAKE_DESKTOP, rapl_defaults_core),
+        INTEL_CPU_FAM6(ICELAKE_NNPI, rapl_defaults_core),
+        INTEL_CPU_FAM6(ICELAKE_X, rapl_defaults_hsw_server),
+        INTEL_CPU_FAM6(ICELAKE_XEON_D, rapl_defaults_hsw_server),
+
+        INTEL_CPU_FAM6(ATOM_SILVERMONT, rapl_defaults_byt),
+        INTEL_CPU_FAM6(ATOM_AIRMONT, rapl_defaults_cht),
+        INTEL_CPU_FAM6(ATOM_SILVERMONT_MID, rapl_defaults_tng),
+        INTEL_CPU_FAM6(ATOM_AIRMONT_MID, rapl_defaults_ann),
+        INTEL_CPU_FAM6(ATOM_GOLDMONT, rapl_defaults_core),
+        INTEL_CPU_FAM6(ATOM_GOLDMONT_PLUS, rapl_defaults_core),
+        INTEL_CPU_FAM6(ATOM_GOLDMONT_X, rapl_defaults_core),
+        INTEL_CPU_FAM6(ATOM_TREMONT_X, rapl_defaults_core),
+
+        INTEL_CPU_FAM6(XEON_PHI_KNL, rapl_defaults_hsw_server),
+        INTEL_CPU_FAM6(XEON_PHI_KNM, rapl_defaults_hsw_server),
         {}
 };
+
 MODULE_DEVICE_TABLE(x86cpu, rapl_ids);
 
 /* Read once for all raw primitive data for domains */
@@ -1179,22 +1008,12 @@ static void rapl_update_domain_data(struct rapl_package *rp)
                 for (prim = 0; prim < NR_RAW_PRIMITIVES; prim++) {
                         if (!rapl_read_data_raw(&rp->domains[dmn], prim,
                                                 rpi[prim].unit, &val))
-                                rp->domains[dmn].rdd.primitives[prim] = val;
+                                rp->domains[dmn].rdd.primitives[prim] = val;
                 }
         }
 
 }
 
-static void rapl_unregister_powercap(void)
-{
-        if (platform_rapl_domain) {
-                powercap_unregister_zone(control_type,
-                                         &platform_rapl_domain->power_zone);
-                kfree(platform_rapl_domain);
-        }
-        powercap_unregister_control_type(control_type);
-}
-
 static int rapl_package_register_powercap(struct rapl_package *rp)
 {
         struct rapl_domain *rd;
@@ -1204,20 +1023,18 @@ static int rapl_package_register_powercap(struct rapl_package *rp)
         /* Update the domain data of the new package */
         rapl_update_domain_data(rp);
 
-        /* first we register package domain as the parent zone*/
+        /* first we register package domain as the parent zone */
         for (rd = rp->domains; rd < rp->domains + rp->nr_domains; rd++) {
                 if (rd->id == RAPL_DOMAIN_PACKAGE) {
                         nr_pl = find_nr_power_limit(rd);
                         pr_debug("register package domain %s\n", rp->name);
                         power_zone = powercap_register_zone(&rd->power_zone,
-                                                        control_type,
-                                                        rp->name, NULL,
-                                                        &zone_ops[rd->id],
-                                                        nr_pl,
-                                                        &constraint_ops);
+                                            rp->priv->control_type, rp->name,
+                                            NULL, &zone_ops[rd->id], nr_pl,
+                                            &constraint_ops);
                         if (IS_ERR(power_zone)) {
                                 pr_debug("failed to register power zone %s\n",
-                                        rp->name);
+                                         rp->name);
                                 return PTR_ERR(power_zone);
                         }
                         /* track parent zone in per package/socket data */
@@ -1230,21 +1047,21 @@ static int rapl_package_register_powercap(struct rapl_package *rp)
                 pr_err("no package domain found, unknown topology!\n");
                 return -ENODEV;
         }
-        /* now register domains as children of the socket/package*/
+        /* now register domains as children of the socket/package */
         for (rd = rp->domains; rd < rp->domains + rp->nr_domains; rd++) {
                 if (rd->id == RAPL_DOMAIN_PACKAGE)
                         continue;
                 /* number of power limits per domain varies */
                 nr_pl = find_nr_power_limit(rd);
                 power_zone = powercap_register_zone(&rd->power_zone,
-                                                control_type, rd->name,
-                                                rp->power_zone,
-                                                &zone_ops[rd->id], nr_pl,
-                                                &constraint_ops);
+                                                    rp->priv->control_type,
+                                                    rd->name, rp->power_zone,
+                                                    &zone_ops[rd->id], nr_pl,
+                                                    &constraint_ops);
 
                 if (IS_ERR(power_zone)) {
                         pr_debug("failed to register power_zone, %s:%s\n",
-                                rp->name, rd->name);
+                                 rp->name, rd->name);
                         ret = PTR_ERR(power_zone);
                         goto err_cleanup;
                 }
@@ -1258,22 +1075,30 @@ err_cleanup:
          */
         while (--rd >= rp->domains) {
                 pr_debug("unregister %s domain %s\n", rp->name, rd->name);
-                powercap_unregister_zone(control_type, &rd->power_zone);
+                powercap_unregister_zone(rp->priv->control_type,
+                                         &rd->power_zone);
         }
 
         return ret;
 }
 
-static int __init rapl_register_psys(void)
+int rapl_add_platform_domain(struct rapl_if_priv *priv)
 {
         struct rapl_domain *rd;
         struct powercap_zone *power_zone;
-        u64 val;
+        struct reg_action ra;
+        int ret;
 
-        if (rdmsrl_safe_on_cpu(0, MSR_PLATFORM_ENERGY_STATUS, &val) || !val)
+        ra.reg = priv->regs[RAPL_DOMAIN_PLATFORM][RAPL_DOMAIN_REG_STATUS];
+        ra.mask = ~0;
+        ret = priv->read_raw(0, &ra);
+        if (ret || !ra.value)
                 return -ENODEV;
 
-        if (rdmsrl_safe_on_cpu(0, MSR_PLATFORM_POWER_LIMIT, &val) || !val)
+        ra.reg = priv->regs[RAPL_DOMAIN_PLATFORM][RAPL_DOMAIN_REG_LIMIT];
+        ra.mask = ~0;
+        ret = priv->read_raw(0, &ra);
+        if (ret || !ra.value)
                 return -ENODEV;
 
         rd = kzalloc(sizeof(*rd), GFP_KERNEL);
@@ -1282,15 +1107,17 @@ static int __init rapl_register_psys(void)
 
         rd->name = rapl_domain_names[RAPL_DOMAIN_PLATFORM];
         rd->id = RAPL_DOMAIN_PLATFORM;
-        rd->msrs[0] = MSR_PLATFORM_POWER_LIMIT;
-        rd->msrs[1] = MSR_PLATFORM_ENERGY_STATUS;
+        rd->regs[RAPL_DOMAIN_REG_LIMIT] =
+            priv->regs[RAPL_DOMAIN_PLATFORM][RAPL_DOMAIN_REG_LIMIT];
+        rd->regs[RAPL_DOMAIN_REG_STATUS] =
+            priv->regs[RAPL_DOMAIN_PLATFORM][RAPL_DOMAIN_REG_STATUS];
         rd->rpl[0].prim_id = PL1_ENABLE;
         rd->rpl[0].name = pl1_name;
         rd->rpl[1].prim_id = PL2_ENABLE;
         rd->rpl[1].name = pl2_name;
-        rd->rp = rapl_find_package_domain(0);
+        rd->rp = rapl_find_package_domain(0, priv);
 
-        power_zone = powercap_register_zone(&rd->power_zone, control_type,
+        power_zone = powercap_register_zone(&rd->power_zone, priv->control_type,
                                             "psys", NULL,
                                             &zone_ops[RAPL_DOMAIN_PLATFORM],
                                             2, &constraint_ops);
@@ -1300,38 +1127,32 @@ static int __init rapl_register_psys(void)
                 return PTR_ERR(power_zone);
         }
 
-        platform_rapl_domain = rd;
+        priv->platform_rapl_domain = rd;
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(rapl_add_platform_domain);
 
-static int __init rapl_register_powercap(void)
+void rapl_remove_platform_domain(struct rapl_if_priv *priv)
 {
-        control_type = powercap_register_control_type(NULL, "intel-rapl", NULL);
-        if (IS_ERR(control_type)) {
-                pr_debug("failed to register powercap control_type.\n");
-                return PTR_ERR(control_type);
+        if (priv->platform_rapl_domain) {
+                powercap_unregister_zone(priv->control_type,
+                                 &priv->platform_rapl_domain->power_zone);
+                kfree(priv->platform_rapl_domain);
         }
-        return 0;
 }
+EXPORT_SYMBOL_GPL(rapl_remove_platform_domain);
 
-static int rapl_check_domain(int cpu, int domain)
+static int rapl_check_domain(int cpu, int domain, struct rapl_package *rp)
 {
-        unsigned msr;
-        u64 val = 0;
+        struct reg_action ra;
 
         switch (domain) {
         case RAPL_DOMAIN_PACKAGE:
-                msr = MSR_PKG_ENERGY_STATUS;
-                break;
         case RAPL_DOMAIN_PP0:
-                msr = MSR_PP0_ENERGY_STATUS;
-                break;
         case RAPL_DOMAIN_PP1:
-                msr = MSR_PP1_ENERGY_STATUS;
-                break;
         case RAPL_DOMAIN_DRAM:
-                msr = MSR_DRAM_ENERGY_STATUS;
+                ra.reg = rp->priv->regs[domain][RAPL_DOMAIN_REG_STATUS];
                 break;
         case RAPL_DOMAIN_PLATFORM:
                 /* PSYS(PLATFORM) is not a CPU domain, so avoid printng error */
@@ -1343,19 +1164,20 @@ static int rapl_check_domain(int cpu, int domain)
         /* make sure domain counters are available and contains non-zero
          * values, otherwise skip it.
          */
-        if (rdmsrl_safe_on_cpu(cpu, msr, &val) || !val)
+
+        ra.mask = ~0;
+        if (rp->priv->read_raw(cpu, &ra) || !ra.value)
                 return -ENODEV;
 
         return 0;
 }
 
-
 /*
  * Check if power limits are available. Two cases when they are not available:
  * 1. Locked by BIOS, in this case we still provide read-only access so that
  *    users can see what limit is set by the BIOS.
  * 2. Some CPUs make some domains monitoring only which means PLx MSRs may not
- *    exist at all. In this case, we do not show the contraints in powercap.
+ *    exist at all. In this case, we do not show the constraints in powercap.
  *
  * Called after domains are detected and initialized.
  */
@@ -1372,9 +1194,10 @@ static void rapl_detect_powerlimit(struct rapl_domain *rd)
                         rd->state |= DOMAIN_STATE_BIOS_LOCKED;
                 }
         }
-        /* check if power limit MSRs exists, otherwise domain is monitoring only */
+        /* check if power limit MSR exists, otherwise domain is monitoring only */
         for (i = 0; i < NR_POWER_LIMITS; i++) {
                 int prim = rd->rpl[i].prim_id;
+
                 if (rapl_read_data_raw(rd, prim, false, &val64))
                         rd->rpl[i].name = NULL;
         }
@@ -1390,12 +1213,12 @@ static int rapl_detect_domains(struct rapl_package *rp, int cpu)
 
         for (i = 0; i < RAPL_DOMAIN_MAX; i++) {
                 /* use physical package id to read counters */
-                if (!rapl_check_domain(cpu, i)) {
+                if (!rapl_check_domain(cpu, i, rp)) {
                         rp->domain_map |= 1 << i;
                         pr_info("Found RAPL domain %s\n", rapl_domain_names[i]);
                 }
         }
-        rp->nr_domains = bitmap_weight(&rp->domain_map, RAPL_DOMAIN_MAX);
+        rp->nr_domains = bitmap_weight(&rp->domain_map, RAPL_DOMAIN_MAX);
         if (!rp->nr_domains) {
                 pr_debug("no valid rapl domains found in %s\n", rp->name);
                 return -ENODEV;
@@ -1403,7 +1226,7 @@ static int rapl_detect_domains(struct rapl_package *rp, int cpu)
         pr_debug("found %d domains on %s\n", rp->nr_domains, rp->name);
 
         rp->domains = kcalloc(rp->nr_domains + 1, sizeof(struct rapl_domain),
-                        GFP_KERNEL);
+                              GFP_KERNEL);
         if (!rp->domains)
                 return -ENOMEM;
 
@@ -1416,7 +1239,7 @@ static int rapl_detect_domains(struct rapl_package *rp, int cpu)
 }
 
 /* called from CPU hotplug notifier, hotplug lock held */
-static void rapl_remove_package(struct rapl_package *rp)
+void rapl_remove_package(struct rapl_package *rp)
 {
         struct rapl_domain *rd, *rd_package = NULL;
 
@@ -1435,16 +1258,35 @@ static void rapl_remove_package(struct rapl_package *rp)
                 }
                 pr_debug("remove package, undo power limit on %s: %s\n",
                          rp->name, rd->name);
-                powercap_unregister_zone(control_type, &rd->power_zone);
+                powercap_unregister_zone(rp->priv->control_type,
+                                         &rd->power_zone);
         }
         /* do parent zone last */
-        powercap_unregister_zone(control_type, &rd_package->power_zone);
+        powercap_unregister_zone(rp->priv->control_type,
+                                 &rd_package->power_zone);
         list_del(&rp->plist);
         kfree(rp);
 }
+EXPORT_SYMBOL_GPL(rapl_remove_package);
+
+/* caller to ensure CPU hotplug lock is held */
+struct rapl_package *rapl_find_package_domain(int cpu, struct rapl_if_priv *priv)
+{
+        int id = topology_logical_die_id(cpu);
+        struct rapl_package *rp;
+
+        list_for_each_entry(rp, &rapl_packages, plist) {
+                if (rp->id == id
+                    && rp->priv->control_type == priv->control_type)
+                        return rp;
+        }
+
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(rapl_find_package_domain);
 
 /* called from CPU hotplug notifier, hotplug lock held */
-static struct rapl_package *rapl_add_package(int cpu)
+struct rapl_package *rapl_add_package(int cpu, struct rapl_if_priv *priv)
 {
         int id = topology_logical_die_id(cpu);
         struct rapl_package *rp;
@@ -1458,17 +1300,17 @@ static struct rapl_package *rapl_add_package(int cpu)
         /* add the new package to the list */
         rp->id = id;
         rp->lead_cpu = cpu;
+        rp->priv = priv;
 
         if (topology_max_die_per_package() > 1)
                 snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH,
-                        "package-%d-die-%d", c->phys_proc_id, c->cpu_die_id);
+                         "package-%d-die-%d", c->phys_proc_id, c->cpu_die_id);
         else
                 snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH, "package-%d",
-                        c->phys_proc_id);
+                         c->phys_proc_id);
 
         /* check if the package contains valid domains */
-        if (rapl_detect_domains(rp, cpu) ||
-                rapl_defaults->check_unit(rp, cpu)) {
+        if (rapl_detect_domains(rp, cpu) || rapl_defaults->check_unit(rp, cpu)) {
                 ret = -ENODEV;
                 goto err_free_package;
         }
@@ -1484,47 +1326,7 @@ err_free_package:
         kfree(rp);
         return ERR_PTR(ret);
 }
-
-/* Handles CPU hotplug on multi-socket systems.
- * If a CPU goes online as the first CPU of the physical package
- * we add the RAPL package to the system. Similarly, when the last
- * CPU of the package is removed, we remove the RAPL package and its
- * associated domains. Cooling devices are handled accordingly at
- * per-domain level.
- */
-static int rapl_cpu_online(unsigned int cpu)
-{
-        struct rapl_package *rp;
-
-        rp = rapl_find_package_domain(cpu);
-        if (!rp) {
-                rp = rapl_add_package(cpu);
-                if (IS_ERR(rp))
-                        return PTR_ERR(rp);
-        }
-        cpumask_set_cpu(cpu, &rp->cpumask);
-        return 0;
-}
-
-static int rapl_cpu_down_prep(unsigned int cpu)
-{
-        struct rapl_package *rp;
-        int lead_cpu;
-
-        rp = rapl_find_package_domain(cpu);
-        if (!rp)
-                return 0;
-
-        cpumask_clear_cpu(cpu, &rp->cpumask);
-        lead_cpu = cpumask_first(&rp->cpumask);
-        if (lead_cpu >= nr_cpu_ids)
-                rapl_remove_package(rp);
-        else if (rp->lead_cpu == cpu)
-                rp->lead_cpu = lead_cpu;
-        return 0;
-}
-
-static enum cpuhp_state pcap_rapl_online;
+EXPORT_SYMBOL_GPL(rapl_add_package);
 
 static void power_limit_state_save(void)
 {
@@ -1542,17 +1344,15 @@ static void power_limit_state_save(void)
                         switch (rd->rpl[i].prim_id) {
                         case PL1_ENABLE:
                                 ret = rapl_read_data_raw(rd,
-                                                POWER_LIMIT1,
-                                                true,
-                                                &rd->rpl[i].last_power_limit);
+                                                 POWER_LIMIT1, true,
+                                                 &rd->rpl[i].last_power_limit);
                                 if (ret)
                                         rd->rpl[i].last_power_limit = 0;
                                 break;
                         case PL2_ENABLE:
                                 ret = rapl_read_data_raw(rd,
-                                                POWER_LIMIT2,
-                                                true,
-                                                &rd->rpl[i].last_power_limit);
+                                                 POWER_LIMIT2, true,
+                                                 &rd->rpl[i].last_power_limit);
                                 if (ret)
                                         rd->rpl[i].last_power_limit = 0;
                                 break;
@@ -1578,15 +1378,13 @@ static void power_limit_state_restore(void)
                         switch (rd->rpl[i].prim_id) {
                         case PL1_ENABLE:
                                 if (rd->rpl[i].last_power_limit)
-                                        rapl_write_data_raw(rd,
-                                                POWER_LIMIT1,
-                                                rd->rpl[i].last_power_limit);
+                                        rapl_write_data_raw(rd, POWER_LIMIT1,
+                                            rd->rpl[i].last_power_limit);
                                 break;
                         case PL2_ENABLE:
                                 if (rd->rpl[i].last_power_limit)
-                                        rapl_write_data_raw(rd,
-                                                POWER_LIMIT2,
-                                                rd->rpl[i].last_power_limit);
+                                        rapl_write_data_raw(rd, POWER_LIMIT2,
+                                            rd->rpl[i].last_power_limit);
                                 break;
                         }
                 }
@@ -1595,7 +1393,7 @@ static void power_limit_state_restore(void)
 }
 
 static int rapl_pm_callback(struct notifier_block *nb,
-        unsigned long mode, void *_unused)
+                            unsigned long mode, void *_unused)
 {
         switch (mode) {
         case PM_SUSPEND_PREPARE:
@@ -1612,6 +1410,8 @@ static struct notifier_block rapl_pm_notifier = {
         .notifier_call = rapl_pm_callback,
 };
 
+static struct platform_device *rapl_msr_platdev;
+
 static int __init rapl_init(void)
 {
         const struct x86_cpu_id *id;
@@ -1620,50 +1420,43 @@ static int __init rapl_init(void)
         id = x86_match_cpu(rapl_ids);
         if (!id) {
                 pr_err("driver does not support CPU family %d model %d\n",
-                        boot_cpu_data.x86, boot_cpu_data.x86_model);
+                       boot_cpu_data.x86, boot_cpu_data.x86_model);
 
                 return -ENODEV;
         }
 
         rapl_defaults = (struct rapl_defaults *)id->driver_data;
 
-        ret = rapl_register_powercap();
+        ret = register_pm_notifier(&rapl_pm_notifier);
         if (ret)
                 return ret;
 
-        ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "powercap/rapl:online",
-                                rapl_cpu_online, rapl_cpu_down_prep);
-        if (ret < 0)
-                goto err_unreg;
-        pcap_rapl_online = ret;
-
-        /* Don't bail out if PSys is not supported */
-        rapl_register_psys();
+        rapl_msr_platdev = platform_device_alloc("intel_rapl_msr", 0);
+        if (!rapl_msr_platdev) {
+                ret = -ENOMEM;
+                goto end;
+        }
 
-        ret = register_pm_notifier(&rapl_pm_notifier);
+        ret = platform_device_add(rapl_msr_platdev);
         if (ret)
-                goto err_unreg_all;
+                platform_device_put(rapl_msr_platdev);
 
-        return 0;
-
-err_unreg_all:
-        cpuhp_remove_state(pcap_rapl_online);
+end:
+        if (ret)
+                unregister_pm_notifier(&rapl_pm_notifier);
 
-err_unreg:
-        rapl_unregister_powercap();
         return ret;
 }
 
 static void __exit rapl_exit(void)
 {
+        platform_device_unregister(rapl_msr_platdev);
         unregister_pm_notifier(&rapl_pm_notifier);
-        cpuhp_remove_state(pcap_rapl_online);
-        rapl_unregister_powercap();
 }
 
 module_init(rapl_init);
 module_exit(rapl_exit);
 
-MODULE_DESCRIPTION("Driver for Intel RAPL (Running Average Power Limit)");
+MODULE_DESCRIPTION("Intel Runtime Average Power Limit (RAPL) common code");
 MODULE_AUTHOR("Jacob Pan <jacob.jun.pan@intel.com>");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/powercap/intel_rapl_msr.c b/drivers/powercap/intel_rapl_msr.c
new file mode 100644
index 000000000000..d5487965bdfe
--- /dev/null
+++ b/drivers/powercap/intel_rapl_msr.c
@@ -0,0 +1,183 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Intel Running Average Power Limit (RAPL) Driver via MSR interface
+ * Copyright (c) 2019, Intel Corporation.
+ */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/list.h>
+#include <linux/types.h>
+#include <linux/device.h>
+#include <linux/slab.h>
+#include <linux/log2.h>
+#include <linux/bitmap.h>
+#include <linux/delay.h>
+#include <linux/sysfs.h>
+#include <linux/cpu.h>
+#include <linux/powercap.h>
+#include <linux/suspend.h>
+#include <linux/intel_rapl.h>
+#include <linux/processor.h>
+#include <linux/platform_device.h>
+
+#include <asm/iosf_mbi.h>
+#include <asm/cpu_device_id.h>
+#include <asm/intel-family.h>
+
+/* Local defines */
+#define MSR_PLATFORM_POWER_LIMIT        0x0000065C
+
+/* private data for RAPL MSR Interface */
+static struct rapl_if_priv rapl_msr_priv = {
+        .reg_unit = MSR_RAPL_POWER_UNIT,
+        .regs[RAPL_DOMAIN_PACKAGE] = {
+                MSR_PKG_POWER_LIMIT, MSR_PKG_ENERGY_STATUS, MSR_PKG_PERF_STATUS, 0, MSR_PKG_POWER_INFO },
+        .regs[RAPL_DOMAIN_PP0] = {
+                MSR_PP0_POWER_LIMIT, MSR_PP0_ENERGY_STATUS, 0, MSR_PP0_POLICY, 0 },
+        .regs[RAPL_DOMAIN_PP1] = {
+                MSR_PP1_POWER_LIMIT, MSR_PP1_ENERGY_STATUS, 0, MSR_PP1_POLICY, 0 },
+        .regs[RAPL_DOMAIN_DRAM] = {
+                MSR_DRAM_POWER_LIMIT, MSR_DRAM_ENERGY_STATUS, MSR_DRAM_PERF_STATUS, 0, MSR_DRAM_POWER_INFO },
+        .regs[RAPL_DOMAIN_PLATFORM] = {
+                MSR_PLATFORM_POWER_LIMIT, MSR_PLATFORM_ENERGY_STATUS, 0, 0, 0},
+        .limits[RAPL_DOMAIN_PACKAGE] = 2,
+};
+
+/* Handles CPU hotplug on multi-socket systems.
+ * If a CPU goes online as the first CPU of the physical package
+ * we add the RAPL package to the system. Similarly, when the last
+ * CPU of the package is removed, we remove the RAPL package and its
+ * associated domains. Cooling devices are handled accordingly at
+ * per-domain level.
+ */
+static int rapl_cpu_online(unsigned int cpu)
+{
+        struct rapl_package *rp;
+
+        rp = rapl_find_package_domain(cpu, &rapl_msr_priv);
+        if (!rp) {
+                rp = rapl_add_package(cpu, &rapl_msr_priv);
+                if (IS_ERR(rp))
+                        return PTR_ERR(rp);
+        }
+        cpumask_set_cpu(cpu, &rp->cpumask);
+        return 0;
+}
+
+static int rapl_cpu_down_prep(unsigned int cpu)
+{
+        struct rapl_package *rp;
+        int lead_cpu;
+
+        rp = rapl_find_package_domain(cpu, &rapl_msr_priv);
+        if (!rp)
+                return 0;
+
+        cpumask_clear_cpu(cpu, &rp->cpumask);
+        lead_cpu = cpumask_first(&rp->cpumask);
+        if (lead_cpu >= nr_cpu_ids)
+                rapl_remove_package(rp);
+        else if (rp->lead_cpu == cpu)
+                rp->lead_cpu = lead_cpu;
+        return 0;
+}
+
+static int rapl_msr_read_raw(int cpu, struct reg_action *ra)
+{
+        u32 msr = (u32)ra->reg;
+
+        if (rdmsrl_safe_on_cpu(cpu, msr, &ra->value)) {
+                pr_debug("failed to read msr 0x%x on cpu %d\n", msr, cpu);
+                return -EIO;
+        }
+        ra->value &= ra->mask;
+        return 0;
+}
+
+static void rapl_msr_update_func(void *info)
+{
+        struct reg_action *ra = info;
+        u32 msr = (u32)ra->reg;
+        u64 val;
+
+        ra->err = rdmsrl_safe(msr, &val);
+        if (ra->err)
+                return;
+
+        val &= ~ra->mask;
+        val |= ra->value;
+
+        ra->err = wrmsrl_safe(msr, val);
+}
+
+static int rapl_msr_write_raw(int cpu, struct reg_action *ra)
+{
+        int ret;
+
+        ret = smp_call_function_single(cpu, rapl_msr_update_func, ra, 1);
+        if (WARN_ON_ONCE(ret))
+                return ret;
+
+        return ra->err;
+}
+
+static int rapl_msr_probe(struct platform_device *pdev)
+{
+        int ret;
+
+        rapl_msr_priv.read_raw = rapl_msr_read_raw;
+        rapl_msr_priv.write_raw = rapl_msr_write_raw;
+
+        rapl_msr_priv.control_type = powercap_register_control_type(NULL, "intel-rapl", NULL);
+        if (IS_ERR(rapl_msr_priv.control_type)) {
+                pr_debug("failed to register powercap control_type.\n");
+                return PTR_ERR(rapl_msr_priv.control_type);
+        }
+
+        ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "powercap/rapl:online",
+                                rapl_cpu_online, rapl_cpu_down_prep);
+        if (ret < 0)
+                goto out;
+        rapl_msr_priv.pcap_rapl_online = ret;
+
+        /* Don't bail out if PSys is not supported */
+        rapl_add_platform_domain(&rapl_msr_priv);
+
+        return 0;
+
+out:
+        if (ret)
+                powercap_unregister_control_type(rapl_msr_priv.control_type);
+        return ret;
+}
+
+static int rapl_msr_remove(struct platform_device *pdev)
+{
+        cpuhp_remove_state(rapl_msr_priv.pcap_rapl_online);
+        rapl_remove_platform_domain(&rapl_msr_priv);
+        powercap_unregister_control_type(rapl_msr_priv.control_type);
+        return 0;
+}
+
+static const struct platform_device_id rapl_msr_ids[] = {
+        { .name = "intel_rapl_msr", },
+        {}
+};
+MODULE_DEVICE_TABLE(platform, rapl_msr_ids);
+
+static struct platform_driver intel_rapl_msr_driver = {
+        .probe = rapl_msr_probe,
+        .remove = rapl_msr_remove,
+        .id_table = rapl_msr_ids,
+        .driver = {
+                .name = "intel_rapl_msr",
+        },
+};
+
+module_platform_driver(intel_rapl_msr_driver);
+
+MODULE_DESCRIPTION("Driver for Intel RAPL (Running Average Power Limit) control via MSR interface");
+MODULE_AUTHOR("Zhang Rui <rui.zhang@intel.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/thermal/intel/int340x_thermal/Kconfig b/drivers/thermal/intel/int340x_thermal/Kconfig
index 5333e018c88c..797907542e43 100644
--- a/drivers/thermal/intel/int340x_thermal/Kconfig
+++ b/drivers/thermal/intel/int340x_thermal/Kconfig
@@ -40,4 +40,10 @@ config INT3406_THERMAL
           brightness in order to address a thermal condition or to reduce
           power consumed by display device.
 
+config PROC_THERMAL_MMIO_RAPL
+        bool
+        depends on 64BIT
+        depends on POWERCAP
+        select INTEL_RAPL_CORE
+        default y
 endif
diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
index 77dae1e7c3bf..213ab3cc6b80 100644
--- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
+++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
@@ -11,6 +11,8 @@
 #include <linux/platform_device.h>
 #include <linux/acpi.h>
 #include <linux/thermal.h>
+#include <linux/cpuhotplug.h>
+#include <linux/intel_rapl.h>
 #include "int340x_thermal_zone.h"
 #include "../intel_soc_dts_iosf.h"
 
@@ -37,6 +39,8 @@
 /* GeminiLake thermal reporting device */
 #define PCI_DEVICE_ID_PROC_GLK_THERMAL  0x318C
 
+#define DRV_NAME "proc_thermal"
+
 struct power_config {
         u32     index;
         u32     min_uw;
@@ -52,6 +56,7 @@ struct proc_thermal_device {
         struct power_config power_limits[2];
         struct int34x_thermal_zone *int340x_zone;
         struct intel_soc_dts_sensors *soc_dts;
+        void __iomem *mmio_base;
 };
 
 enum proc_thermal_emum_mode_type {
@@ -60,6 +65,12 @@ enum proc_thermal_emum_mode_type {
         PROC_THERMAL_PLATFORM_DEV
 };
 
+struct rapl_mmio_regs {
+        u64 reg_unit;
+        u64 regs[RAPL_DOMAIN_MAX][RAPL_DOMAIN_REG_MAX];
+        int limits[RAPL_DOMAIN_MAX];
+};
+
 /*
  * We can have only one type of enumeration, PCI or Platform,
  * not both. So we don't need instance specific data.
@@ -367,8 +378,151 @@ static irqreturn_t proc_thermal_pci_msi_irq(int irq, void *devid)
         return IRQ_HANDLED;
 }
 
+#ifdef CONFIG_PROC_THERMAL_MMIO_RAPL
+
+#define MCHBAR 0
+
+/* RAPL Support via MMIO interface */
+static struct rapl_if_priv rapl_mmio_priv;
+
+static int rapl_mmio_cpu_online(unsigned int cpu)
+{
+        struct rapl_package *rp;
+
+        /* mmio rapl supports package 0 only for now */
+        if (topology_physical_package_id(cpu))
+                return 0;
+
+        rp = rapl_find_package_domain(cpu, &rapl_mmio_priv);
+        if (!rp) {
+                rp = rapl_add_package(cpu, &rapl_mmio_priv);
+                if (IS_ERR(rp))
+                        return PTR_ERR(rp);
+        }
+        cpumask_set_cpu(cpu, &rp->cpumask);
+        return 0;
+}
+
+static int rapl_mmio_cpu_down_prep(unsigned int cpu)
+{
+        struct rapl_package *rp;
+        int lead_cpu;
+
+        rp = rapl_find_package_domain(cpu, &rapl_mmio_priv);
+        if (!rp)
+                return 0;
+
+        cpumask_clear_cpu(cpu, &rp->cpumask);
+        lead_cpu = cpumask_first(&rp->cpumask);
+        if (lead_cpu >= nr_cpu_ids)
+                rapl_remove_package(rp);
+        else if (rp->lead_cpu == cpu)
+                rp->lead_cpu = lead_cpu;
+        return 0;
+}
+
+static int rapl_mmio_read_raw(int cpu, struct reg_action *ra)
+{
+        if (!ra->reg)
+                return -EINVAL;
+
+        ra->value = readq((void __iomem *)ra->reg);
+        ra->value &= ra->mask;
+        return 0;
+}
+
+static int rapl_mmio_write_raw(int cpu, struct reg_action *ra)
+{
+        u64 val;
+
+        if (!ra->reg)
+                return -EINVAL;
+
+        val = readq((void __iomem *)ra->reg);
+        val &= ~ra->mask;
+        val |= ra->value;
+        writeq(val, (void __iomem *)ra->reg);
+        return 0;
+}
+
+static int proc_thermal_rapl_add(struct pci_dev *pdev,
+                                 struct proc_thermal_device *proc_priv,
+                                 struct rapl_mmio_regs *rapl_regs)
+{
+        enum rapl_domain_reg_id reg;
+        enum rapl_domain_type domain;
+        int ret;
+
+        if (!rapl_regs)
+                return 0;
+
+        ret = pcim_iomap_regions(pdev, 1 << MCHBAR, DRV_NAME);
+        if (ret) {
+                dev_err(&pdev->dev, "cannot reserve PCI memory region\n");
+                return -ENOMEM;
+        }
+
+        proc_priv->mmio_base = pcim_iomap_table(pdev)[MCHBAR];
+
+        for (domain = RAPL_DOMAIN_PACKAGE; domain < RAPL_DOMAIN_MAX; domain++) {
+                for (reg = RAPL_DOMAIN_REG_LIMIT; reg < RAPL_DOMAIN_REG_MAX; reg++)
+                        if (rapl_regs->regs[domain][reg])
+                                rapl_mmio_priv.regs[domain][reg] =
+                                                (u64)proc_priv->mmio_base +
+                                                rapl_regs->regs[domain][reg];
+                rapl_mmio_priv.limits[domain] = rapl_regs->limits[domain];
+        }
+        rapl_mmio_priv.reg_unit = (u64)proc_priv->mmio_base + rapl_regs->reg_unit;
+
+        rapl_mmio_priv.read_raw = rapl_mmio_read_raw;
+        rapl_mmio_priv.write_raw = rapl_mmio_write_raw;
+
+        rapl_mmio_priv.control_type = powercap_register_control_type(NULL, "intel-rapl-mmio", NULL);
+        if (IS_ERR(rapl_mmio_priv.control_type)) {
+                pr_debug("failed to register powercap control_type.\n");
+                return PTR_ERR(rapl_mmio_priv.control_type);
+        }
+
+        ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "powercap/rapl:online",
+                                rapl_mmio_cpu_online, rapl_mmio_cpu_down_prep);
+        if (ret < 0) {
+                powercap_unregister_control_type(rapl_mmio_priv.control_type);
+                return ret;
+        }
+        rapl_mmio_priv.pcap_rapl_online = ret;
+
+        return 0;
+}
+
+static void proc_thermal_rapl_remove(void)
+{
+        cpuhp_remove_state(rapl_mmio_priv.pcap_rapl_online);
+        powercap_unregister_control_type(rapl_mmio_priv.control_type);
+}
+
+static const struct rapl_mmio_regs rapl_mmio_hsw = {
+        .reg_unit = 0x5938,
+        .regs[RAPL_DOMAIN_PACKAGE] = { 0x59a0, 0x593c, 0x58f0, 0, 0x5930},
+        .regs[RAPL_DOMAIN_DRAM] = { 0x58e0, 0x58e8, 0x58ec, 0, 0},
+        .limits[RAPL_DOMAIN_PACKAGE] = 2,
+        .limits[RAPL_DOMAIN_DRAM] = 2,
+};
+
+#else
+
+static int proc_thermal_rapl_add(struct pci_dev *pdev,
+                                 struct proc_thermal_device *proc_priv,
+                                 struct rapl_mmio_regs *rapl_regs)
+{
+        return 0;
+}
+static void proc_thermal_rapl_remove(void) {}
+static const struct rapl_mmio_regs rapl_mmio_hsw;
+
+#endif /* CONFIG_MMIO_RAPL */
+
 static int  proc_thermal_pci_probe(struct pci_dev *pdev,
-                                   const struct pci_device_id *unused)
+                                   const struct pci_device_id *id)
 {
         struct proc_thermal_device *proc_priv;
         int ret;
@@ -378,15 +532,21 @@ static int  proc_thermal_pci_probe(struct pci_dev *pdev,
                 return -ENODEV;
         }
 
-        ret = pci_enable_device(pdev);
+        ret = pcim_enable_device(pdev);
         if (ret < 0) {
                 dev_err(&pdev->dev, "error: could not enable device\n");
                 return ret;
         }
 
         ret = proc_thermal_add(&pdev->dev, &proc_priv);
+        if (ret)
+                return ret;
+
+        ret = proc_thermal_rapl_add(pdev, proc_priv,
+                                (struct rapl_mmio_regs *)id->driver_data);
         if (ret) {
-                pci_disable_device(pdev);
+                dev_err(&pdev->dev, "failed to add RAPL MMIO interface\n");
+                proc_thermal_remove(proc_priv);
                 return ret;
         }
 
@@ -439,8 +599,8 @@ static void  proc_thermal_pci_remove(struct pci_dev *pdev)
                         pci_disable_msi(pdev);
                 }
         }
+        proc_thermal_rapl_remove();
         proc_thermal_remove(proc_priv);
-        pci_disable_device(pdev);
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -462,7 +622,8 @@ static SIMPLE_DEV_PM_OPS(proc_thermal_pm, NULL, proc_thermal_resume);
 static const struct pci_device_id proc_thermal_pci_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_BDW_THERMAL)},
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_HSB_THERMAL)},
-        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_SKL_THERMAL)},
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_SKL_THERMAL),
+                .driver_data = (kernel_ulong_t)&rapl_mmio_hsw, },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_BSW_THERMAL)},
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_BXT0_THERMAL)},
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PROC_BXT1_THERMAL)},
@@ -477,7 +638,7 @@ static const struct pci_device_id proc_thermal_pci_ids[] = {
 MODULE_DEVICE_TABLE(pci, proc_thermal_pci_ids);
 
 static struct pci_driver proc_thermal_pci_driver = {
-        .name           = "proc_thermal",
+        .name           = DRV_NAME,
         .probe          = proc_thermal_pci_probe,
         .remove         = proc_thermal_pci_remove,
         .id_table       = proc_thermal_pci_ids,
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 46b167fba155..536a049d7ecc 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -47,11 +47,6 @@ struct cpufreq_cpuinfo {
         unsigned int            transition_latency;
 };
 
-struct cpufreq_user_policy {
-        unsigned int            min;    /* in kHz */
-        unsigned int            max;    /* in kHz */
-};
-
 struct cpufreq_policy {
         /* CPUs sharing clock, require sw coordination */
         cpumask_var_t           cpus;   /* Online CPUs only */
@@ -81,7 +76,8 @@ struct cpufreq_policy {
         struct work_struct      update; /* if update_policy() needs to be
                                          * called, but you're in IRQ context */
 
-        struct cpufreq_user_policy user_policy;
+        struct dev_pm_qos_request *min_freq_req;
+        struct dev_pm_qos_request *max_freq_req;
         struct cpufreq_frequency_table  *freq_table;
         enum cpufreq_table_sorting freq_table_sorted;
 
@@ -144,6 +140,9 @@ struct cpufreq_policy {
 
         /* Pointer to the cooling device if used for thermal mitigation */
         struct thermal_cooling_device *cdev;
+
+        struct notifier_block nb_min;
+        struct notifier_block nb_max;
 };
 
 struct cpufreq_freqs {
@@ -201,6 +200,7 @@ void cpufreq_cpu_release(struct cpufreq_policy *policy);
 int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);
 int cpufreq_set_policy(struct cpufreq_policy *policy,
                        struct cpufreq_policy *new_policy);
+void refresh_frequency_limits(struct cpufreq_policy *policy);
 void cpufreq_update_policy(unsigned int cpu);
 void cpufreq_update_limits(unsigned int cpu);
 bool have_governor_per_policy(void);
@@ -992,7 +992,7 @@ extern struct freq_attr *cpufreq_generic_attr[];
 int cpufreq_table_validate_and_sort(struct cpufreq_policy *policy);
 
 unsigned int cpufreq_generic_get(unsigned int cpu);
-int cpufreq_generic_init(struct cpufreq_policy *policy,
+void cpufreq_generic_init(struct cpufreq_policy *policy,
                 struct cpufreq_frequency_table *table,
                 unsigned int transition_latency);
 #endif /* _LINUX_CPUFREQ_H */
diff --git a/include/linux/intel_rapl.h b/include/linux/intel_rapl.h
new file mode 100644
index 000000000000..efb3ce892c20
--- /dev/null
+++ b/include/linux/intel_rapl.h
@@ -0,0 +1,155 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ *  Data types and headers for RAPL support
+ *
+ *  Copyright (C) 2019  Intel Corporation.
+ *
+ *  Author: Zhang Rui <rui.zhang@intel.com>
+ */
+
+#ifndef __INTEL_RAPL_H__
+#define __INTEL_RAPL_H__
+
+#include <linux/types.h>
+#include <linux/powercap.h>
+#include <linux/cpuhotplug.h>
+
+enum rapl_domain_type {
+        RAPL_DOMAIN_PACKAGE,    /* entire package/socket */
+        RAPL_DOMAIN_PP0,        /* core power plane */
+        RAPL_DOMAIN_PP1,        /* graphics uncore */
+        RAPL_DOMAIN_DRAM,       /* DRAM control_type */
+        RAPL_DOMAIN_PLATFORM,   /* PSys control_type */
+        RAPL_DOMAIN_MAX,
+};
+
+enum rapl_domain_reg_id {
+        RAPL_DOMAIN_REG_LIMIT,
+        RAPL_DOMAIN_REG_STATUS,
+        RAPL_DOMAIN_REG_PERF,
+        RAPL_DOMAIN_REG_POLICY,
+        RAPL_DOMAIN_REG_INFO,
+        RAPL_DOMAIN_REG_MAX,
+};
+
+struct rapl_package;
+
+enum rapl_primitives {
+        ENERGY_COUNTER,
+        POWER_LIMIT1,
+        POWER_LIMIT2,
+        FW_LOCK,
+
+        PL1_ENABLE,             /* power limit 1, aka long term */
+        PL1_CLAMP,              /* allow frequency to go below OS request */
+        PL2_ENABLE,             /* power limit 2, aka short term, instantaneous */
+        PL2_CLAMP,
+
+        TIME_WINDOW1,           /* long term */
+        TIME_WINDOW2,           /* short term */
+        THERMAL_SPEC_POWER,
+        MAX_POWER,
+
+        MIN_POWER,
+        MAX_TIME_WINDOW,
+        THROTTLED_TIME,
+        PRIORITY_LEVEL,
+
+        /* below are not raw primitive data */
+        AVERAGE_POWER,
+        NR_RAPL_PRIMITIVES,
+};
+
+struct rapl_domain_data {
+        u64 primitives[NR_RAPL_PRIMITIVES];
+        unsigned long timestamp;
+};
+
+#define NR_POWER_LIMITS (2)
+struct rapl_power_limit {
+        struct powercap_zone_constraint *constraint;
+        int prim_id;            /* primitive ID used to enable */
+        struct rapl_domain *domain;
+        const char *name;
+        u64 last_power_limit;
+};
+
+struct rapl_package;
+
+struct rapl_domain {
+        const char *name;
+        enum rapl_domain_type id;
+        u64 regs[RAPL_DOMAIN_REG_MAX];
+        struct powercap_zone power_zone;
+        struct rapl_domain_data rdd;
+        struct rapl_power_limit rpl[NR_POWER_LIMITS];
+        u64 attr_map;           /* track capabilities */
+        unsigned int state;
+        unsigned int domain_energy_unit;
+        struct rapl_package *rp;
+};
+
+struct reg_action {
+        u64 reg;
+        u64 mask;
+        u64 value;
+        int err;
+};
+
+/**
+ * struct rapl_if_priv: private data for different RAPL interfaces
+ * @control_type:               Each RAPL interface must have its own powercap
+ *                              control type.
+ * @platform_rapl_domain:       Optional. Some RAPL interface may have platform
+ *                              level RAPL control.
+ * @pcap_rapl_online:           CPU hotplug state for each RAPL interface.
+ * @reg_unit:                   Register for getting energy/power/time unit.
+ * @regs:                       Register sets for different RAPL Domains.
+ * @limits:                     Number of power limits supported by each domain.
+ * @read_raw:                   Callback for reading RAPL interface specific
+ *                              registers.
+ * @write_raw:                  Callback for writing RAPL interface specific
+ *                              registers.
+ */
+struct rapl_if_priv {
+        struct powercap_control_type *control_type;
+        struct rapl_domain *platform_rapl_domain;
+        enum cpuhp_state pcap_rapl_online;
+        u64 reg_unit;
+        u64 regs[RAPL_DOMAIN_MAX][RAPL_DOMAIN_REG_MAX];
+        int limits[RAPL_DOMAIN_MAX];
+        int (*read_raw)(int cpu, struct reg_action *ra);
+        int (*write_raw)(int cpu, struct reg_action *ra);
+};
+
+/* maximum rapl package domain name: package-%d-die-%d */
+#define PACKAGE_DOMAIN_NAME_LENGTH 30
+
+struct rapl_package {
+        unsigned int id;        /* logical die id, equals physical 1-die systems */
+        unsigned int nr_domains;
+        unsigned long domain_map;       /* bit map of active domains */
+        unsigned int power_unit;
+        unsigned int energy_unit;
+        unsigned int time_unit;
+        struct rapl_domain *domains;    /* array of domains, sized at runtime */
+        struct powercap_zone *power_zone;       /* keep track of parent zone */
+        unsigned long power_limit_irq;  /* keep track of package power limit
+                                         * notify interrupt enable status.
+                                         */
+        struct list_head plist;
+        int lead_cpu;           /* one active cpu per package for access */
+        /* Track active cpus */
+        struct cpumask cpumask;
+        char name[PACKAGE_DOMAIN_NAME_LENGTH];
+        struct rapl_if_priv *priv;
+};
+
+struct rapl_package *rapl_find_package_domain(int cpu, struct rapl_if_priv *priv);
+struct rapl_package *rapl_add_package(int cpu, struct rapl_if_priv *priv);
+void rapl_remove_package(struct rapl_package *rp);
+
+int rapl_add_platform_domain(struct rapl_if_priv *priv);
+void rapl_remove_platform_domain(struct rapl_if_priv *priv);
+
+#endif /* __INTEL_RAPL_H__ */
diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h
index 6ea1ae373d77..2aebbc5b9950 100644
--- a/include/linux/pm_qos.h
+++ b/include/linux/pm_qos.h
@@ -40,6 +40,8 @@ enum pm_qos_flags_status {
 #define PM_QOS_RESUME_LATENCY_NO_CONSTRAINT     PM_QOS_LATENCY_ANY
 #define PM_QOS_RESUME_LATENCY_NO_CONSTRAINT_NS  PM_QOS_LATENCY_ANY_NS
 #define PM_QOS_LATENCY_TOLERANCE_DEFAULT_VALUE  0
+#define PM_QOS_MIN_FREQUENCY_DEFAULT_VALUE      0
+#define PM_QOS_MAX_FREQUENCY_DEFAULT_VALUE      (-1)
 #define PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT  (-1)
 
 #define PM_QOS_FLAG_NO_POWER_OFF        (1 << 0)
@@ -58,6 +60,8 @@ struct pm_qos_flags_request {
 enum dev_pm_qos_req_type {
         DEV_PM_QOS_RESUME_LATENCY = 1,
         DEV_PM_QOS_LATENCY_TOLERANCE,
+        DEV_PM_QOS_MIN_FREQUENCY,
+        DEV_PM_QOS_MAX_FREQUENCY,
         DEV_PM_QOS_FLAGS,
 };
 
@@ -99,10 +103,14 @@ struct pm_qos_flags {
 struct dev_pm_qos {
         struct pm_qos_constraints resume_latency;
         struct pm_qos_constraints latency_tolerance;
+        struct pm_qos_constraints min_frequency;
+        struct pm_qos_constraints max_frequency;
         struct pm_qos_flags flags;
         struct dev_pm_qos_request *resume_latency_req;
         struct dev_pm_qos_request *latency_tolerance_req;
         struct dev_pm_qos_request *flags_req;
+        struct dev_pm_qos_request *min_frequency_req;
+        struct dev_pm_qos_request *max_frequency_req;
 };
 
 /* Action requested to pm_qos_update_target */
@@ -139,16 +147,18 @@ s32 pm_qos_read_value(struct pm_qos_constraints *c);
 #ifdef CONFIG_PM
 enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev, s32 mask);
 enum pm_qos_flags_status dev_pm_qos_flags(struct device *dev, s32 mask);
-s32 __dev_pm_qos_read_value(struct device *dev);
-s32 dev_pm_qos_read_value(struct device *dev);
+s32 __dev_pm_qos_resume_latency(struct device *dev);
+s32 dev_pm_qos_read_value(struct device *dev, enum dev_pm_qos_req_type type);
 int dev_pm_qos_add_request(struct device *dev, struct dev_pm_qos_request *req,
                            enum dev_pm_qos_req_type type, s32 value);
 int dev_pm_qos_update_request(struct dev_pm_qos_request *req, s32 new_value);
 int dev_pm_qos_remove_request(struct dev_pm_qos_request *req);
 int dev_pm_qos_add_notifier(struct device *dev,
-                            struct notifier_block *notifier);
+                            struct notifier_block *notifier,
+                            enum dev_pm_qos_req_type type);
 int dev_pm_qos_remove_notifier(struct device *dev,
-                               struct notifier_block *notifier);
+                               struct notifier_block *notifier,
+                               enum dev_pm_qos_req_type type);
 void dev_pm_qos_constraints_init(struct device *dev);
 void dev_pm_qos_constraints_destroy(struct device *dev);
 int dev_pm_qos_add_ancestor_request(struct device *dev,
@@ -174,7 +184,7 @@ static inline s32 dev_pm_qos_requested_flags(struct device *dev)
         return dev->power.qos->flags_req->data.flr.flags;
 }
 
-static inline s32 dev_pm_qos_raw_read_value(struct device *dev)
+static inline s32 dev_pm_qos_raw_resume_latency(struct device *dev)
 {
         return IS_ERR_OR_NULL(dev->power.qos) ?
                 PM_QOS_RESUME_LATENCY_NO_CONSTRAINT :
@@ -187,10 +197,24 @@ static inline enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev,
 static inline enum pm_qos_flags_status dev_pm_qos_flags(struct device *dev,
                                                         s32 mask)
                         { return PM_QOS_FLAGS_UNDEFINED; }
-static inline s32 __dev_pm_qos_read_value(struct device *dev)
-                        { return PM_QOS_RESUME_LATENCY_NO_CONSTRAINT; }
-static inline s32 dev_pm_qos_read_value(struct device *dev)
+static inline s32 __dev_pm_qos_resume_latency(struct device *dev)
                         { return PM_QOS_RESUME_LATENCY_NO_CONSTRAINT; }
+static inline s32 dev_pm_qos_read_value(struct device *dev,
+                                        enum dev_pm_qos_req_type type)
+{
+        switch (type) {
+        case DEV_PM_QOS_RESUME_LATENCY:
+                return PM_QOS_RESUME_LATENCY_NO_CONSTRAINT;
+        case DEV_PM_QOS_MIN_FREQUENCY:
+                return PM_QOS_MIN_FREQUENCY_DEFAULT_VALUE;
+        case DEV_PM_QOS_MAX_FREQUENCY:
+                return PM_QOS_MAX_FREQUENCY_DEFAULT_VALUE;
+        default:
+                WARN_ON(1);
+                return 0;
+        }
+}
+
 static inline int dev_pm_qos_add_request(struct device *dev,
                                          struct dev_pm_qos_request *req,
                                          enum dev_pm_qos_req_type type,
@@ -202,10 +226,12 @@ static inline int dev_pm_qos_update_request(struct dev_pm_qos_request *req,
 static inline int dev_pm_qos_remove_request(struct dev_pm_qos_request *req)
                         { return 0; }
 static inline int dev_pm_qos_add_notifier(struct device *dev,
-                                          struct notifier_block *notifier)
+                                          struct notifier_block *notifier,
+                                          enum dev_pm_qos_req_type type)
                         { return 0; }
 static inline int dev_pm_qos_remove_notifier(struct device *dev,
-                                             struct notifier_block *notifier)
+                                             struct notifier_block *notifier,
+                                             enum dev_pm_qos_req_type type)
                         { return 0; }
 static inline void dev_pm_qos_constraints_init(struct device *dev)
 {
@@ -241,7 +267,7 @@ static inline s32 dev_pm_qos_requested_resume_latency(struct device *dev)
         return PM_QOS_RESUME_LATENCY_NO_CONSTRAINT;
 }
 static inline s32 dev_pm_qos_requested_flags(struct device *dev) { return 0; }
-static inline s32 dev_pm_qos_raw_read_value(struct device *dev)
+static inline s32 dev_pm_qos_raw_resume_latency(struct device *dev)
 {
         return PM_QOS_RESUME_LATENCY_NO_CONSTRAINT;
 }