Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

cacheinfo: Keep the old value if of_property_read_u32 fails

Commit 448a5a552f336bd7b847b1951 ("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: 448a5a552f33 ("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>

authored by

Huacai Chen and committed by
Greg Kroah-Hartman
3a34c986 1c7fc5cb

+2 -4
+2 -4
drivers/base/cacheinfo.c
··· 79 79 ct_idx = get_cacheinfo_idx(this_leaf->type); 80 80 propname = cache_type_info[ct_idx].size_prop; 81 81 82 - if (of_property_read_u32(np, propname, &this_leaf->size)) 83 - this_leaf->size = 0; 82 + of_property_read_u32(np, propname, &this_leaf->size); 84 83 } 85 84 86 85 /* not cache_line_size() because that's a macro in include/linux/cache.h */ ··· 113 114 ct_idx = get_cacheinfo_idx(this_leaf->type); 114 115 propname = cache_type_info[ct_idx].nr_sets_prop; 115 116 116 - if (of_property_read_u32(np, propname, &this_leaf->number_of_sets)) 117 - this_leaf->number_of_sets = 0; 117 + of_property_read_u32(np, propname, &this_leaf->number_of_sets); 118 118 } 119 119 120 120 static void cache_associativity(struct cacheinfo *this_leaf)