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 341/757] coresight: etm4x: Fix save and restore of TRCVMIDCCTLR1 register
    Date
    From: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>

    [ Upstream commit 3477326277451000bc667dfcc4fd0774c039184c ]

    In commit f188b5e76aae ("coresight: etm4x: Save/restore state
    across CPU low power states"), mistakenly TRCVMIDCCTLR1 register
    value was saved in trcvmidcctlr0 state variable which is used to
    store TRCVMIDCCTLR0 register value in etm4x_cpu_save() and then
    same value is written back to both TRCVMIDCCTLR0 and TRCVMIDCCTLR1
    in etm4x_cpu_restore(). There is already a trcvmidcctlr1 state
    variable available for TRCVMIDCCTLR1, so use it.

    Fixes: f188b5e76aae ("coresight: etm4x: Save/restore state across CPU low power states")
    Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
    Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
    Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
    Link: https://lore.kernel.org/r/20200928163513.70169-26-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 944c7a7cc1d91..fd678792b755d 100644
    --- a/drivers/hwtracing/coresight/coresight-etm4x.c
    +++ b/drivers/hwtracing/coresight/coresight-etm4x.c
    @@ -1237,7 +1237,7 @@ static int etm4_cpu_save(struct etmv4_drvdata *drvdata)
    state->trccidcctlr1 = readl(drvdata->base + TRCCIDCCTLR1);

    state->trcvmidcctlr0 = readl(drvdata->base + TRCVMIDCCTLR0);
    - state->trcvmidcctlr0 = readl(drvdata->base + TRCVMIDCCTLR1);
    + state->trcvmidcctlr1 = readl(drvdata->base + TRCVMIDCCTLR1);

    state->trcclaimset = readl(drvdata->base + TRCCLAIMCLR);

    @@ -1347,7 +1347,7 @@ static void etm4_cpu_restore(struct etmv4_drvdata *drvdata)
    writel_relaxed(state->trccidcctlr1, drvdata->base + TRCCIDCCTLR1);

    writel_relaxed(state->trcvmidcctlr0, drvdata->base + TRCVMIDCCTLR0);
    - writel_relaxed(state->trcvmidcctlr0, drvdata->base + TRCVMIDCCTLR1);
    + writel_relaxed(state->trcvmidcctlr1, drvdata->base + TRCVMIDCCTLR1);

    writel_relaxed(state->trcclaimset, drvdata->base + TRCCLAIMSET);

    --
    2.25.1


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