From: Sudeep Holla <sudeep.holla@arm.com>
To: linux-kernel@vger.kernel.org, Greg KH <gregkh@linuxfoundation.org>
Cc: Sudeep Holla <sudeep.holla@arm.com>,
Atish Patra <atishp@atishpatra.org>,
Atish Patra <atishp@rivosinc.com>,
Vincent Guittot <vincent.guittot@linaro.org>,
Dietmar Eggemann <dietmar.eggemann@arm.com>,
Qing Wang <wangqing@vivo.com>, Rob Herring <robh+dt@kernel.org>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Ionela Voinescu <ionela.voinescu@arm.com>,
Pierre Gondois <pierre.gondois@arm.com>,
linux-arm-kernel@lists.infradead.org,
linux-riscv@lists.infradead.org, Gavin Shan <gshan@redhat.com>
Subject: [PATCH v4 04/20] cacheinfo: Move cache_leaves_are_shared out of CONFIG_OF
Date: Tue, 21 Jun 2022 20:20:18 +0100 [thread overview]
Message-ID: <20220621192034.3332546-5-sudeep.holla@arm.com> (raw)
In-Reply-To: <20220621192034.3332546-1-sudeep.holla@arm.com>
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@redhat.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.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
WARNING: multiple messages have this Message-ID (diff)
From: Sudeep Holla <sudeep.holla@arm.com>
To: linux-kernel@vger.kernel.org, Greg KH <gregkh@linuxfoundation.org>
Cc: Sudeep Holla <sudeep.holla@arm.com>,
Atish Patra <atishp@atishpatra.org>,
Atish Patra <atishp@rivosinc.com>,
Vincent Guittot <vincent.guittot@linaro.org>,
Dietmar Eggemann <dietmar.eggemann@arm.com>,
Qing Wang <wangqing@vivo.com>, Rob Herring <robh+dt@kernel.org>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Ionela Voinescu <ionela.voinescu@arm.com>,
Pierre Gondois <pierre.gondois@arm.com>,
linux-arm-kernel@lists.infradead.org,
linux-riscv@lists.infradead.org, Gavin Shan <gshan@redhat.com>
Subject: [PATCH v4 04/20] cacheinfo: Move cache_leaves_are_shared out of CONFIG_OF
Date: Tue, 21 Jun 2022 20:20:18 +0100 [thread overview]
Message-ID: <20220621192034.3332546-5-sudeep.holla@arm.com> (raw)
In-Reply-To: <20220621192034.3332546-1-sudeep.holla@arm.com>
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@redhat.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.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
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
WARNING: multiple messages have this Message-ID (diff)
From: Sudeep Holla <sudeep.holla@arm.com>
To: linux-kernel@vger.kernel.org, Greg KH <gregkh@linuxfoundation.org>
Cc: Sudeep Holla <sudeep.holla@arm.com>,
Atish Patra <atishp@atishpatra.org>,
Atish Patra <atishp@rivosinc.com>,
Vincent Guittot <vincent.guittot@linaro.org>,
Dietmar Eggemann <dietmar.eggemann@arm.com>,
Qing Wang <wangqing@vivo.com>, Rob Herring <robh+dt@kernel.org>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Ionela Voinescu <ionela.voinescu@arm.com>,
Pierre Gondois <pierre.gondois@arm.com>,
linux-arm-kernel@lists.infradead.org,
linux-riscv@lists.infradead.org, Gavin Shan <gshan@redhat.com>
Subject: [PATCH v4 04/20] cacheinfo: Move cache_leaves_are_shared out of CONFIG_OF
Date: Tue, 21 Jun 2022 20:20:18 +0100 [thread overview]
Message-ID: <20220621192034.3332546-5-sudeep.holla@arm.com> (raw)
In-Reply-To: <20220621192034.3332546-1-sudeep.holla@arm.com>
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@redhat.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-06-21 19:21 UTC|newest]
Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-21 19:20 [PATCH v4 00/20] arch_topology: Updates to add socket support and fix cluster ids Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 01/20] ACPI: PPTT: Use table offset as fw_token instead of virtual address Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-22 11:47 ` Rafael J. Wysocki
2022-06-22 11:47 ` Rafael J. Wysocki
2022-06-22 11:47 ` Rafael J. Wysocki
2022-06-27 13:41 ` Ionela Voinescu
2022-06-27 13:41 ` Ionela Voinescu
2022-06-27 13:41 ` Ionela Voinescu
2022-06-21 19:20 ` [PATCH v4 02/20] cacheinfo: Use of_cpu_device_node_get instead cpu_dev->of_node Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 03/20] cacheinfo: Add helper to access any cache index for a given CPU Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla [this message]
2022-06-21 19:20 ` [PATCH v4 04/20] cacheinfo: Move cache_leaves_are_shared out of CONFIG_OF Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 05/20] cacheinfo: Add support to check if last level cache(LLC) is valid or shared Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 06/20] cacheinfo: Allow early detection and population of cache attributes Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 07/20] cacheinfo: Use cache identifiers to check if the caches are shared if available Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 08/20] arch_topology: Add support to parse and detect cache attributes Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 09/20] arch_topology: Use the last level cache information from the cacheinfo Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 10/20] arm64: topology: Remove redundant setting of llc_id in CPU topology Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-23 15:55 ` Catalin Marinas
2022-06-23 15:55 ` Catalin Marinas
2022-06-23 15:55 ` Catalin Marinas
2022-06-21 19:20 ` [PATCH v4 11/20] arch_topology: Drop LLC identifier stash from the " Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 12/20] arch_topology: Set thread sibling cpumask only within the cluster Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-27 13:42 ` Ionela Voinescu
2022-06-27 13:42 ` Ionela Voinescu
2022-06-27 13:42 ` Ionela Voinescu
2022-06-21 19:20 ` [PATCH v4 13/20] arch_topology: Check for non-negative value rather than -1 for IDs validity Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 14/20] arch_topology: Avoid parsing through all the CPUs once a outlier CPU is found Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 15/20] arch_topology: Don't set cluster identifier as physical package identifier Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-27 13:43 ` Ionela Voinescu
2022-06-27 13:43 ` Ionela Voinescu
2022-06-27 13:43 ` Ionela Voinescu
2022-06-21 19:20 ` [PATCH v4 16/20] arch_topology: Drop unnecessary check for uninitialised package_id Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-27 13:12 ` Ionela Voinescu
2022-06-27 13:12 ` Ionela Voinescu
2022-06-27 13:12 ` Ionela Voinescu
2022-06-27 16:30 ` Sudeep Holla
2022-06-27 16:30 ` Sudeep Holla
2022-06-27 16:30 ` Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 17/20] arch_topology: Limit span of cpu_clustergroup_mask() Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 18/20] arch_topology: Set cluster identifier in each core/thread from /cpu-map Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-27 13:47 ` Ionela Voinescu
2022-06-27 13:47 ` Ionela Voinescu
2022-06-27 13:47 ` Ionela Voinescu
2022-06-21 19:20 ` [PATCH v4 19/20] arch_topology: Add support for parsing sockets in /cpu-map Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-27 13:47 ` Ionela Voinescu
2022-06-27 13:47 ` Ionela Voinescu
2022-06-27 13:47 ` Ionela Voinescu
2022-06-21 19:20 ` [PATCH v4 20/20] arch_topology: Warn that topology for nested clusters is not supported Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla
2022-06-22 15:06 ` Ionela Voinescu
2022-06-22 15:06 ` Ionela Voinescu
2022-06-22 15:06 ` Ionela Voinescu
2022-06-22 15:46 ` Sudeep Holla
2022-06-22 15:46 ` Sudeep Holla
2022-06-22 15:46 ` Sudeep Holla
2022-06-27 13:54 ` [PATCH v4 00/20] arch_topology: Updates to add socket support and fix cluster ids Ionela Voinescu
2022-06-27 13:54 ` Ionela Voinescu
2022-06-27 13:54 ` Ionela Voinescu
2022-06-27 16:22 ` Sudeep Holla
2022-06-27 16:22 ` Sudeep Holla
2022-06-27 16:22 ` Sudeep Holla
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220621192034.3332546-5-sudeep.holla@arm.com \
--to=sudeep.holla@arm.com \
--cc=atishp@atishpatra.org \
--cc=atishp@rivosinc.com \
--cc=dietmar.eggemann@arm.com \
--cc=gregkh@linuxfoundation.org \
--cc=gshan@redhat.com \
--cc=ionela.voinescu@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=pierre.gondois@arm.com \
--cc=rafael@kernel.org \
--cc=robh+dt@kernel.org \
--cc=vincent.guittot@linaro.org \
--cc=wangqing@vivo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.