Skip to content

Commit bfd9c93

Browse files
mrutland-armwilldeacon
authored andcommitted
arm64: tlb: Allow XZR argument to TLBI ops
The TLBI instruction accepts XZR as a register argument, and for TLBI operations with a register argument, there is no functional difference between using XZR or another GPR which contains zeroes. Operations without a register argument are encoded as if XZR were used. Allow the __TLBI_1() macro to use XZR when a register argument is all zeroes. Today this only results in a trivial code saving in __do_compat_cache_op()'s workaround for Neoverse-N1 erratum #1542419. In subsequent patches this pattern will be used more generally. There should be no functional change as a result of this patch. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Marc Zyngier <maz@kernel.org> Cc: Oliver Upton <oupton@kernel.org> Cc: Ryan Roberts <ryan.roberts@arm.com> Cc: Will Deacon <will@kernel.org> Signed-off-by: Will Deacon <will@kernel.org>
1 parent 9d1a7c4 commit bfd9c93

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

arch/arm64/include/asm/tlbflush.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
: : )
3939

4040
#define __TLBI_1(op, arg) asm (ARM64_ASM_PREAMBLE \
41-
"tlbi " #op ", %0\n" \
41+
"tlbi " #op ", %x0\n" \
4242
ALTERNATIVE("nop\n nop", \
43-
"dsb ish\n tlbi " #op ", %0", \
43+
"dsb ish\n tlbi " #op ", %x0", \
4444
ARM64_WORKAROUND_REPEAT_TLBI, \
4545
CONFIG_ARM64_WORKAROUND_REPEAT_TLBI) \
46-
: : "r" (arg))
46+
: : "rZ" (arg))
4747

4848
#define __TLBI_N(op, arg, n, ...) __TLBI_##n(op, arg)
4949

0 commit comments

Comments
 (0)