[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220621192034.3332546-5-sudeep.holla@arm.com>
Date: Tue, 21 Jun 2022 20:20:18 +0100
From: Sudeep Holla <sudeep.holla@....com>
To: linux-kernel@...r.kernel.org, Greg KH <gregkh@...uxfoundation.org>
Cc: Sudeep Holla <sudeep.holla@....com>,
Atish Patra <atishp@...shpatra.org>,
Atish Patra <atishp@...osinc.com>,
Vincent Guittot <vincent.guittot@...aro.org>,
Dietmar Eggemann <dietmar.eggemann@....com>,
Qing Wang <wangqing@...o.com>,
Rob Herring <robh+dt@...nel.org>,
"Rafael J . Wysocki" <rafael@...nel.org>,
Ionela Voinescu <ionela.voinescu@....com>,
Pierre Gondois <pierre.gondois@....com>,
linux-arm-kernel@...ts.infradead.org,
linux-riscv@...ts.infradead.org, Gavin Shan <gshan@...hat.com>
Subject: [PATCH v4 04/20] cacheinfo: Move cache_leaves_are_shared out of CONFIG_OF
cache_leaves_are_shared is already used even with ACPI and PPTT. It checks
if the cache leaves are the shared based on fw_token pointer. However it is
defined conditionally only if CONFIG_OF is enabled which is wrong.
Move the function cache_leaves_are_shared out of CONFIG_OF and keep it
generic. It also handles the case where both OF and ACPI is not defined.
Reviewed-by: Gavin Shan <gshan@...hat.com>
Signed-off-by: Sudeep Holla <sudeep.holla@....com>
---
drivers/base/cacheinfo.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index e13ef41763e4..2cea9201f31c 100644
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -33,13 +33,21 @@ struct cpu_cacheinfo *get_cpu_cacheinfo(unsigned int cpu)
return ci_cacheinfo(cpu);
}
-#ifdef CONFIG_OF
static inline bool cache_leaves_are_shared(struct cacheinfo *this_leaf,
struct cacheinfo *sib_leaf)
{
+ /*
+ * For non DT/ACPI systems, assume unique level 1 caches,
+ * system-wide shared caches for all other levels. This will be used
+ * only if arch specific code has not populated shared_cpu_map
+ */
+ if (!(IS_ENABLED(CONFIG_OF) || IS_ENABLED(CONFIG_ACPI)))
+ return !(this_leaf->level == 1);
+
return sib_leaf->fw_token == this_leaf->fw_token;
}
+#ifdef CONFIG_OF
/* OF properties to query for a given cache type */
struct cache_type_info {
const char *size_prop;
@@ -193,16 +201,6 @@ static int cache_setup_of_node(unsigned int cpu)
}
#else
static inline int cache_setup_of_node(unsigned int cpu) { return 0; }
-static inline bool cache_leaves_are_shared(struct cacheinfo *this_leaf,
- struct cacheinfo *sib_leaf)
-{
- /*
- * For non-DT/ACPI systems, assume unique level 1 caches, system-wide
- * shared caches for all other levels. This will be used only if
- * arch specific code has not populated shared_cpu_map
- */
- return !(this_leaf->level == 1);
-}
#endif
int __weak cache_setup_acpi(unsigned int cpu)
--
2.36.1
Powered by blists - more mailing lists