Merge branches 'pm-domains', 'pm-avs' and 'powercap'

* pm-domains:
  PM / Domains: Fix missing default_power_down_ok comment
  PM / Domains: Fix unsafe iteration over modified list of domains
  PM / Domains: Fix unsafe iteration over modified list of domain providers
  PM / Domains: Fix unsafe iteration over modified list of device links
  PM / Domains: Handle safely genpd_syscore_switch() call on non-genpd device
  PM / Domains: Call driver's noirq callbacks
  PM / Domains: Constify genpd pointer
  PM / Domains: pdd->dev can't be NULL in genpd_dev_pm_qos_notifier()

* pm-avs:
  PM / AVS: rockchip-io: add io selectors and supplies for rk3228

* powercap:
  powercap/RAPL: prevent overridding bits outside of the mask

diff --combined drivers/base/power/domain.c
index da49a8383dc30b074d28463e3b2771cd2ebd8adb,e342408cfb8d29028a3f3bd17fb8b50197da308b,da49a8383dc30b074d28463e3b2771cd2ebd8adb,da49a8383dc30b074d28463e3b2771cd2ebd8adb..b8e4b966c74dc393b473da4f0074b802b8add5f8
--- 1/drivers/base/power/domain.c
--- 2/drivers/base/power/domain.c
--- 3/drivers/base/power/domain.c
--- 4/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@@@@ -126,7 -126,7 -126,7 -126,7 +126,7 @@@@@ static const struct genpd_lock_ops genp
    #define genpd_is_always_on(genpd)   (genpd->flags & GENPD_FLAG_ALWAYS_ON)
    
    static inline bool irq_safe_dev_in_no_sleep_domain(struct device *dev,
- --            struct generic_pm_domain *genpd)
+ ++            const struct generic_pm_domain *genpd)
    {
        bool ret;
    
@@@@@ -181,12 -181,14 -181,12 -181,12 +181,14 @@@@@ static struct generic_pm_domain *dev_to
        return pd_to_genpd(dev->pm_domain);
    }
    
- --static int genpd_stop_dev(struct generic_pm_domain *genpd, struct device *dev)
+ ++static int genpd_stop_dev(const struct generic_pm_domain *genpd,
+ ++                      struct device *dev)
    {
        return GENPD_DEV_CALLBACK(genpd, int, stop, dev);
    }
    
- --static int genpd_start_dev(struct generic_pm_domain *genpd, struct device *dev)
+ ++static int genpd_start_dev(const struct generic_pm_domain *genpd,
+ ++                       struct device *dev)
    {
        return GENPD_DEV_CALLBACK(genpd, int, start, dev);
    }
@@@@@ -443,7 -445,7 -443,7 -443,7 +445,7 @@@@@ static int genpd_dev_pm_qos_notifier(st
    
                pdd = dev->power.subsys_data ?
                                dev->power.subsys_data->domain_data : NULL;
- --            if (pdd && pdd->dev) {
+ ++            if (pdd) {
                        to_gpd_data(pdd)->td.constraint_changed = true;
                        genpd = dev_to_genpd(dev);
                } else {
@@@@@ -738,7 -740,7 -738,7 -738,7 +740,7 @@@@@ static bool pm_genpd_present(const stru
    
    #ifdef CONFIG_PM_SLEEP
    
- --static bool genpd_dev_active_wakeup(struct generic_pm_domain *genpd,
+ ++static bool genpd_dev_active_wakeup(const struct generic_pm_domain *genpd,
                                    struct device *dev)
    {
        return GENPD_DEV_CALLBACK(genpd, bool, active_wakeup, dev);
@@@@@ -840,7 -842,8 -840,7 -840,7 +842,8 @@@@@ static void genpd_sync_power_on(struct 
     * signal remote wakeup from the system's working state as needed by runtime PM.
     * Return 'true' in either of the above cases.
     */
- --static bool resume_needed(struct device *dev, struct generic_pm_domain *genpd)
+ ++static bool resume_needed(struct device *dev,
+ ++                      const struct generic_pm_domain *genpd)
    {
        bool active_wakeup;
    
@@@@@ -899,19 -902,19 -899,19 -899,19 +902,19 @@@@@ static int pm_genpd_prepare(struct devi
    }
    
    /**
- -- * pm_genpd_suspend_noirq - Completion of suspend of device in an I/O PM domain.
+ ++ * genpd_finish_suspend - Completion of suspend or hibernation of device in an
+ ++ *   I/O pm domain.
     * @dev: Device to suspend.
+ ++ * @poweroff: Specifies if this is a poweroff_noirq or suspend_noirq callback.
     *
     * Stop the device and remove power from the domain if all devices in it have
     * been stopped.
     */
- --static int pm_genpd_suspend_noirq(struct device *dev)
+ ++static int genpd_finish_suspend(struct device *dev, bool poweroff)
    {
        struct generic_pm_domain *genpd;
        int ret;
    
- --    dev_dbg(dev, "%s()\n", __func__);
- --
        genpd = dev_to_genpd(dev);
        if (IS_ERR(genpd))
                return -EINVAL;
@@@@@ -919,6 -922,13 -919,6 -919,6 +922,13 @@@@@
        if (dev->power.wakeup_path && genpd_dev_active_wakeup(genpd, dev))
                return 0;
    
+ ++    if (poweroff)
+ ++            ret = pm_generic_poweroff_noirq(dev);
+ ++    else
+ ++            ret = pm_generic_suspend_noirq(dev);
+ ++    if (ret)
+ ++            return ret;
+ ++
        if (genpd->dev_ops.stop && genpd->dev_ops.start) {
                ret = pm_runtime_force_suspend(dev);
                if (ret)
@@@@@ -933,6 -943,20 -933,6 -933,6 +943,20 @@@@@
        return 0;
    }
    
+ ++/**
+ ++ * pm_genpd_suspend_noirq - Completion of suspend of device in an I/O PM domain.
+ ++ * @dev: Device to suspend.
+ ++ *
+ ++ * Stop the device and remove power from the domain if all devices in it have
+ ++ * been stopped.
+ ++ */
+ ++static int pm_genpd_suspend_noirq(struct device *dev)
+ ++{
+ ++    dev_dbg(dev, "%s()\n", __func__);
+ ++
+ ++    return genpd_finish_suspend(dev, false);
+ ++}
+ ++
    /**
     * pm_genpd_resume_noirq - Start of resume of device in an I/O PM domain.
     * @dev: Device to resume.
@@@@@ -961,6 -985,10 -961,6 -961,6 +985,10 @@@@@ static int pm_genpd_resume_noirq(struc
        if (genpd->dev_ops.stop && genpd->dev_ops.start)
                ret = pm_runtime_force_resume(dev);
    
+ ++    ret = pm_generic_resume_noirq(dev);
+ ++    if (ret)
+ ++            return ret;
+ ++
        return ret;
    }
    
@@@@@ -975,7 -1003,7 -975,7 -975,7 +1003,7 @@@@@
     */
    static int pm_genpd_freeze_noirq(struct device *dev)
    {
- --    struct generic_pm_domain *genpd;
+ ++    const struct generic_pm_domain *genpd;
        int ret = 0;
    
        dev_dbg(dev, "%s()\n", __func__);
@@@@@ -984,6 -1012,10 -984,6 -984,6 +1012,10 @@@@@
        if (IS_ERR(genpd))
                return -EINVAL;
    
+ ++    ret = pm_generic_freeze_noirq(dev);
+ ++    if (ret)
+ ++            return ret;
+ ++
        if (genpd->dev_ops.stop && genpd->dev_ops.start)
                ret = pm_runtime_force_suspend(dev);
    
@@@@@ -999,7 -1031,7 -999,7 -999,7 +1031,7 @@@@@
     */
    static int pm_genpd_thaw_noirq(struct device *dev)
    {
- --    struct generic_pm_domain *genpd;
+ ++    const struct generic_pm_domain *genpd;
        int ret = 0;
    
        dev_dbg(dev, "%s()\n", __func__);
@@@@@ -1008,10 -1040,28 -1008,10 -1008,10 +1040,28 @@@@@
        if (IS_ERR(genpd))
                return -EINVAL;
    
- --    if (genpd->dev_ops.stop && genpd->dev_ops.start)
+ ++    if (genpd->dev_ops.stop && genpd->dev_ops.start) {
                ret = pm_runtime_force_resume(dev);
+ ++            if (ret)
+ ++                    return ret;
+ ++    }
    
- --    return ret;
+ ++    return pm_generic_thaw_noirq(dev);
+ ++}
+ ++
+ ++/**
+ ++ * pm_genpd_poweroff_noirq - Completion of hibernation of device in an
+ ++ *   I/O PM domain.
+ ++ * @dev: Device to poweroff.
+ ++ *
+ ++ * Stop the device and remove power from the domain if all devices in it have
+ ++ * been stopped.
+ ++ */
+ ++static int pm_genpd_poweroff_noirq(struct device *dev)
+ ++{
+ ++    dev_dbg(dev, "%s()\n", __func__);
+ ++
+ ++    return genpd_finish_suspend(dev, true);
    }
    
    /**
@@@@@ -1048,10 -1098,13 -1048,10 -1048,10 +1098,13 @@@@@ static int pm_genpd_restore_noirq(struc
        genpd_sync_power_on(genpd, true, 0);
        genpd_unlock(genpd);
    
- --    if (genpd->dev_ops.stop && genpd->dev_ops.start)
+ ++    if (genpd->dev_ops.stop && genpd->dev_ops.start) {
                ret = pm_runtime_force_resume(dev);
+ ++            if (ret)
+ ++                    return ret;
+ ++    }
    
- --    return ret;
+ ++    return pm_generic_restore_noirq(dev);
    }
    
    /**
@@@@@ -1095,8 -1148,8 -1095,8 -1095,8 +1148,8 @@@@@ static void genpd_syscore_switch(struc
    {
        struct generic_pm_domain *genpd;
    
- --    genpd = dev_to_genpd(dev);
- --    if (!pm_genpd_present(genpd))
+ ++    genpd = genpd_lookup_dev(dev);
+ ++    if (!genpd)
                return;
    
        if (suspend) {
@@@@@ -1393,7 -1446,7 -1393,7 -1393,7 +1446,7 @@@@@ EXPORT_SYMBOL_GPL(pm_genpd_add_subdomai
    int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,
                              struct generic_pm_domain *subdomain)
    {
- --    struct gpd_link *link;
+ ++    struct gpd_link *l, *link;
        int ret = -EINVAL;
    
        if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(subdomain))
@@@@@ -1409,7 -1462,7 -1409,7 -1409,7 +1462,7 @@@@@
                goto out;
        }
    
- --    list_for_each_entry(link, &genpd->master_links, master_node) {
+ ++    list_for_each_entry_safe(link, l, &genpd->master_links, master_node) {
                if (link->slave != subdomain)
                        continue;
    
@@@@@ -1493,7 -1546,7 -1493,7 -1493,7 +1546,7 @@@@@ int pm_genpd_init(struct generic_pm_dom
        genpd->domain.ops.resume_noirq = pm_genpd_resume_noirq;
        genpd->domain.ops.freeze_noirq = pm_genpd_freeze_noirq;
        genpd->domain.ops.thaw_noirq = pm_genpd_thaw_noirq;
- --    genpd->domain.ops.poweroff_noirq = pm_genpd_suspend_noirq;
+ ++    genpd->domain.ops.poweroff_noirq = pm_genpd_poweroff_noirq;
        genpd->domain.ops.restore_noirq = pm_genpd_restore_noirq;
        genpd->domain.ops.complete = pm_genpd_complete;
    
@@@@@ -1636,6 -1689,8 -1636,6 -1636,6 +1689,6 @@@@@ static struct generic_pm_domain *genpd_
                                        struct of_phandle_args *genpdspec,
                                        void *data)
    {
 -      if (genpdspec->args_count != 0)
 -              return ERR_PTR(-EINVAL);
        return data;
    }
    
@@@@@ -1780,12 -1835,12 -1780,12 -1780,12 +1833,12 @@@@@ EXPORT_SYMBOL_GPL(of_genpd_add_provider
     */
    void of_genpd_del_provider(struct device_node *np)
    {
- --    struct of_genpd_provider *cp;
+ ++    struct of_genpd_provider *cp, *tmp;
        struct generic_pm_domain *gpd;
    
        mutex_lock(&gpd_list_lock);
        mutex_lock(&of_genpd_mutex);
- --    list_for_each_entry(cp, &of_genpd_providers, link) {
+ ++    list_for_each_entry_safe(cp, tmp, &of_genpd_providers, link) {
                if (cp->node == np) {
                        /*
                         * For each PM domain associated with the
@@@@@ -1925,14 -1980,14 -1925,14 -1925,14 +1978,14 @@@@@ EXPORT_SYMBOL_GPL(of_genpd_add_subdomai
     */
    struct generic_pm_domain *of_genpd_remove_last(struct device_node *np)
    {
- --    struct generic_pm_domain *gpd, *genpd = ERR_PTR(-ENOENT);
+ ++    struct generic_pm_domain *gpd, *tmp, *genpd = ERR_PTR(-ENOENT);
        int ret;
    
        if (IS_ERR_OR_NULL(np))
                return ERR_PTR(-EINVAL);
    
        mutex_lock(&gpd_list_lock);
- --    list_for_each_entry(gpd, &gpd_list, gpd_list_node) {
+ ++    list_for_each_entry_safe(gpd, tmp, &gpd_list, gpd_list_node) {
                if (gpd->provider == &np->fwnode) {
                        ret = genpd_remove(gpd);
                        genpd = ret ? ERR_PTR(ret) : gpd;