[PATCH V3] cacheinfo: Keep the old value if of_property_read_u32 fails

[PATCH V3] cacheinfo: Keep the old value if of_property_read_u32 fails

[Huacai Chen]

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>
---
V2: Add Cc and Reviewed-by
V3: Add ChangeLog

 drivers/base/cacheinfo.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index cf78fa6..a735953 100644
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -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)
-- 
2.7.0

Re: [PATCH V3] cacheinfo: Keep the old value if of_property_read_u32 fails

[Huacai Chen]

Ping?

On Wed, Dec 19, 2018 at 4:15 PM Huacai Chen <chenhc@lemote.com> wrote:
>
> 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>
> ---
> V2: Add Cc and Reviewed-by
> V3: Add ChangeLog
>
>  drivers/base/cacheinfo.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
> index cf78fa6..a735953 100644
> --- a/drivers/base/cacheinfo.c
> +++ b/drivers/base/cacheinfo.c
> @@ -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)
> --
> 2.7.0
>
>
>

Re: [PATCH V3] cacheinfo: Keep the old value if of_property_read_u32 fails

[Sudeep Holla]

On 22/01/2019 00:51, Huacai Chen wrote:
> Ping?
> 
> On Wed, Dec 19, 2018 at 4:15 PM Huacai Chen <chenhc@lemote.com> wrote:
>>
>> 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>

Looks like this slipped through the cracks during holiday period.
Wait until Greg responds for a week, if not please repost as it may be
difficult to dig out old emails especially the ones during holidays.

-- 
Regards,
Sudeep

Re: [PATCH V3] cacheinfo: Keep the old value if of_property_read_u32 fails

[Greg Kroah-Hartman]

On Wed, Dec 19, 2018 at 04:16:03PM +0800, Huacai Chen wrote:
> 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>
> ---
> V2: Add Cc and Reviewed-by
> V3: Add ChangeLog

Sorry for the delay, now queued up.

greg k-h