PowerPC device trees commonly describe a unified cache using d-cache-*
properties.
For example, Power11 L2 and L3 cache nodes have cache-unified together
with properties such as:
d-cache-size
d-cache-line-size
d-cache-sets
They do not provide the corresponding cache-size, cache-line-size and
cache-sets properties expected by generic cacheinfo for a unified cache.
When a unified cache node does not contain cache-size but contains
d-cache-size, select the data-cache property set. This only changes which
device-tree properties are read. The cache leaf remains
CACHE_TYPE_UNIFIED.
[Both draft changelog and code are written by LLM]
Assisted-by: LLM
Signed-off-by: Shrikanth Hegde <sshegde@linux.ibm.com>
---
drivers/base/cacheinfo.c | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index 10a9bbce899e..4a23377e9312 100644
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -148,11 +148,21 @@ static const struct cache_type_info cache_type_info[] = {
},
};
-static inline int get_cacheinfo_idx(enum cache_type type)
+static inline int get_cacheinfo_idx(enum cache_type type, struct device_node *np)
{
- if (type == CACHE_TYPE_UNIFIED)
- return 0;
- return type;
+ if (type != CACHE_TYPE_UNIFIED)
+ return type;
+
+ /*
+ * Some device-tree bindings describe unified caches using
+ * d-cache-* properties. Select the data-cache property set
+ * without changing the cache leaf type.
+ */
+ if (!of_property_present(np, "cache-size") &&
+ of_property_present(np, "d-cache-size"))
+ return CACHE_TYPE_DATA;
+
+ return 0;
}
static void cache_size(struct cacheinfo *this_leaf, struct device_node *np)@@ -160,7 +170,7 @@ static void cache_size(struct cacheinfo *this_leaf, struct device_node *np)
const char *propname;
int ct_idx;
- ct_idx = get_cacheinfo_idx(this_leaf->type);
+ ct_idx = get_cacheinfo_idx(this_leaf->type, np);
propname = cache_type_info[ct_idx].size_prop;
of_property_read_u32(np, propname, &this_leaf->size);
@@ -172,7 +182,7 @@ static void cache_get_line_size(struct cacheinfo *this_leaf,
{
int i, lim, ct_idx;
- ct_idx = get_cacheinfo_idx(this_leaf->type);
+ ct_idx = get_cacheinfo_idx(this_leaf->type, np);
lim = ARRAY_SIZE(cache_type_info[ct_idx].line_size_props);
for (i = 0; i < lim; i++) {@@ -194,7 +204,7 @@ static void cache_nr_sets(struct cacheinfo *this_leaf, struct device_node *np)
const char *propname;
int ct_idx;
- ct_idx = get_cacheinfo_idx(this_leaf->type);
+ ct_idx = get_cacheinfo_idx(this_leaf->type, np);
propname = cache_type_info[ct_idx].nr_sets_prop;
of_property_read_u32(np, propname, &this_leaf->number_of_sets);
--
2.54.0