cacheinfo: Keep the old value if of_property_read_u32 fails (3a34c986) · Commits · 戴 / test

Commit ("drivers: base: cacheinfo: use OF property_read_u32 instead of get_property,read_number") makes cache size and number_of_sets be 0 if DT doesn't provide there values. I think this is unreasonable so make them keep the old values, which is the same as old kernels. Fixes: ("drivers: base: cacheinfo: use OF property_read_u32 instead of get_property,read_number") Cc: stable@vger.kernel.org Signed-off-by:

Huacai Chen <chenhc@lemote.com> Reviewed-by:

Sudeep Holla <sudeep.holla@arm.com> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/base/cacheinfo.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -79,8 +79,7 @@ static void cache_size(struct cacheinfo this_leaf, struct device_node np)
		ct_idx = get_cacheinfo_idx(this_leaf->type);
		propname = cache_type_info[ct_idx].size_prop;

		if (of_property_read_u32(np, propname, &this_leaf->size))
		this_leaf->size = 0;
		of_property_read_u32(np, propname, &this_leaf->size);
		}

		/* not cache_line_size() because that's a macro in include/linux/cache.h */
		@@ -114,8 +113,7 @@ static void cache_nr_sets(struct cacheinfo this_leaf, struct device_node np)
		ct_idx = get_cacheinfo_idx(this_leaf->type);
		propname = cache_type_info[ct_idx].nr_sets_prop;

		if (of_property_read_u32(np, propname, &this_leaf->number_of_sets))
		this_leaf->number_of_sets = 0;
		of_property_read_u32(np, propname, &this_leaf->number_of_sets);
		}

		static void cache_associativity(struct cacheinfo *this_leaf)

Admin message