From patchwork Fri Feb 24 13:44:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Marek X-Patchwork-Id: 9590483 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F1BDF60471 for ; Fri, 24 Feb 2017 14:43:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D5CEB286E0 for ; Fri, 24 Feb 2017 14:43:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C7F862872D; Fri, 24 Feb 2017 14:43:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EA539286E0 for ; Fri, 24 Feb 2017 14:43:33 +0000 (UTC) Received: from localhost ([::1]:37801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chH5o-0000Ms-FP for patchwork-qemu-devel@patchwork.kernel.org; Fri, 24 Feb 2017 09:43:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60744) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chGAt-0005Zf-1W for qemu-devel@nongnu.org; Fri, 24 Feb 2017 08:44:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chGAp-0001dN-UI for qemu-devel@nongnu.org; Fri, 24 Feb 2017 08:44:43 -0500 Received: from mx2.suse.de ([195.135.220.15]:44724) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chGAp-0001cG-KP for qemu-devel@nongnu.org; Fri, 24 Feb 2017 08:44:39 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id B2EEEAC41; Fri, 24 Feb 2017 13:44:35 +0000 (UTC) Received: by sepie.suse.cz (Postfix, from userid 10020) id DDB0E4096F; Fri, 24 Feb 2017 14:44:34 +0100 (CET) From: Michal Marek To: Richard Henderson , Alexander Graf Date: Fri, 24 Feb 2017 14:44:11 +0100 Message-Id: <20170224134411.28882-1-mmarek@suse.com> X-Mailer: git-send-email 2.10.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 X-Mailman-Approved-At: Fri, 24 Feb 2017 09:38:53 -0500 Subject: [Qemu-devel] [PATCH] target-s390x: Implement stfl and stfle 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: Eric Bischoff , Miroslav Benes , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The implementation is partially cargo cult based, but it works for the linux kernel use case. Signed-off-by: Michal Marek --- target/s390x/cpu_features.c | 6 ++++-- target/s390x/cpu_features.h | 2 +- target/s390x/helper.h | 2 ++ target/s390x/insn-data.def | 2 ++ target/s390x/misc_helper.c | 32 ++++++++++++++++++++++++++++++++ target/s390x/translate.c | 18 ++++++++++-------- 6 files changed, 51 insertions(+), 11 deletions(-) diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c index 42fd9d792bc8..d77c560380c4 100644 --- a/target/s390x/cpu_features.c +++ b/target/s390x/cpu_features.c @@ -286,11 +286,11 @@ void s390_init_feat_bitmap(const S390FeatInit init, S390FeatBitmap bitmap) } } -void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type, +int s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type, uint8_t *data) { S390Feat feat; - int bit_nr; + int bit_nr, res = 0; if (type == S390_FEAT_TYPE_STFL && test_bit(S390_FEAT_ZARCH, features)) { /* z/Architecture is always active if around */ @@ -303,9 +303,11 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type, bit_nr = s390_features[feat].bit; /* big endian on uint8_t array */ data[bit_nr / 8] |= 0x80 >> (bit_nr % 8); + res = MAX(res, bit_nr / 8 + 1); } feat = find_next_bit(features, S390_FEAT_MAX, feat + 1); } + return res; } void s390_add_from_feat_block(S390FeatBitmap features, S390FeatType type, diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h index d66912178680..e3c41be08060 100644 --- a/target/s390x/cpu_features.h +++ b/target/s390x/cpu_features.h @@ -56,7 +56,7 @@ typedef uint64_t S390FeatInit[S390_FEAT_MAX / 64 + 1]; const S390FeatDef *s390_feat_def(S390Feat feat); S390Feat s390_feat_by_type_and_bit(S390FeatType type, int bit); void s390_init_feat_bitmap(const S390FeatInit init, S390FeatBitmap bitmap); -void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type, +int s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type, uint8_t *data); void s390_add_from_feat_block(S390FeatBitmap features, S390FeatType type, uint8_t *data); diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 9102071d0aa4..4d703990d5d7 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -95,6 +95,8 @@ DEF_HELPER_FLAGS_1(stckc, TCG_CALL_NO_RWG, i64, env) DEF_HELPER_FLAGS_2(spt, TCG_CALL_NO_RWG, void, env, i64) DEF_HELPER_FLAGS_1(stpt, TCG_CALL_NO_RWG, i64, env) DEF_HELPER_4(stsi, i32, env, i64, i64, i64) +DEF_HELPER_1(stfl, void, env) +DEF_HELPER_3(stfle, i64, env, i64, i64) DEF_HELPER_FLAGS_4(lctl, TCG_CALL_NO_WG, void, env, i32, i64, i32) DEF_HELPER_FLAGS_4(lctlg, TCG_CALL_NO_WG, void, env, i32, i64, i32) DEF_HELPER_FLAGS_4(stctl, TCG_CALL_NO_WG, void, env, i32, i64, i32) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 075ff597c3de..be830a42ed8d 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -899,6 +899,8 @@ C(0xb202, STIDP, S, Z, la2, 0, new, m1_64, stidp, 0) /* STORE CPU TIMER */ C(0xb209, STPT, S, Z, la2, 0, new, m1_64, stpt, 0) +/* STORE FACILITY LIST EXTENDED */ + C(0xb2b0, STFLE, S, SFLE, 0, a2, 0, 0, stfle, 0) /* STORE FACILITY LIST */ C(0xb2b1, STFL, S, Z, 0, 0, 0, 0, stfl, 0) /* STORE PREFIX */ diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index c9604ea9c728..b513c0c66541 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -500,6 +500,38 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0, return cc; } +static int do_stfle(CPUS390XState *env, uint64_t addr, int len) +{ + S390CPU *cpu = s390_env_get_cpu(env); + uint8_t data[64]; + int res; + + memset(data, 0, sizeof(data)); + res = s390_fill_feat_block(cpu->model->features, S390_FEAT_TYPE_STFL, data); + cpu_physical_memory_write(addr, data, MIN(res, len)); + + return res; +} + +uint64_t HELPER(stfle)(CPUS390XState *env, uint64_t a0, uint64_t r0) +{ + int need, len = r0 & 0xff; + + need = do_stfle(env, a0, len * 8); + need = DIV_ROUND_UP(need, 8); + if (need <= len) + env->cc_op = 0; + else + env->cc_op = 3; + + return (r0 & ~0xffLL) | (need - 1); +} + +void HELPER(stfl)(CPUS390XState *env) +{ + do_stfle(env, 200, 4); +} + uint32_t HELPER(sigp)(CPUS390XState *env, uint64_t order_code, uint32_t r1, uint64_t cpu_addr) { diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 01c62176bf70..aff9a0bef549 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3628,15 +3628,17 @@ static ExitStatus op_spt(DisasContext *s, DisasOps *o) static ExitStatus op_stfl(DisasContext *s, DisasOps *o) { - TCGv_i64 f, a; - /* We really ought to have more complete indication of facilities - that we implement. Address this when STFLE is implemented. */ check_privileged(s); - f = tcg_const_i64(0xc0000000); - a = tcg_const_i64(200); - tcg_gen_qemu_st32(f, a, get_mem_index(s)); - tcg_temp_free_i64(f); - tcg_temp_free_i64(a); + gen_helper_stfl(cpu_env); + return NO_EXIT; +} + +static ExitStatus op_stfle(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + potential_page_fault(s); + gen_helper_stfle(regs[0], cpu_env, o->in2, regs[0]); + set_cc_static(s); return NO_EXIT; }