|
 |
77c23f |
From 7171a794e8a7d91805516174187addc3b8e6b423 Mon Sep 17 00:00:00 2001
|
|
|
77c23f |
From: Thomas Huth <thuth@redhat.com>
|
|
|
77c23f |
Date: Fri, 29 May 2020 05:53:54 -0400
|
|
|
77c23f |
Subject: [PATCH 12/42] s390x: Properly fetch and test the short psw on diag308
|
|
|
77c23f |
subc 0/1
|
|
|
77c23f |
|
|
|
77c23f |
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
|
77c23f |
Message-id: <20200529055420.16855-13-thuth@redhat.com>
|
|
|
77c23f |
Patchwork-id: 97025
|
|
|
77c23f |
O-Subject: [RHEL-8.3.0 qemu-kvm PATCH v2 12/38] s390x: Properly fetch and test the short psw on diag308 subc 0/1
|
|
|
77c23f |
Bugzilla: 1828317
|
|
|
77c23f |
RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com>
|
|
|
77c23f |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
77c23f |
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
77c23f |
|
|
|
77c23f |
From: Janosch Frank <frankja@linux.ibm.com>
|
|
|
77c23f |
|
|
|
77c23f |
We need to actually fetch the cpu mask and set it. As we invert the
|
|
|
77c23f |
short psw indication in the mask, SIE will report a specification
|
|
|
77c23f |
exception, if it wasn't present in the reset psw.
|
|
|
77c23f |
|
|
|
77c23f |
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
|
|
77c23f |
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
|
77c23f |
Message-Id: <20191129142025.21453-2-frankja@linux.ibm.com>
|
|
|
77c23f |
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
77c23f |
(cherry picked from commit 104130cb7c106378dab944397c6a455c4a6d552f)
|
|
|
77c23f |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
77c23f |
---
|
|
|
77c23f |
target/s390x/cpu.c | 12 ++++++++++--
|
|
|
77c23f |
target/s390x/cpu.h | 1 +
|
|
|
77c23f |
2 files changed, 11 insertions(+), 2 deletions(-)
|
|
|
77c23f |
|
|
|
77c23f |
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
|
|
|
77c23f |
index 99ea09085a..625daeedd1 100644
|
|
|
77c23f |
--- a/target/s390x/cpu.c
|
|
|
77c23f |
+++ b/target/s390x/cpu.c
|
|
|
77c23f |
@@ -76,8 +76,16 @@ static bool s390_cpu_has_work(CPUState *cs)
|
|
|
77c23f |
static void s390_cpu_load_normal(CPUState *s)
|
|
|
77c23f |
{
|
|
|
77c23f |
S390CPU *cpu = S390_CPU(s);
|
|
|
77c23f |
- cpu->env.psw.addr = ldl_phys(s->as, 4) & PSW_MASK_ESA_ADDR;
|
|
|
77c23f |
- cpu->env.psw.mask = PSW_MASK_32 | PSW_MASK_64;
|
|
|
77c23f |
+ uint64_t spsw = ldq_phys(s->as, 0);
|
|
|
77c23f |
+
|
|
|
77c23f |
+ cpu->env.psw.mask = spsw & 0xffffffff80000000ULL;
|
|
|
77c23f |
+ /*
|
|
|
77c23f |
+ * Invert short psw indication, so SIE will report a specification
|
|
|
77c23f |
+ * exception if it was not set.
|
|
|
77c23f |
+ */
|
|
|
77c23f |
+ cpu->env.psw.mask ^= PSW_MASK_SHORTPSW;
|
|
|
77c23f |
+ cpu->env.psw.addr = spsw & 0x7fffffffULL;
|
|
|
77c23f |
+
|
|
|
77c23f |
s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu);
|
|
|
77c23f |
}
|
|
|
77c23f |
#endif
|
|
|
77c23f |
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
|
|
|
77c23f |
index 7e1c18d596..7f5fa1d35b 100644
|
|
|
77c23f |
--- a/target/s390x/cpu.h
|
|
|
77c23f |
+++ b/target/s390x/cpu.h
|
|
|
77c23f |
@@ -269,6 +269,7 @@ extern const VMStateDescription vmstate_s390_cpu;
|
|
|
77c23f |
#define PSW_MASK_EXT 0x0100000000000000ULL
|
|
|
77c23f |
#define PSW_MASK_KEY 0x00F0000000000000ULL
|
|
|
77c23f |
#define PSW_SHIFT_KEY 52
|
|
|
77c23f |
+#define PSW_MASK_SHORTPSW 0x0008000000000000ULL
|
|
|
77c23f |
#define PSW_MASK_MCHECK 0x0004000000000000ULL
|
|
|
77c23f |
#define PSW_MASK_WAIT 0x0002000000000000ULL
|
|
|
77c23f |
#define PSW_MASK_PSTATE 0x0001000000000000ULL
|
|
|
77c23f |
--
|
|
|
77c23f |
2.27.0
|
|
|
77c23f |
|