cacheinfo: Keep the old value if of_property_read_u32 fails
PATCH v2 1/1 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.
--- drivers/base/cacheinfo.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/base/cacheinfo.c +2 -4
@@ -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)
Signature · 1 line
2.7.0
Greg Kroah-Hartman
maintainerQuoted 6 lines · Huacai Chen
Commit
448a5a552f336bd7b847b1951("drivers: base: cacheinfo: use OFproperty_read_u32instead of get_property,read_number") makes cache size andnumber_of_setsbe 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.
Quoted 6 lines
Fixes 448a5a552f33 ("drivers: base: cacheinfo: use OF property_read_u32 instead of get_property,read_number")Signed-off-by Huacai Chen <[email protected]>Reviewed-by Sudeep Holla <[email protected]>--- drivers/base/cacheinfo.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
What changed from v1? Always put that below the --- line.
Please fix this up and resend a v3.
thanks,
greg k-h
Quoted 8 lines · Greg Kroah-Hartman
Quoted 6 lines · Huacai Chen
Commit
448a5a552f336bd7b847b1951("drivers: base: cacheinfo: use OFproperty_read_u32instead of get_property,read_number") makes cache size andnumber_of_setsbe 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.
Quoted 8 lines
Quoted 6 lines
Fixes 448a5a552f33 ("drivers: base: cacheinfo: use OF property_read_u32 instead of get_property,read_number")Signed-off-by Huacai Chen <[email protected]>Reviewed-by Sudeep Holla <[email protected]>--- drivers/base/cacheinfo.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)What changed from v1? Always put that below the --- line.
Hi, Greg,
V2 just add a Fixes line and Reviewed-by line, no functional changes.
Huacai
Quoted 6 lines
Please fix this up and resend a v3.
thanks,
greg k-h