]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
coresight: trbe: Remove redundant disable call
authorJames Clark <james.clark@linaro.org>
Mon, 6 Jan 2025 14:24:39 +0000 (14:24 +0000)
committerMarc Zyngier <maz@kernel.org>
Sun, 12 Jan 2025 12:50:11 +0000 (12:50 +0000)
trbe_drain_and_disable_local() just clears TRBLIMITR and drains.
TRBLIMITR is already cleared on the next line after this call, so
replace it with only drain. This is so we can make a kvm call that has a
preempt enabled warning from set_trbe_disabled() in the next commit,
where trbe_reset_local() is called from a preemptible hotplug path.

Signed-off-by: James Clark <james.clark@linaro.org>
Link: https://lore.kernel.org/r/20250106142446.628923-5-james.clark@linaro.org
Signed-off-by: Marc Zyngier <maz@kernel.org>
drivers/hwtracing/coresight/coresight-trbe.c

index 919804b12a67a4439aedb536fd61bebb51d52a2a..03d3695ba5aa5c36201861c582734421b105aa58 100644 (file)
@@ -253,8 +253,8 @@ static void trbe_drain_and_disable_local(struct trbe_cpudata *cpudata)
 
 static void trbe_reset_local(struct trbe_cpudata *cpudata)
 {
-       trbe_drain_and_disable_local(cpudata);
        write_sysreg_s(0, SYS_TRBLIMITR_EL1);
+       trbe_drain_buffer();
        write_sysreg_s(0, SYS_TRBPTR_EL1);
        write_sysreg_s(0, SYS_TRBBASER_EL1);
        write_sysreg_s(0, SYS_TRBSR_EL1);