From 4319013922313811fae1f75c3de5b1254383b1b0 Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 17 Apr 2026 22:17:32 +0200 Subject: [PATCH 01/15] HACK: always save registers before wfi; stub out wfit --- arch/arm64/include/asm/barrier.h | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h index 9495c4441a46..7ea68fc1fa38 100644 --- a/arch/arm64/include/asm/barrier.h +++ b/arch/arm64/include/asm/barrier.h @@ -20,9 +20,28 @@ #define wfe() asm volatile("wfe" : : : "memory") #define wfet(val) asm volatile("msr s0_3_c1_c0_0, %0" \ : : "r" (val) : "memory") -#define wfi() asm volatile("wfi" : : : "memory") -#define wfit(val) asm volatile("msr s0_3_c1_c0_1, %0" \ - : : "r" (val) : "memory") +#define wfi() asm volatile( \ + "str x30, [sp, #-16]!\n" \ + "stp x28, x29, [sp, #-16]!\n" \ + "stp x26, x27, [sp, #-16]!\n" \ + "stp x24, x25, [sp, #-16]!\n" \ + "stp x22, x23, [sp, #-16]!\n" \ + "stp x20, x21, [sp, #-16]!\n" \ + "stp x18, x19, [sp, #-16]!\n" \ + "1:\n" \ + "dsb sy\n" \ + "wfi\n" \ + "mrs x0, ISR_EL1\n" \ + "cbz x0, 1b\n" \ + "ldp x18, x19, [sp], #16\n" \ + "ldp x20, x21, [sp], #16\n" \ + "ldp x22, x23, [sp], #16\n" \ + "ldp x24, x25, [sp], #16\n" \ + "ldp x26, x27, [sp], #16\n" \ + "ldp x28, x29, [sp], #16\n" \ + "ldr x30, [sp], #16\n" \ + : : : "memory") +#define wfit(val) asm volatile("nop" : : : "memory") #define isb() asm volatile("isb" : : : "memory") #define dmb(opt) asm volatile("dmb " #opt : : : "memory") -- 2.53.0