76 lines
2.6 KiB
Diff
76 lines
2.6 KiB
Diff
From d738b4336c79be68b6040f73427e089f46957728 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Huth <thuth@redhat.com>
|
|
Date: Fri, 29 May 2020 05:54:11 -0400
|
|
Subject: [PATCH 29/42] s390x: protvirt: Set guest IPL PSW
|
|
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
Message-id: <20200529055420.16855-30-thuth@redhat.com>
|
|
Patchwork-id: 97049
|
|
O-Subject: [RHEL-8.3.0 qemu-kvm PATCH v2 29/38] s390x: protvirt: Set guest IPL PSW
|
|
Bugzilla: 1828317
|
|
RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com>
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
|
From: Janosch Frank <frankja@linux.ibm.com>
|
|
|
|
Handling of CPU reset and setting of the IPL psw from guest storage at
|
|
offset 0 is done by a Ultravisor call. Let's only fetch it if
|
|
necessary.
|
|
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
|
|
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
|
|
Message-Id: <20200319131921.2367-11-frankja@linux.ibm.com>
|
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
(cherry picked from commit 59181010a2ff82c3a97e9b5768ee87c38e4815f1)
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
target/s390x/cpu.c | 26 +++++++++++++++++---------
|
|
1 file changed, 17 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
|
|
index 8f38cd8e6f..371b91b2d7 100644
|
|
--- a/target/s390x/cpu.c
|
|
+++ b/target/s390x/cpu.c
|
|
@@ -77,16 +77,24 @@ static bool s390_cpu_has_work(CPUState *cs)
|
|
static void s390_cpu_load_normal(CPUState *s)
|
|
{
|
|
S390CPU *cpu = S390_CPU(s);
|
|
- uint64_t spsw = ldq_phys(s->as, 0);
|
|
-
|
|
- cpu->env.psw.mask = spsw & PSW_MASK_SHORT_CTRL;
|
|
- /*
|
|
- * Invert short psw indication, so SIE will report a specification
|
|
- * exception if it was not set.
|
|
- */
|
|
- cpu->env.psw.mask ^= PSW_MASK_SHORTPSW;
|
|
- cpu->env.psw.addr = spsw & PSW_MASK_SHORT_ADDR;
|
|
+ uint64_t spsw;
|
|
|
|
+ if (!s390_is_pv()) {
|
|
+ spsw = ldq_phys(s->as, 0);
|
|
+ cpu->env.psw.mask = spsw & PSW_MASK_SHORT_CTRL;
|
|
+ /*
|
|
+ * Invert short psw indication, so SIE will report a specification
|
|
+ * exception if it was not set.
|
|
+ */
|
|
+ cpu->env.psw.mask ^= PSW_MASK_SHORTPSW;
|
|
+ cpu->env.psw.addr = spsw & PSW_MASK_SHORT_ADDR;
|
|
+ } else {
|
|
+ /*
|
|
+ * Firmware requires us to set the load state before we set
|
|
+ * the cpu to operating on protected guests.
|
|
+ */
|
|
+ s390_cpu_set_state(S390_CPU_STATE_LOAD, cpu);
|
|
+ }
|
|
s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu);
|
|
}
|
|
#endif
|
|
--
|
|
2.27.0
|
|
|