lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 279/757] coresight: etm4x: Fix issues on trcseqevr access
    Date
    From: Jonathan Zhou <jonathan.zhouwen@huawei.com>

    [ Upstream commit 4cd83037cd957ad97756055355ab4ee63f259380 ]

    The TRCSEQEVR(3) is reserved, using '@nrseqstate - 1' instead to avoid
    accessing the reserved register.

    Fixes: f188b5e76aae ("coresight: etm4x: Save/restore state across CPU low power states")
    Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
    Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
    Cc: Mike Leach <mike.leach@linaro.org>
    Cc: Shaokun Zhang <zhangshaokun@hisilicon.com>
    Signed-off-by: Jonathan Zhou <jonathan.zhouwen@huawei.com>
    [Fixed capital letter in title]
    Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
    Link: https://lore.kernel.org/r/20200916191737.4001561-12-mathieu.poirier@linaro.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/hwtracing/coresight/coresight-etm4x.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c
    index 2bcc8d4a82c8e..944c7a7cc1d91 100644
    --- a/drivers/hwtracing/coresight/coresight-etm4x.c
    +++ b/drivers/hwtracing/coresight/coresight-etm4x.c
    @@ -1193,7 +1193,7 @@ static int etm4_cpu_save(struct etmv4_drvdata *drvdata)
    state->trcvdsacctlr = readl(drvdata->base + TRCVDSACCTLR);
    state->trcvdarcctlr = readl(drvdata->base + TRCVDARCCTLR);

    - for (i = 0; i < drvdata->nrseqstate; i++)
    + for (i = 0; i < drvdata->nrseqstate - 1; i++)
    state->trcseqevr[i] = readl(drvdata->base + TRCSEQEVRn(i));

    state->trcseqrstevr = readl(drvdata->base + TRCSEQRSTEVR);
    @@ -1298,7 +1298,7 @@ static void etm4_cpu_restore(struct etmv4_drvdata *drvdata)
    writel_relaxed(state->trcvdsacctlr, drvdata->base + TRCVDSACCTLR);
    writel_relaxed(state->trcvdarcctlr, drvdata->base + TRCVDARCCTLR);

    - for (i = 0; i < drvdata->nrseqstate; i++)
    + for (i = 0; i < drvdata->nrseqstate - 1; i++)
    writel_relaxed(state->trcseqevr[i],
    drvdata->base + TRCSEQEVRn(i));

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:40    [W:4.771 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site