cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
26ba25
From cfc375b3dcc391e8895884ff0fe58bdd1652b2d7 Mon Sep 17 00:00:00 2001
26ba25
From: David Hildenbrand <david@redhat.com>
26ba25
Date: Fri, 21 Dec 2018 15:36:09 +0000
26ba25
Subject: [PATCH 07/22] s390x/tcg: implement SET CLOCK
26ba25
26ba25
RH-Author: David Hildenbrand <david@redhat.com>
26ba25
Message-id: <20181221153614.27961-8-david@redhat.com>
26ba25
Patchwork-id: 83748
26ba25
O-Subject: [RHEL-8.0 qemu-kvm v2 PATCH 07/12] s390x/tcg: implement SET CLOCK
26ba25
Bugzilla: 1653569
26ba25
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
26ba25
RH-Acked-by: Thomas Huth <thuth@redhat.com>
26ba25
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
26ba25
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
26ba25
26ba25
Conflicts:
26ba25
	target/s390x/translate.c: ExitStatus vs. DisasJumpType
26ba25
26ba25
This allows a guest to change its TOD. We already take care of updating
26ba25
all CKC timers from within S390TODClass.
26ba25
26ba25
Use MO_ALIGN to load the operand manually - this will properly trigger a
26ba25
SPECIFICATION exception.
26ba25
26ba25
Acked-by: Thomas Huth <thuth@redhat.com>
26ba25
Signed-off-by: David Hildenbrand <david@redhat.com>
26ba25
Message-Id: <20180627134410.4901-8-david@redhat.com>
26ba25
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
26ba25
(cherry picked from commit 9dc6753718d4c0fe327729fea94e4d9f3f5a3d17)
26ba25
Signed-off-by: David Hildenbrand <david@redhat.com>
26ba25
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
26ba25
---
26ba25
 target/s390x/helper.h      |  1 +
26ba25
 target/s390x/insn-data.def |  3 +--
26ba25
 target/s390x/misc_helper.c | 16 ++++++++++++++++
26ba25
 target/s390x/translate.c   |  9 +++++++++
26ba25
 4 files changed, 27 insertions(+), 2 deletions(-)
26ba25
26ba25
diff --git a/target/s390x/helper.h b/target/s390x/helper.h
26ba25
index 59cba86..97c60ca 100644
26ba25
--- a/target/s390x/helper.h
26ba25
+++ b/target/s390x/helper.h
26ba25
@@ -127,6 +127,7 @@ DEF_HELPER_4(diag, void, env, i32, i32, i32)
26ba25
 DEF_HELPER_3(load_psw, noreturn, env, i64, i64)
26ba25
 DEF_HELPER_FLAGS_2(spx, TCG_CALL_NO_RWG, void, env, i64)
26ba25
 DEF_HELPER_FLAGS_1(stck, TCG_CALL_NO_RWG_SE, i64, env)
26ba25
+DEF_HELPER_FLAGS_2(sck, TCG_CALL_NO_RWG, i32, env, i64)
26ba25
 DEF_HELPER_FLAGS_2(sckc, TCG_CALL_NO_RWG, void, env, i64)
26ba25
 DEF_HELPER_FLAGS_2(sckpf, TCG_CALL_NO_RWG, void, env, i64)
26ba25
 DEF_HELPER_FLAGS_1(stckc, TCG_CALL_NO_RWG, i64, env)
26ba25
diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def
26ba25
index 1576194..5c6f33e 100644
26ba25
--- a/target/s390x/insn-data.def
26ba25
+++ b/target/s390x/insn-data.def
26ba25
@@ -997,8 +997,7 @@
26ba25
 /* SET ADDRESS SPACE CONTROL FAST */
26ba25
     C(0xb279, SACF,    S,     Z,   0, a2, 0, 0, sacf, 0)
26ba25
 /* SET CLOCK */
26ba25
-    /* ??? Not implemented - is it necessary? */
26ba25
-    C(0xb204, SCK,     S,     Z,   0, 0, 0, 0, 0, 0)
26ba25
+    C(0xb204, SCK,     S,     Z,   la2, 0, 0, 0, sck, 0)
26ba25
 /* SET CLOCK COMPARATOR */
26ba25
     C(0xb206, SCKC,    S,     Z,   0, m2_64a, 0, 0, sckc, 0)
26ba25
 /* SET CLOCK PROGRAMMABLE FIELD */
26ba25
diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
26ba25
index cada7af..d629b2f 100644
26ba25
--- a/target/s390x/misc_helper.c
26ba25
+++ b/target/s390x/misc_helper.c
26ba25
@@ -185,6 +185,22 @@ void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque)
26ba25
     helper_sckc(env, env->ckc);
26ba25
 }
26ba25
 
26ba25
+/* Set Clock */
26ba25
+uint32_t HELPER(sck)(CPUS390XState *env, uint64_t tod_low)
26ba25
+{
26ba25
+    S390TODState *td = s390_get_todstate();
26ba25
+    S390TODClass *tdc = S390_TOD_GET_CLASS(td);
26ba25
+    S390TOD tod = {
26ba25
+        .high = 0,
26ba25
+        .low = tod_low,
26ba25
+    };
26ba25
+
26ba25
+    qemu_mutex_lock_iothread();
26ba25
+    tdc->set(td, &tod, &error_abort);
26ba25
+    qemu_mutex_unlock_iothread();
26ba25
+    return 0;
26ba25
+}
26ba25
+
26ba25
 /* Set Tod Programmable Field */
26ba25
 void HELPER(sckpf)(CPUS390XState *env, uint64_t r0)
26ba25
 {
26ba25
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
26ba25
index 7d39ab3..ed9aff4 100644
26ba25
--- a/target/s390x/translate.c
26ba25
+++ b/target/s390x/translate.c
26ba25
@@ -4015,6 +4015,15 @@ static ExitStatus op_stcke(DisasContext *s, DisasOps *o)
26ba25
     return NO_EXIT;
26ba25
 }
26ba25
 
26ba25
+static ExitStatus op_sck(DisasContext *s, DisasOps *o)
26ba25
+{
26ba25
+    check_privileged(s);
26ba25
+    tcg_gen_qemu_ld_i64(o->in1, o->addr1, get_mem_index(s), MO_TEQ | MO_ALIGN);
26ba25
+    gen_helper_sck(cc_op, cpu_env, o->in1);
26ba25
+    set_cc_static(s);
26ba25
+    return NO_EXIT;
26ba25
+}
26ba25
+
26ba25
 static ExitStatus op_sckc(DisasContext *s, DisasOps *o)
26ba25
 {
26ba25
     check_privileged(s);
26ba25
-- 
26ba25
1.8.3.1
26ba25