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