Skip to content

Commit d887844

Browse files
Leo-Yangregkh
authored andcommitted
coresight: etm4x: Correct TRCVMIDCCTLR1 save and restore
[ Upstream commit 0ec0a87 ] It is a typo to use trcvmidcctlr0 to save and restore TRCVMIDCCTLR1. Use trcvmidcctlr1 instead. Fixes: f5bd523 ("coresight: etm4x: Convert all register accesses") Signed-off-by: Leo Yan <leo.yan@arm.com> Reviewed-by: James Clark <james.clark@linaro.org> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> Link: https://lore.kernel.org/r/20260408-arm_cs_fix_trcvmidcctlr1_typo-v1-1-6a5695363b46@arm.com Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 66433ac commit d887844

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/hwtracing/coresight/coresight-etm4x-core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1837,7 +1837,7 @@ static int __etm4_cpu_save(struct etmv4_drvdata *drvdata)
18371837

18381838
state->trcvmidcctlr0 = etm4x_read32(csa, TRCVMIDCCTLR0);
18391839
if (drvdata->numvmidc > 4)
1840-
state->trcvmidcctlr0 = etm4x_read32(csa, TRCVMIDCCTLR1);
1840+
state->trcvmidcctlr1 = etm4x_read32(csa, TRCVMIDCCTLR1);
18411841

18421842
state->trcclaimset = etm4x_read32(csa, TRCCLAIMCLR);
18431843

@@ -1963,7 +1963,7 @@ static void __etm4_cpu_restore(struct etmv4_drvdata *drvdata)
19631963

19641964
etm4x_relaxed_write32(csa, state->trcvmidcctlr0, TRCVMIDCCTLR0);
19651965
if (drvdata->numvmidc > 4)
1966-
etm4x_relaxed_write32(csa, state->trcvmidcctlr0, TRCVMIDCCTLR1);
1966+
etm4x_relaxed_write32(csa, state->trcvmidcctlr1, TRCVMIDCCTLR1);
19671967

19681968
etm4x_relaxed_write32(csa, state->trcclaimset, TRCCLAIMSET);
19691969

0 commit comments

Comments
 (0)