lkml.org 
[lkml]   [2019]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 351/352] cacheinfo: Keep the old value if of_property_read_u32 fails
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Huacai Chen <chenhc@lemote.com>

    commit 3a34c986324c07dde32903f7bb262e6138e77c2a upstream.

    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>

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

    --- a/drivers/base/cacheinfo.c
    +++ b/drivers/base/cacheinfo.c
    @@ -79,8 +79,7 @@ static void cache_size(struct cacheinfo
    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 cachein
    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)

    \
     
     \ /
      Last update: 2019-02-11 15:38    [W:2.517 / U:0.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site