drivers: base: cacheinfo: fix cache type for non-architected system cache (f57ab9a0) · Commits · 戴 / test

Commit ("drivers: base: cacheinfo: support DT overrides for cache properties") doesn't initialise the cache type if it's present only in DT and the architecture is not aware of it. They are unified system level cache which are generally transparent. This patch check if the cache type is set to NOCACHE but the DT node indicates that it's unified cache and sets the cache type accordingly. Fixes: ("drivers: base: cacheinfo: support DT overrides for cache properties") Reported-and-tested-by:

Tan Xiaojun <tanxiaojun@huawei.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by:

Sudeep Holla <sudeep.holla@arm.com> Cc: stable <stable@vger.kernel.org> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/base/cacheinfo.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -186,6 +186,11 @@ static void cache_associativity(struct cacheinfo *this_leaf)
		this_leaf->ways_of_associativity = (size / nr_sets) / line_size;
		}

		static bool cache_node_is_unified(struct cacheinfo *this_leaf)
		{
		return of_property_read_bool(this_leaf->of_node, "cache-unified");
		}

		static void cache_of_override_properties(unsigned int cpu)
		{
		int index;
		@@ -194,6 +199,14 @@ static void cache_of_override_properties(unsigned int cpu)

		for (index = 0; index < cache_leaves(cpu); index++) {
		this_leaf = this_cpu_ci->info_list + index;
		/*
		* init_cache_level must setup the cache level correctly
		* overriding the architecturally specified levels, so
		* if type is NONE at this stage, it should be unified
		*/
		if (this_leaf->type == CACHE_TYPE_NOCACHE &&
		cache_node_is_unified(this_leaf))
		this_leaf->type = CACHE_TYPE_UNIFIED;
		cache_size(this_leaf);
		cache_get_line_size(this_leaf);
		cache_nr_sets(this_leaf);

Admin message