lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 32/50] mips: cm: Fix an invalid error code of INTVN_*_ERR
    Date
    From: Serge Semin <Sergey.Semin@baikalelectronics.ru>

    [ Upstream commit 8a0efb8b101665a843205eab3d67ab09cb2d9a8d ]

    Commit 3885c2b463f6 ("MIPS: CM: Add support for reporting CM cache
    errors") adds cm2_causes[] array with map of error type ID and
    pointers to the short description string. There is a mistake in
    the table, since according to MIPS32 manual CM2_ERROR_TYPE = {17,18}
    correspond to INTVN_WR_ERR and INTVN_RD_ERR, while the table
    claims they have {0x17,0x18} codes. This is obviously hex-dec
    copy-paste bug. Moreover codes {0x18 - 0x1a} indicate L2 ECC errors.

    Fixes: 3885c2b463f6 ("MIPS: CM: Add support for reporting CM cache errors")
    Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
    Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru>
    Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Cc: Paul Burton <paulburton@kernel.org>
    Cc: Ralf Baechle <ralf@linux-mips.org>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Rob Herring <robh+dt@kernel.org>
    Cc: linux-pm@vger.kernel.org
    Cc: devicetree@vger.kernel.org
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/mips/kernel/mips-cm.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/mips/kernel/mips-cm.c b/arch/mips/kernel/mips-cm.c
    index 60177a612cb1..df65516778a2 100644
    --- a/arch/mips/kernel/mips-cm.c
    +++ b/arch/mips/kernel/mips-cm.c
    @@ -123,9 +123,9 @@ static char *cm2_causes[32] = {
    "COH_RD_ERR", "MMIO_WR_ERR", "MMIO_RD_ERR", "0x07",
    "0x08", "0x09", "0x0a", "0x0b",
    "0x0c", "0x0d", "0x0e", "0x0f",
    - "0x10", "0x11", "0x12", "0x13",
    - "0x14", "0x15", "0x16", "INTVN_WR_ERR",
    - "INTVN_RD_ERR", "0x19", "0x1a", "0x1b",
    + "0x10", "INTVN_WR_ERR", "INTVN_RD_ERR", "0x13",
    + "0x14", "0x15", "0x16", "0x17",
    + "0x18", "0x19", "0x1a", "0x1b",
    "0x1c", "0x1d", "0x1e", "0x1f"
    };

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 01:34    [W:4.044 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site