Unverified Commit 6a249151 authored by Song Shuai's avatar Song Shuai Committed by Palmer Dabbelt
Browse files

Revert "riscv: Set more data to cacheinfo" 



This reverts commit baf7cbd9.

There are some duplicate cache attributes populations executed
in both ci_leaf_init() and later cache_setup_properties().

Revert the commit baf7cbd9 ("riscv: Set more data to cacheinfo")
to setup only the level and type attributes at this early place.

Signed-off-by: default avatarSong Shuai <suagrfillet@gmail.com>
Acked-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Acked-by: default avatarConor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20230308064734.512457-1-suagrfillet@gmail.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 9c2598d4

arch/riscv/kernel/cacheinfo.c

+15 −51
Original line number Diff line number Diff line
@@ -64,53 +64,12 @@ uintptr_t get_cache_geometry(u32 level, enum cache_type type) 
			   0;

}



static void ci_leaf_init(struct cacheinfo *this_leaf, enum cache_type type,

			 unsigned int level, unsigned int size,

			 unsigned int sets, unsigned int line_size)

static void ci_leaf_init(struct cacheinfo *this_leaf,

			 struct device_node *node,

			 enum cache_type type, unsigned int level)

{

	this_leaf->level = level;

	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);

	}

}



int populate_cache_leaves(unsigned int cpu)
@@ -121,24 +80,29 @@ int populate_cache_leaves(unsigned int cpu) 
	struct device_node *prev = NULL;

	int levels = 1, level = 1;



	/* Level 1 caches in cpu node */

	fill_cacheinfo(&this_leaf, np, level);

	if (of_property_read_bool(np, "cache-size"))

		ci_leaf_init(this_leaf++, np, CACHE_TYPE_UNIFIED, 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;

	while ((np = of_find_next_cache_node(np))) {

		of_node_put(prev);

		prev = np;



		if (!of_device_is_compatible(np, "cache"))

			break;

		if (of_property_read_u32(np, "cache-level", &level))

			break;

		if (level <= levels)

			break;



		fill_cacheinfo(&this_leaf, np, level);



		if (of_property_read_bool(np, "cache-size"))

			ci_leaf_init(this_leaf++, np, CACHE_TYPE_UNIFIED, 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;

	}

	of_node_put(np);