From: Janosch Frank <frankja@linux.ibm.com>
To: qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, mihajlov@linux.ibm.com, david@redhat.com,
cohuck@redhat.com
Subject: [PATCH v4 10/16] s390x: protvirt: Set guest IPL PSW
Date: Thu, 20 Feb 2020 07:56:32 -0500 [thread overview]
Message-ID: <20200220125638.7241-11-frankja@linux.ibm.com> (raw)
In-Reply-To: <20200220125638.7241-1-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>
---
target/s390x/cpu.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index 1dbd84b9d7..fe2ac450d2 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -78,16 +78,21 @@ 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 & 0xffffffff80000000ULL;
- /*
- * 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 & 0x7fffffffULL;
+ CPUS390XState *env = &cpu->env;
+ uint64_t spsw;
+ if (!env->pv) {
+ spsw = ldq_phys(s->as, 0);
+ cpu->env.psw.mask = spsw & 0xffffffff80000000ULL;
+ /*
+ * 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 & 0x7fffffffULL;
+ } else {
+ s390_cpu_set_state(S390_CPU_STATE_LOAD, cpu);
+ }
s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu);
}
#endif
--
2.20.1
next prev parent reply other threads:[~2020-02-20 13:06 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-20 12:56 [PATCH v4 00/16] s390x: Protected Virtualization support Janosch Frank
2020-02-20 12:56 ` [PATCH v4 01/16] Sync pv Janosch Frank
2020-02-25 9:42 ` David Hildenbrand
2020-02-25 11:10 ` Janosch Frank
2020-02-20 12:56 ` [PATCH v4 02/16] s390x: protvirt: Add diag308 subcodes 8 - 10 Janosch Frank
2020-02-21 9:49 ` Cornelia Huck
2020-02-21 11:42 ` Janosch Frank
2020-02-20 12:56 ` [PATCH v4 03/16] s390x: protvirt: Support unpack facility Janosch Frank
2020-02-24 14:13 ` Christian Borntraeger
2020-02-24 14:25 ` Janosch Frank
2020-02-20 12:56 ` [PATCH v4 04/16] s390x: protvirt: Add migration blocker Janosch Frank
2020-02-25 9:50 ` David Hildenbrand
2020-02-25 11:21 ` Janosch Frank
2020-02-20 12:56 ` [PATCH v4 05/16] s390x: protvirt: Handle diag 308 subcodes 0,1,3,4 Janosch Frank
2020-02-20 12:56 ` [PATCH v4 06/16] s390x: protvirt: KVM intercept changes Janosch Frank
2020-02-25 10:01 ` David Hildenbrand
2020-02-25 11:33 ` Janosch Frank
2020-02-20 12:56 ` [PATCH v4 07/16] s390x: Add SIDA memory ops Janosch Frank
2020-02-25 9:59 ` David Hildenbrand
2020-02-25 11:27 ` Janosch Frank
2020-02-20 12:56 ` [PATCH v4 08/16] s390x: protvirt: Move STSI data over SIDAD Janosch Frank
2020-02-25 10:05 ` David Hildenbrand
2020-02-20 12:56 ` [PATCH v4 09/16] s390x: protvirt: SCLP interpretation Janosch Frank
2020-02-20 12:56 ` Janosch Frank [this message]
2020-02-20 12:56 ` [PATCH v4 11/16] s390x: protvirt: Move diag 308 data over SIDAD Janosch Frank
2020-02-20 12:56 ` [PATCH v4 12/16] s390x: protvirt: Disable address checks for PV guest IO emulation Janosch Frank
2020-02-20 12:56 ` [PATCH v4 13/16] s390x: protvirt: Move IO control structures over SIDA Janosch Frank
2020-02-20 12:56 ` [PATCH v4 14/16] s390x: protvirt: Handle SIGP store status correctly Janosch Frank
2020-02-20 12:56 ` [PATCH v4 15/16] s390x: Add unpack feature to GA1 Janosch Frank
2020-02-25 9:53 ` David Hildenbrand
2020-02-20 12:56 ` [PATCH v4 16/16] docs: Add protvirt docs Janosch Frank
2020-02-21 10:00 ` Cornelia Huck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200220125638.7241-11-frankja@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=mihajlov@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).