shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "interconnect: Fix locking for runpm vs reclaim"

Browse Source 
This reverts commit ee42bfc791 which is
commit af42269c35 upstream.

It is reported to cause crashes, so revert it for now.

Bug: 326555421
Change-Id: I2fb3626c306e0444f4e0eb42a95488e688942ba9
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-02-27 17:58:16 +00:00
committed by Treehugger Robot
parent 4289e1348e
commit 30edcedb44
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/interconnect/core.c
View File

@@ -29,7 +29,6 @@ static LIST_HEAD(icc_providers);
static int providers_count; static int providers_count;
static bool synced_state; static bool synced_state;
static DEFINE_MUTEX(icc_lock); static DEFINE_MUTEX(icc_lock);
static DEFINE_MUTEX(icc_bw_lock);
static struct dentry *icc_debugfs_dir; static struct dentry *icc_debugfs_dir;
static void icc_summary_show_one(struct seq_file *s, struct icc_node *n) static void icc_summary_show_one(struct seq_file *s, struct icc_node *n)
@@ -633,7 +632,7 @@ int icc_set_bw(struct icc_path *path, u32 avg_bw, u32 peak_bw)
if (WARN_ON(IS_ERR(path) || !path->num_nodes)) if (WARN_ON(IS_ERR(path) || !path->num_nodes))
return -EINVAL; return -EINVAL;
mutex_lock(&icc_bw_lock); mutex_lock(&icc_lock);
old_avg = path->reqs[0].avg_bw; old_avg = path->reqs[0].avg_bw;
old_peak = path->reqs[0].peak_bw; old_peak = path->reqs[0].peak_bw;
@@ -665,7 +664,7 @@ int icc_set_bw(struct icc_path *path, u32 avg_bw, u32 peak_bw)
apply_constraints(path); apply_constraints(path);
} }
mutex_unlock(&icc_bw_lock); mutex_unlock(&icc_lock);
trace_icc_set_bw_end(path, ret); trace_icc_set_bw_end(path, ret);
@@ -968,7 +967,6 @@ void icc_node_add(struct icc_node *node, struct icc_provider *provider)
return; return;
mutex_lock(&icc_lock); mutex_lock(&icc_lock);
mutex_lock(&icc_bw_lock);
node->provider = provider; node->provider = provider;
list_add_tail(&node->node_list, &provider->nodes); list_add_tail(&node->node_list, &provider->nodes);
@@ -994,7 +992,6 @@ void icc_node_add(struct icc_node *node, struct icc_provider *provider)
node->avg_bw = 0; node->avg_bw = 0;
node->peak_bw = 0; node->peak_bw = 0;
mutex_unlock(&icc_bw_lock);
mutex_unlock(&icc_lock); mutex_unlock(&icc_lock);
} }
EXPORT_SYMBOL_GPL(icc_node_add); EXPORT_SYMBOL_GPL(icc_node_add);
@@ -1134,7 +1131,6 @@ void icc_sync_state(struct device *dev)
return; return;
mutex_lock(&icc_lock); mutex_lock(&icc_lock);
mutex_lock(&icc_bw_lock);
synced_state = true; synced_state = true;
list_for_each_entry(p, &icc_providers, provider_list) { list_for_each_entry(p, &icc_providers, provider_list) {
dev_dbg(p->dev, "interconnect provider is in synced state\n"); dev_dbg(p->dev, "interconnect provider is in synced state\n");