From nobody Sat May 4 13:29:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1543605833023261.033532044322; Fri, 30 Nov 2018 11:23:53 -0800 (PST) Received: from localhost ([::1]:34338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSoOB-0001Ja-1K for importer@patchew.org; Fri, 30 Nov 2018 14:23:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSoMt-0007ix-1b for qemu-devel@nongnu.org; Fri, 30 Nov 2018 14:22:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gSoMn-00083C-GD for qemu-devel@nongnu.org; Fri, 30 Nov 2018 14:22:26 -0500 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:38426) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gSoMn-00082u-A0 for qemu-devel@nongnu.org; Fri, 30 Nov 2018 14:22:21 -0500 Received: by mail-pl1-x641.google.com with SMTP id e5so3265969plb.5 for ; Fri, 30 Nov 2018 11:22:21 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-170-180.tukw.qwest.net. [97.113.170.180]) by smtp.gmail.com with ESMTPSA id b185sm12941494pga.85.2018.11.30.11.22.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Nov 2018 11:22:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IZG69suGTECshfy3cd2akZQXGen5UOXQzQiPI0zz0P0=; b=Od87XXeJR+o7he2Nl7IBjPba6NyqaQOe8CXCcSAty7hLHhHuptdDpKZg87dPxh3ZzZ 8ijRYv4ICU7ofG07XjtBtqCK4bN9LyETc4D9H2v97ld26e+X237UUu36O8AnSG1KtmUS KuZ5t4/0yLypjyuaQURmX/5wbF76hM5RKhzGc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IZG69suGTECshfy3cd2akZQXGen5UOXQzQiPI0zz0P0=; b=swW/6gCrzy7uRMCfyRUXEjEgSWPk/J4mfQauWdtUUIbr21ATOhPslih4fFyf9G9EIU gZY3s0zYjvDWGBeIu5tWGn6RYQowzswegQgLNUaBRszzYJ8cSvpqx6Zr/McAq7nt2mz3 zl1LnLwUOleu2lqWJXXxJTtknFV+raVcO02FkfkxzMylrzzZcbLdJ9xSxLgoU8Jd9JoN J2uU2uPbTCLFrFtOq487zQLytl/ziJ2182r3HmRgPwpl8/Dxdb8V4R3D2ZU6ypRwOTBt 9jcLnh+2aXtkpFUtzPA5Wq39LH1G2CzOPq2ehM0eMRspTxBImBXIgbzLwz+aDAzFpr0V YCVQ== X-Gm-Message-State: AA+aEWYfj8KnESy32ZKyzn2lgmvARtwTktBDtYrS4Mkbdl+jUiW0+ni/ DQkIKUuIfH4zq25Vl++X7JaTPliDvDE= X-Google-Smtp-Source: AFSGD/VewDDviqslGAKmUGbT0mxBaDS8sHRTr3bPzdZxrfUuoE6wFkoNoG02lxPSgCWSQgsXWO50Xg== X-Received: by 2002:a17:902:e002:: with SMTP id ca2mr6968329plb.103.1543605740025; Fri, 30 Nov 2018 11:22:20 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 30 Nov 2018 11:22:15 -0800 Message-Id: <20181130192216.26987-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181130192216.26987-1-richard.henderson@linaro.org> References: <20181130192216.26987-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::641 Subject: [Qemu-devel] [PATCH for-4.0 1/2] target/s390x: Move TOD_UNIX_EPOCH to cpu.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, cohuck@redhat.com, david@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We will need this from CONFIG_USER_ONLY as well, which cannot access include/hw/. Signed-off-by: Richard Henderson Reviewed-by: David Hildenbrand Reviewed-by: Thomas Huth --- include/hw/s390x/tod.h | 3 --- target/s390x/cpu.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/hw/s390x/tod.h b/include/hw/s390x/tod.h index 413c0d7c02..6ec4fb426c 100644 --- a/include/hw/s390x/tod.h +++ b/include/hw/s390x/tod.h @@ -44,9 +44,6 @@ typedef struct S390TODClass { void (*set)(S390TODState *td, const S390TOD *tod, Error **errp); } S390TODClass; =20 -/* The value of the TOD clock for 1.1.1970. */ -#define TOD_UNIX_EPOCH 0x7d91048bca000000ULL - /* Converts ns to s390's clock format */ static inline uint64_t time2tod(uint64_t ns) { diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 8c2320e882..d8049d181a 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -797,4 +797,7 @@ void s390_init_sigp(void); /* outside of target/s390x/ */ S390CPU *s390_cpu_addr2state(uint16_t cpu_addr); =20 +/* The value of the TOD clock for 1.1.1970. */ +#define TOD_UNIX_EPOCH 0x7d91048bca000000ULL + #endif --=20 2.17.2 From nobody Sat May 4 13:29:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1543605833069734.5840446867244; Fri, 30 Nov 2018 11:23:53 -0800 (PST) Received: from localhost ([::1]:34339 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSoOB-0001Ka-Ld for importer@patchew.org; Fri, 30 Nov 2018 14:23:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40367) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSoMt-0007j0-AT for qemu-devel@nongnu.org; Fri, 30 Nov 2018 14:22:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gSoMo-00083y-SN for qemu-devel@nongnu.org; Fri, 30 Nov 2018 14:22:27 -0500 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]:37728) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gSoMo-00083L-Mf for qemu-devel@nongnu.org; Fri, 30 Nov 2018 14:22:22 -0500 Received: by mail-pg1-x531.google.com with SMTP id 80so2907734pge.4 for ; Fri, 30 Nov 2018 11:22:22 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-170-180.tukw.qwest.net. [97.113.170.180]) by smtp.gmail.com with ESMTPSA id b185sm12941494pga.85.2018.11.30.11.22.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Nov 2018 11:22:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=R+TOh2SCAt4Wj8baLh1lAxUHnibuqXT/AbW1eZj9AD8=; b=UevK2mwiA64+e3W9IDC0xTL6T5saHi03y9yhGzIhFKZGswGLUakVK0bzZMSqmReSWn JRafrp+KUMslIKNpmmO2cLwfBtfV1KJIQAajr4dBK1/B3etiOeuLkAYWTapKP6TH3+4l qZht7Dmfv9q1JBPCCXz1DshZyUuuf05P61Mas= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=R+TOh2SCAt4Wj8baLh1lAxUHnibuqXT/AbW1eZj9AD8=; b=Ii5CKIOlEZmilMt5zxsjWOaJZGbrXAVLPiB1JPY9pDiz+dCgaRR8DRUcHtP4nwZsN6 VzYDTp5a8O2+F7xyhJaaIKmbNTp9hyx8tHGhoInLeeWgdwPVLS/zqXeVbgwhaGuRsXAC NSoPghpcgUEvTTHvFws3HSloZ5T14FAOvL6pvY2/nyC6NFg2VL8WdtZ8WQhKi0IQd/wY u/2eMidLi/uBFJFwruh1pmCzVriLlsX2Q76NEQt8RblUOqvHN0/j98XxaqhqTaIkvEQD +F9HVmMrsz11nyV6gWDZaQKxjbLoLmawjF3W17SHwOMKFIz88Jbf1G5lMjRpiJNEkgmy Y7QA== X-Gm-Message-State: AA+aEWaFBxaD+08Mj5mkl3a4RuwfklUiZTLjaBIch88eb8pzHYzPOUWG AtHEiO4Fh83nMwO9FZEQTxgteEiKORU= X-Google-Smtp-Source: AFSGD/W1P9JDnCVP8ita+v1JnG1rRYOGHjKddMp9NLSLhDJQZSDHbNL28MsKuXVS+HzxXUA6jzWxzg== X-Received: by 2002:a62:c613:: with SMTP id m19mr6901681pfg.207.1543605741320; Fri, 30 Nov 2018 11:22:21 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 30 Nov 2018 11:22:16 -0800 Message-Id: <20181130192216.26987-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181130192216.26987-1-richard.henderson@linaro.org> References: <20181130192216.26987-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::531 Subject: [Qemu-devel] [PATCH for-4.0 2/2] target/s390x: Implement STCK et al for CONFIG_USER_ONLY X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, cohuck@redhat.com, david@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is a non-privileged instruction that was only implemented for system mode. However, the stck instruction is used by glibc, so this was causing SIGILL for programs run under debian stretch. Signed-off-by: Richard Henderson --- target/s390x/helper.h | 2 +- target/s390x/misc_helper.c | 13 ++++++++++++- target/s390x/translate.c | 2 ++ target/s390x/insn-data.def | 11 ++++++----- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 018e9dd414..6260b50496 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -121,13 +121,13 @@ DEF_HELPER_4(cu41, i32, env, i32, i32, i32) DEF_HELPER_4(cu42, i32, env, i32, i32, i32) DEF_HELPER_5(msa, i32, env, i32, i32, i32, i32) DEF_HELPER_FLAGS_1(stpt, TCG_CALL_NO_RWG, i64, env) +DEF_HELPER_FLAGS_1(stck, TCG_CALL_NO_RWG_SE, i64, env) =20 #ifndef CONFIG_USER_ONLY DEF_HELPER_3(servc, i32, env, i64, i64) 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) diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index 3f91579570..c2940afecb 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -76,8 +76,19 @@ uint64_t HELPER(stpt)(CPUS390XState *env) #endif } =20 -#ifndef CONFIG_USER_ONLY +#ifdef CONFIG_USER_ONLY +/* Store Clock */ +uint64_t HELPER(stck)(CPUS390XState *env) +{ + struct timespec ts; + uint64_t ms; =20 + clock_gettime(CLOCK_REALTIME, &ts); + ms =3D (ts.tv_nsec / 1000) + (ts.tv_sec * 100000ull); + + return TOD_UNIX_EPOCH + ms; +} +#else /* SCLP service call */ uint32_t HELPER(servc)(CPUS390XState *env, uint64_t r1, uint64_t r2) { diff --git a/target/s390x/translate.c b/target/s390x/translate.c index b5bd56b7ee..8bb9c0529a 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4010,6 +4010,7 @@ static DisasJumpType op_stap(DisasContext *s, DisasOp= s *o) tcg_gen_ld32u_i64(o->out, cpu_env, offsetof(CPUS390XState, core_id)); return DISAS_NEXT; } +#endif =20 static DisasJumpType op_stck(DisasContext *s, DisasOps *o) { @@ -4046,6 +4047,7 @@ static DisasJumpType op_stcke(DisasContext *s, DisasO= ps *o) return DISAS_NEXT; } =20 +#ifndef CONFIG_USER_ONLY static DisasJumpType op_sck(DisasContext *s, DisasOps *o) { tcg_gen_qemu_ld_i64(o->in1, o->addr1, get_mem_index(s), MO_TEQ | MO_AL= IGN); diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 54e39df831..922227bada 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -837,6 +837,12 @@ C(0xe33e, STRV, RXY_a, Z, la2, r1_32u, new, m1_32, rev32, 0) C(0xe32f, STRVG, RXY_a, Z, la2, r1_o, new, m1_64, rev64, 0) =20 +/* STORE CLOCK */ + C(0xb205, STCK, S, Z, la2, 0, new, m1_64, stck, 0) + C(0xb27c, STCKF, S, SCF, la2, 0, new, m1_64, stck, 0) +/* STORE CLOCK EXTENDED */ + C(0xb278, STCKE, S, Z, 0, a2, 0, 0, stcke, 0) + /* STORE FACILITY LIST EXTENDED */ C(0xb2b0, STFLE, S, SFLE, 0, a2, 0, 0, stfle, 0) /* STORE FPC */ @@ -1020,11 +1026,6 @@ F(0x8000, SSM, S, Z, 0, m2_8u, 0, 0, ssm, 0, IF_PRIV) /* SIGNAL PROCESSOR */ F(0xae00, SIGP, RS_a, Z, 0, a2, 0, 0, sigp, 0, IF_PRIV) -/* STORE CLOCK */ - C(0xb205, STCK, S, Z, la2, 0, new, m1_64, stck, 0) - C(0xb27c, STCKF, S, SCF, la2, 0, new, m1_64, stck, 0) -/* STORE CLOCK EXTENDED */ - C(0xb278, STCKE, S, Z, 0, a2, 0, 0, stcke, 0) /* STORE CLOCK COMPARATOR */ F(0xb207, STCKC, S, Z, la2, 0, new, m1_64a, stckc, 0, IF_PRIV) /* STORE CONTROL */ --=20 2.17.2