niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

riscv: Set more data to cacheinfo

Browse source 
Set cacheinfo.{size,sets,line_size} for each cache node, then we can
get these information from userland through auxiliary vector.

Signed-off-by: Zong Li <zong.li@sifive.com>
Reviewed-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
This commit is contained in:
Zong Li 2020-08-31 15:33:48 +08:00 • committed by Palmer Dabbelt
parent afb8c6fee8
commit baf7cbd94b
No known key found for this signature in database
GPG key ID: 2E1319F35FBB1889
1 changed files with 51 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
arch/riscv/kernel/cacheinfo.c
View file

@ -25,12 +25,53 @@ cache_get_priv_group(struct cacheinfo *this_leaf)
return NULL; return NULL;
} }
static void ci_leaf_init(struct cacheinfo *this_leaf, static void ci_leaf_init(struct cacheinfo *this_leaf, enum cache_type type,
struct device_node *node, unsigned int level, unsigned int size,
enum cache_type type, unsigned int level) unsigned int sets, unsigned int line_size)
{ {
this_leaf->level = level; this_leaf->level = level;
this_leaf->type = type; this_leaf->type = type;
this_leaf->size = size;
this_leaf->number_of_sets = sets;
this_leaf->coherency_line_size = line_size;
/*
* If the cache is fully associative, there is no need to
* check the other properties.
*/
if (sets == 1)
return;
/*
* Set the ways number for n-ways associative, make sure
* all properties are big than zero.
*/
if (sets > 0 && size > 0 && line_size > 0)
this_leaf->ways_of_associativity = (size / sets) / line_size;
}
static void fill_cacheinfo(struct cacheinfo **this_leaf,
struct device_node *node, unsigned int level)
{
unsigned int size, sets, line_size;
if (!of_property_read_u32(node, "cache-size", &size) &&
!of_property_read_u32(node, "cache-block-size", &line_size) &&
!of_property_read_u32(node, "cache-sets", &sets)) {
ci_leaf_init((*this_leaf)++, CACHE_TYPE_UNIFIED, level, size, sets, line_size);
}
if (!of_property_read_u32(node, "i-cache-size", &size) &&
!of_property_read_u32(node, "i-cache-sets", &sets) &&
!of_property_read_u32(node, "i-cache-block-size", &line_size)) {
ci_leaf_init((*this_leaf)++, CACHE_TYPE_INST, level, size, sets, line_size);
}
if (!of_property_read_u32(node, "d-cache-size", &size) &&
!of_property_read_u32(node, "d-cache-sets", &sets) &&
!of_property_read_u32(node, "d-cache-block-size", &line_size)) {
ci_leaf_init((*this_leaf)++, CACHE_TYPE_DATA, level, size, sets, line_size);
}
} }
static int __init_cache_level(unsigned int cpu) static int __init_cache_level(unsigned int cpu)
@ -83,29 +124,24 @@ static int __populate_cache_leaves(unsigned int cpu)
struct device_node *prev = NULL; struct device_node *prev = NULL;
int levels = 1, level = 1; int levels = 1, level = 1;
if (of_property_read_bool(np, "cache-size")) /* Level 1 caches in cpu node */
ci_leaf_init(this_leaf++, np, CACHE_TYPE_UNIFIED, level); fill_cacheinfo(&this_leaf, np, level);
if (of_property_read_bool(np, "i-cache-size"))
ci_leaf_init(this_leaf++, np, CACHE_TYPE_INST, level);
if (of_property_read_bool(np, "d-cache-size"))
ci_leaf_init(this_leaf++, np, CACHE_TYPE_DATA, level);
/* Next level caches in cache nodes */
prev = np; prev = np;
while ((np = of_find_next_cache_node(np))) { while ((np = of_find_next_cache_node(np))) {
of_node_put(prev); of_node_put(prev);
prev = np; prev = np;
if (!of_device_is_compatible(np, "cache")) if (!of_device_is_compatible(np, "cache"))
break; break;
if (of_property_read_u32(np, "cache-level", &level)) if (of_property_read_u32(np, "cache-level", &level))
break; break;
if (level <= levels) if (level <= levels)
break; break;
if (of_property_read_bool(np, "cache-size"))
ci_leaf_init(this_leaf++, np, CACHE_TYPE_UNIFIED, level); fill_cacheinfo(&this_leaf, np, level);
if (of_property_read_bool(np, "i-cache-size"))
ci_leaf_init(this_leaf++, np, CACHE_TYPE_INST, level);
if (of_property_read_bool(np, "d-cache-size"))
ci_leaf_init(this_leaf++, np, CACHE_TYPE_DATA, level);
levels = level; levels = level;
} }
of_node_put(np); of_node_put(np);