From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 4 Mar 2024 13:12:15 +0000 (+0100)
Subject: Revert "interconnect: Teach lockdep about icc_bw_lock order"
X-Git-Tag: v5.15.151~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20f5aafe521cd5e6aa8b509153b2a445393b6cdd;p=thirdparty%2Fkernel%2Fstable.git

Revert "interconnect: Teach lockdep about icc_bw_lock order"

This reverts commit e3a29b80e9e6df217dd61c670ac42864fa4a0e67 which is
commit 13619170303878e1dae86d9a58b039475c957fcf 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: Guenter Roeck <linux@roeck-us.net>
Cc: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
index edcc9e26beb7a..78315cb64add5 100644
--- a/drivers/interconnect/core.c
+++ b/drivers/interconnect/core.c
@@ -1135,21 +1135,13 @@ 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;
-
-	/* 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("/");
+	struct device_node *root = of_find_node_by_path("/");
 
 	providers_count = of_count_icc_providers(root);
 	of_node_put(root);