Merge branches 'for-next/gcs', 'for-next/probes', 'for-next/asm-offsets', 'for-next...

[linux.git] / tools / testing / selftests / arm64 / fp / sve-test.S

diff --git a/tools/testing/selftests/arm64/fp/sve-test.S b/tools/testing/selftests/arm64/fp/sve-test.S
index fff60e2a25addfd4850ef71aa3cf6535ac880ffd..80e072f221cdee9d6df024a08c6956ea4a215546 100644 (file)
--- a/tools/testing/selftests/arm64/fp/sve-test.S
+++ b/tools/testing/selftests/arm64/fp/sve-test.S
@@ -291,8 +291,7 @@ function check_ffr
 #endif
 endfunction
 
-// Any SVE register modified here can cause corruption in the main
-// thread -- but *only* the registers modified here.
+// Modify live register state, the signal return will undo our changes
 function irritator_handler
        // Increment the irritation signal count (x23):
        ldr     x0, [x2, #ucontext_regs + 8 * 23]
@@ -300,13 +299,12 @@ function irritator_handler
        str     x0, [x2, #ucontext_regs + 8 * 23]
 
        // Corrupt some random Z-regs
-       adr     x0, .text + (irritator_handler - .text) / 16 * 16
        movi    v0.8b, #1
        movi    v9.16b, #2
        movi    v31.8b, #3
-#ifndef SSVE
        // And P0
-       rdffr   p0.b
+       ptrue   p0.d
+#ifndef SSVE
        // And FFR
        wrffr   p15.b
 #endif
@@ -378,6 +376,8 @@ endfunction
 // Main program entry point
 .globl _start
 function _start
+       enable_gcs
+
        mov     x23, #0         // Irritation signal count
 
        mov     w0, #SIGINT