Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[platform/kernel/linux-starfive.git] / drivers / interconnect / core.c

diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
index fc1461d..dfab160 100644 (file)
--- a/drivers/interconnect/core.c
+++ b/drivers/interconnect/core.c
@@ -28,6 +28,7 @@ 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)
@@ -694,7 +695,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_lock);
+       mutex_lock(&icc_bw_lock);
 
        old_avg = path->reqs[0].avg_bw;
        old_peak = path->reqs[0].peak_bw;
@@ -726,7 +727,7 @@ int icc_set_bw(struct icc_path *path, u32 avg_bw, u32 peak_bw)
                apply_constraints(path);
        }
 
-       mutex_unlock(&icc_lock);
+       mutex_unlock(&icc_bw_lock);
 
        trace_icc_set_bw_end(path, ret);
 
@@ -935,6 +936,7 @@ 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);
@@ -963,6 +965,7 @@ 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);
@@ -1088,6 +1091,7 @@ 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");
@@ -1100,13 +1104,21 @@ void icc_sync_state(struct device *dev)
                        }
                }
        }
+       mutex_unlock(&icc_bw_lock);
        mutex_unlock(&icc_lock);
 }
 EXPORT_SYMBOL_GPL(icc_sync_state);
 
 static int __init icc_init(void)
 {
-       struct device_node *root = of_find_node_by_path("/");
+       struct device_node *root;
+
+       /* Teach lockdep about lock ordering wrt. shrinker: */
+       fs_reclaim_acquire(GFP_KERNEL);
+       might_lock(&icc_bw_lock);
+       fs_reclaim_release(GFP_KERNEL);
+
+       root = of_find_node_by_path("/");
 
        providers_count = of_count_icc_providers(root);
        of_node_put(root);
@@ -1116,6 +1128,9 @@ static int __init icc_init(void)
                            icc_debugfs_dir, NULL, &icc_summary_fops);
        debugfs_create_file("interconnect_graph", 0444,
                            icc_debugfs_dir, NULL, &icc_graph_fops);
+
+       icc_debugfs_client_init(icc_debugfs_dir);
+
        return 0;
 }