Skip to content

Commit e9ad390

Browse files
Lorenzo Pieralisictmarinas
authored andcommitted
arm64/sysreg: Fix GIC CDEOI instruction encoding
The GIC CDEOI system instruction requires the Rt field to be set to 0b11111 otherwise the instruction behaviour becomes CONSTRAINED UNPREDICTABLE. Currenly, its usage is encoded as a system register write, with a constant 0 value: write_sysreg_s(0, GICV5_OP_GIC_CDEOI) While compiling with GCC, the 0 constant value, through these asm constraints and modifiers ('x' modifier and 'Z' constraint combo): asm volatile(__msr_s(r, "%x0") : : "rZ" (__val)); forces the compiler to issue the XZR register for the MSR operation (ie that corresponds to Rt == 0b11111) issuing the right instruction encoding. Unfortunately LLVM does not yet understand that modifier/constraint combo so it ends up issuing a different register from XZR for the MSR source, which in turns means that it encodes the GIC CDEOI instruction wrongly and the instruction behaviour becomes CONSTRAINED UNPREDICTABLE that we must prevent. Add a conditional to write_sysreg_s() macro that detects whether it is passed a constant 0 value and issues an MSR write with XZR as source register - explicitly doing what the asm modifier/constraint is meant to achieve through constraints/modifiers, fixing the LLVM compilation issue. Fixes: 7ec80fb ("irqchip/gic-v5: Add GICv5 PPI support") Suggested-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Lorenzo Pieralisi <lpieralisi@kernel.org> Acked-by: Marc Zyngier <maz@kernel.org> Cc: stable@vger.kernel.org Cc: Sascha Bischoff <sascha.bischoff@arm.com> Cc: Will Deacon <will@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Marc Zyngier <maz@kernel.org> Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
1 parent 3a86608 commit e9ad390

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1220,10 +1220,19 @@
12201220
__val; \
12211221
})
12221222

1223+
/*
1224+
* The "Z" constraint combined with the "%x0" template should be enough
1225+
* to force XZR generation if (v) is a constant 0 value but LLVM does not
1226+
* yet understand that modifier/constraint combo so a conditional is required
1227+
* to nudge the compiler into using XZR as a source for a 0 constant value.
1228+
*/
12231229
#define write_sysreg_s(v, r) do { \
12241230
u64 __val = (u64)(v); \
12251231
u32 __maybe_unused __check_r = (u32)(r); \
1226-
asm volatile(__msr_s(r, "%x0") : : "rZ" (__val)); \
1232+
if (__builtin_constant_p(__val) && __val == 0) \
1233+
asm volatile(__msr_s(r, "xzr")); \
1234+
else \
1235+
asm volatile(__msr_s(r, "%x0") : : "r" (__val)); \
12271236
} while (0)
12281237

12291238
/*

0 commit comments

Comments
 (0)