]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
coresight: etm4x: Correct TRCVMIDCCTLR1 save and restore
authorLeo Yan <leo.yan@arm.com>
Wed, 8 Apr 2026 12:31:43 +0000 (13:31 +0100)
committerSuzuki K Poulose <suzuki.poulose@arm.com>
Thu, 7 May 2026 13:42:06 +0000 (14:42 +0100)
It is a typo to use trcvmidcctlr0 to save and restore TRCVMIDCCTLR1.
Use trcvmidcctlr1 instead.

Fixes: f5bd523690d2 ("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
drivers/hwtracing/coresight/coresight-etm4x-core.c

index 591dfe0bc63505772896abfe89b012cff5f17edc..a251375db24b17c22490a71f97308119b89a5975 100644 (file)
@@ -1983,7 +1983,7 @@ static int __etm4_cpu_save(struct etmv4_drvdata *drvdata)
 
        state->trcvmidcctlr0 = etm4x_read32(csa, TRCVMIDCCTLR0);
        if (drvdata->numvmidc > 4)
-               state->trcvmidcctlr0 = etm4x_read32(csa, TRCVMIDCCTLR1);
+               state->trcvmidcctlr1 = etm4x_read32(csa, TRCVMIDCCTLR1);
 
        state->trcclaimset = etm4x_read32(csa, TRCCLAIMCLR);
 
@@ -2106,7 +2106,7 @@ static void __etm4_cpu_restore(struct etmv4_drvdata *drvdata)
 
        etm4x_relaxed_write32(csa, state->trcvmidcctlr0, TRCVMIDCCTLR0);
        if (drvdata->numvmidc > 4)
-               etm4x_relaxed_write32(csa, state->trcvmidcctlr0, TRCVMIDCCTLR1);
+               etm4x_relaxed_write32(csa, state->trcvmidcctlr1, TRCVMIDCCTLR1);
 
        etm4x_relaxed_write32(csa, state->trcclaimset, TRCCLAIMSET);