1 files changed, 19 insertions, 2 deletions

diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
index b8e76f75073b..6aa172be6e8e 100644
--- a/drivers/base/power/opp/core.c
+++ b/drivers/base/power/opp/core.c
@@ -463,6 +463,7 @@ static void _kfree_list_dev_rcu(struct rcu_head *head)
 static void _remove_list_dev(struct device_list_opp *list_dev,
                              struct device_opp *dev_opp)
 {
+        opp_debug_unregister(list_dev, dev_opp);
         list_del(&list_dev->node);
         call_srcu(&dev_opp->srcu_head.srcu, &list_dev->rcu_head,
                   _kfree_list_dev_rcu);
@@ -472,6 +473,7 @@ struct device_list_opp *_add_list_dev(const struct device *dev,
                                       struct device_opp *dev_opp)
 {
         struct device_list_opp *list_dev;
+        int ret;
 
         list_dev = kzalloc(sizeof(*list_dev), GFP_KERNEL);
         if (!list_dev)
@@ -481,6 +483,12 @@ struct device_list_opp *_add_list_dev(const struct device *dev,
         list_dev->dev = dev;
         list_add_rcu(&list_dev->node, &dev_opp->dev_list);
 
+        /* Create debugfs entries for the dev_opp */
+        ret = opp_debug_register(list_dev, dev_opp);
+        if (ret)
+                dev_err(dev, "%s: Failed to register opp debugfs (%d)\n",
+                        __func__, ret);
+
         return list_dev;
 }
 
@@ -596,6 +604,7 @@ static void _opp_remove(struct device_opp *dev_opp,
          */
         if (notify)
                 srcu_notifier_call_chain(&dev_opp->srcu_head, OPP_EVENT_REMOVE, opp);
+        opp_debug_remove_one(opp);
         list_del_rcu(&opp->node);
         call_srcu(&dev_opp->srcu_head.srcu, &opp->rcu_head, _kfree_opp_rcu);
 
@@ -673,6 +682,7 @@ static int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,
 {
         struct dev_pm_opp *opp;
         struct list_head *head = &dev_opp->opp_list;
+        int ret;
 
         /*
          * Insert new OPP in order of increasing frequency and discard if
@@ -703,6 +713,11 @@ static int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,
         new_opp->dev_opp = dev_opp;
         list_add_rcu(&new_opp->node, head);
 
+        ret = opp_debug_create_one(new_opp, dev_opp);
+        if (ret)
+                dev_err(dev, "%s: Failed to register opp to debugfs (%d)\n",
+                        __func__, ret);
+
         return 0;
 }
 
@@ -889,12 +904,14 @@ static int _opp_add_static_v2(struct device *dev, struct device_node *np)
 
         /* OPP to select on device suspend */
         if (of_property_read_bool(np, "opp-suspend")) {
-                if (dev_opp->suspend_opp)
+                if (dev_opp->suspend_opp) {
                         dev_warn(dev, "%s: Multiple suspend OPPs found (%lu %lu)\n",
                                  __func__, dev_opp->suspend_opp->rate,
                                  new_opp->rate);
-                else
+                } else {
+                        new_opp->suspend = true;
                         dev_opp->suspend_opp = new_opp;
+                }
         }
 
         if (new_opp->clock_latency_ns > dev_opp->clock_latency_ns_max)