Revert "interconnect: Fix locking for runpm vs reclaim"

This reverts commit 9be2957f014d91088db1eb5dd09d9a03d7184dce which is
commit af42269c3523492d71ebbe11fefae2653e9cdc78 upstream.

It is reported to cause boot crashes in Android systems, so revert it
from the stable trees for now.

Cc: Rob Clark <robdclark@chromium.org>
Cc: Georgi Djakov <djakov@kernel.org>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
index aadb2b97498a01e5fbc7d05cbc5eed3e68a43f21..edcc9e26beb7aa6be56481472d9213321a16aed4 100644 (file)
--- a/drivers/interconnect/core.c
+++ b/drivers/interconnect/core.c
@@ -30,7 +30,6 @@ static LIST_HEAD(icc_providers);
 static int providers_count;
 static bool synced_state;
 static DEFINE_MUTEX(icc_lock);
-static DEFINE_MUTEX(icc_bw_lock);
 static struct dentry *icc_debugfs_dir;
 
 static void icc_summary_show_one(struct seq_file *s, struct icc_node *n)
@@ -637,7 +636,7 @@ int icc_set_bw(struct icc_path *path, u32 avg_bw, u32 peak_bw)
        if (WARN_ON(IS_ERR(path) || !path->num_nodes))
                return -EINVAL;
 
-       mutex_lock(&icc_bw_lock);
+       mutex_lock(&icc_lock);
 
        old_avg = path->reqs[0].avg_bw;
        old_peak = path->reqs[0].peak_bw;
@@ -669,7 +668,7 @@ int icc_set_bw(struct icc_path *path, u32 avg_bw, u32 peak_bw)
                apply_constraints(path);
        }
 
-       mutex_unlock(&icc_bw_lock);
+       mutex_unlock(&icc_lock);
 
        trace_icc_set_bw_end(path, ret);
 
@@ -972,7 +971,6 @@ void icc_node_add(struct icc_node *node, struct icc_provider *provider)
                return;
 
        mutex_lock(&icc_lock);
-       mutex_lock(&icc_bw_lock);
 
        node->provider = provider;
        list_add_tail(&node->node_list, &provider->nodes);
@@ -998,7 +996,6 @@ void icc_node_add(struct icc_node *node, struct icc_provider *provider)
        node->avg_bw = 0;
        node->peak_bw = 0;
 
-       mutex_unlock(&icc_bw_lock);
        mutex_unlock(&icc_lock);
 }
 EXPORT_SYMBOL_GPL(icc_node_add);
@@ -1126,7 +1123,6 @@ void icc_sync_state(struct device *dev)
                return;
 
        mutex_lock(&icc_lock);
-       mutex_lock(&icc_bw_lock);
        synced_state = true;
        list_for_each_entry(p, &icc_providers, provider_list) {
                dev_dbg(p->dev, "interconnect provider is in synced state\n");