Skip to content

Commit a2b579c

Browse files
james-c-linaroMarc Zyngier
authored andcommitted
coresight: trbe: Remove redundant disable call
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Marc Zyngier <[email protected]>
1 parent c382ee6 commit a2b579c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/hwtracing/coresight/coresight-trbe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@ static void trbe_drain_and_disable_local(struct trbe_cpudata *cpudata)
253253

254254
static void trbe_reset_local(struct trbe_cpudata *cpudata)
255255
{
256-
trbe_drain_and_disable_local(cpudata);
257256
write_sysreg_s(0, SYS_TRBLIMITR_EL1);
257+
trbe_drain_buffer();
258258
write_sysreg_s(0, SYS_TRBPTR_EL1);
259259
write_sysreg_s(0, SYS_TRBBASER_EL1);
260260
write_sysreg_s(0, SYS_TRBSR_EL1);

0 commit comments

Comments
 (0)