lkml.org 
[lkml]   [2017]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.10 060/110] MIPS: c-r4k: Fix Loongson-3s vcache/scache waysize calculation
    Date
    4.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: Huacai Chen <chenhc@lemote.com>

    commit 0be032c190abcdcfa948082b6a1e0d461184ba4d upstream.

    If scache.waysize is 0, r4k___flush_cache_all() will do nothing and
    then cause bugs. BTW, though vcache.waysize isn't being used by now,
    we also fix its calculation.

    Signed-off-by: Huacai Chen <chenhc@lemote.com>
    Cc: John Crispin <john@phrozen.org>
    Cc: Steven J . Hill <Steven.Hill@caviumnetworks.com>
    Cc: Fuxin Zhang <zhangfx@lemote.com>
    Cc: Zhangjin Wu <wuzhangjin@gmail.com>
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/15756/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/mips/mm/c-r4k.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/arch/mips/mm/c-r4k.c
    +++ b/arch/mips/mm/c-r4k.c
    @@ -1558,6 +1558,7 @@ static void probe_vcache(void)
    vcache_size = c->vcache.sets * c->vcache.ways * c->vcache.linesz;

    c->vcache.waybit = 0;
    + c->vcache.waysize = vcache_size / c->vcache.ways;

    pr_info("Unified victim cache %ldkB %s, linesize %d bytes.\n",
    vcache_size >> 10, way_string[c->vcache.ways], c->vcache.linesz);
    @@ -1660,6 +1661,7 @@ static void __init loongson3_sc_init(voi
    /* Loongson-3 has 4 cores, 1MB scache for each. scaches are shared */
    scache_size *= 4;
    c->scache.waybit = 0;
    + c->scache.waysize = scache_size / c->scache.ways;
    pr_info("Unified secondary cache %ldkB %s, linesize %d bytes.\n",
    scache_size >> 10, way_string[c->scache.ways], c->scache.linesz);
    if (scache_size)

    \
     
     \ /
      Last update: 2017-04-10 18:52    [W:2.195 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site