Commit f16d1bec authored by Sudeep Holla's avatar Sudeep Holla

cacheinfo: Use cache identifiers to check if the caches are shared if available

The cache identifiers is an optional property on most of the platforms.
The presence of one must be indicated by the CACHE_ID valid bit in the
attributes.

We can use the cache identifiers provided by the firmware to check if
any two cpus share the same cache instead of relying on the fw_token
generated and set in the OS.

Link: https://lore.kernel.org/r/20220704101605.1318280-8-sudeep.holla@arm.comTested-by: default avatarIonela Voinescu <ionela.voinescu@arm.com>
Tested-by: default avatarConor Dooley <conor.dooley@microchip.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 36bbc5b4
...@@ -44,6 +44,10 @@ static inline bool cache_leaves_are_shared(struct cacheinfo *this_leaf, ...@@ -44,6 +44,10 @@ static inline bool cache_leaves_are_shared(struct cacheinfo *this_leaf,
if (!(IS_ENABLED(CONFIG_OF) || IS_ENABLED(CONFIG_ACPI))) if (!(IS_ENABLED(CONFIG_OF) || IS_ENABLED(CONFIG_ACPI)))
return !(this_leaf->level == 1); return !(this_leaf->level == 1);
if ((sib_leaf->attributes & CACHE_ID) &&
(this_leaf->attributes & CACHE_ID))
return sib_leaf->id == this_leaf->id;
return sib_leaf->fw_token == this_leaf->fw_token; return sib_leaf->fw_token == this_leaf->fw_token;
} }
...@@ -56,7 +60,8 @@ bool last_level_cache_is_valid(unsigned int cpu) ...@@ -56,7 +60,8 @@ bool last_level_cache_is_valid(unsigned int cpu)
llc = per_cpu_cacheinfo_idx(cpu, cache_leaves(cpu) - 1); llc = per_cpu_cacheinfo_idx(cpu, cache_leaves(cpu) - 1);
return !!llc->fw_token; return (llc->attributes & CACHE_ID) || !!llc->fw_token;
} }
bool last_level_cache_is_shared(unsigned int cpu_x, unsigned int cpu_y) bool last_level_cache_is_shared(unsigned int cpu_x, unsigned int cpu_y)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment