s390/sclp: improve special wait psw logic

There is a special quiesce PSW that we check for "shutdown". Otherwise disabled
wait is detected as "crashed". Architecturally we must only check PSW bits
116-127. Fix this.

Cc: [email protected]
Signed-off-by: Christian Borntraeger <[email protected]>
Message-Id: <1582204582[email protected]>
Reviewed-by: David Hildenbrand <[email protected]>
Acked-by: Janosch Frank <[email protected]>
Signed-off-by: Cornelia Huck <[email protected]>

diff --git a/target/s390x/helper.c b/target/s390x/helper.c
index b810ad431e4489f1ad319705d4da98e5cf3511a2..ed726849114f2f353471233f670b761f2b1db6ae 100644 (file)
--- a/target/s390x/helper.c
+++ b/target/s390x/helper.c
@@ -89,7 +89,7 @@ hwaddr s390_cpu_get_phys_addr_debug(CPUState *cs, vaddr vaddr)
 static inline bool is_special_wait_psw(uint64_t psw_addr)
 {
     /* signal quiesce */
-    return psw_addr == 0xfffUL;
+    return (psw_addr & 0xfffUL) == 0xfffUL;
 }
 
 void s390_handle_wait(S390CPU *cpu)