From patchwork Thu May 18 17:50:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mayuresh Chitale X-Patchwork-Id: 1783469 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=kVrsKfso; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QMcwk06jTz20dn for ; Fri, 19 May 2023 03:51:34 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzhmZ-0002PE-3C; Thu, 18 May 2023 13:51:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzhmX-0002O3-AB for qemu-devel@nongnu.org; Thu, 18 May 2023 13:51:17 -0400 Received: from mail-ot1-x32c.google.com ([2607:f8b0:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzhmV-0001gY-6Y for qemu-devel@nongnu.org; Thu, 18 May 2023 13:51:17 -0400 Received: by mail-ot1-x32c.google.com with SMTP id 46e09a7af769-6abeffced6fso1714059a34.3 for ; Thu, 18 May 2023 10:51:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1684432274; x=1687024274; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yMHA+h7oKPuoXJ8vtGMg6ieshukBlbz7/PDV7/EW4bw=; b=kVrsKfsoWjGQmq0+TjXX8JYkbFmQqIeILQiDBReq7cFZS6NUrzAWK0RFFcJExJFLQk gMpn4Sy7T96PRXLZ5LuU7FYlEvHXG8H2BesSxFwUcBon4WsyGhHh2mWgTrO5nm424Hxa 3vYF+M+dSPffp78v/YQT4d36JbTBS41lixnKVIqECWWWrgn5tFK/1ClSs+7PggDcon25 mdn9CEDAwoB5jDJTStt9QhyH1yL802LqsmjCS6Ikknp+yNls6fI/OK1z+LJAUzR5Iz2m qrqm/zWRR16PVOyZA4STppoz/bzKeKeYBgdpMnPXfSIKd74FxKdxOSaZixma/wvaKJHo WzlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684432274; x=1687024274; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yMHA+h7oKPuoXJ8vtGMg6ieshukBlbz7/PDV7/EW4bw=; b=McQ4idAzd3k4chFOkIK6UZGo1BWdfEsXVrsr//tBWyY7EydXluHPq73Vk9sOFAyJm+ +VJ96Y6zBxWoQY6NURboLncAhn9aQZw+AYsJ4o4X6Gy+Ns7X6OJ5jhvLTKMICQSZte8O 07NFWz3o5Ylb0Fe0anMOVk6o0UUjME4TxxguyrDceAiM8lrwjfei6bUNyAA8i8LieRA1 6guPnKdKIYwaC1S9ctbei273iMvbSbgQuV5bWSHxJuTSFYC77S9fGzAdQSKfyR5CYdXM CCPJuFN9UX6u3lM15R2gzMdJ073y7dwg38xa7opYX4NLQQGXYkHpGO4fEX+NDPfFE5be ydWg== X-Gm-Message-State: AC+VfDw3BTPSMy7NBRnwGZQRoeonj6MZNtVgyml4H/MJ9leLmF1t/Knv 8xklj1V5szWjGi+TsJ2UDG8ozJMY4oldk9Gu2HNMdw== X-Google-Smtp-Source: ACHHUZ5upTZavxkkKpQUuEClVndjYTwh7hh1cMwbHO/HuMzZ3Xu22kPWAc/YQz/TQ4I27WfZOur9aA== X-Received: by 2002:a9d:7314:0:b0:6ac:a7bc:61c4 with SMTP id e20-20020a9d7314000000b006aca7bc61c4mr1635485otk.10.1684432273926; Thu, 18 May 2023 10:51:13 -0700 (PDT) Received: from mchitale-vm.. ([103.97.165.210]) by smtp.googlemail.com with ESMTPSA id t13-20020a05683014cd00b006ab22bb324asm890832otq.10.2023.05.18.10.51.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 10:51:13 -0700 (PDT) From: Mayuresh Chitale To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org, alistair.francis@wdc.com Cc: Mayuresh Chitale , Alistair Francis , Daniel Barboza , liweiwei@iscas.ac.cn, Richard Henderson Subject: [PATCH v5 1/3] target/riscv: smstateen check for fcsr Date: Thu, 18 May 2023 23:20:56 +0530 Message-Id: <20230518175058.2772506-2-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230518175058.2772506-1-mchitale@ventanamicro.com> References: <20230518175058.2772506-1-mchitale@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::32c; envelope-from=mchitale@ventanamicro.com; helo=mail-ot1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Implement the s/h/mstateen.fcsr bit as defined in the smstateen spec and check for it when accessing the fcsr register and its fields. Signed-off-by: Mayuresh Chitale Reviewed-by: Weiwei Li Reviewed-by: Alistair Francis --- target/riscv/csr.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 4451bd1263..3f6b824bd2 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -82,6 +82,10 @@ static RISCVException fs(CPURISCVState *env, int csrno) !riscv_cpu_cfg(env)->ext_zfinx) { return RISCV_EXCP_ILLEGAL_INST; } + + if (!env->debugger && !riscv_cpu_fp_enabled(env)) { + return smstateen_acc_ok(env, 0, SMSTATEEN0_FCSR); + } #endif return RISCV_EXCP_NONE; } @@ -2100,6 +2104,9 @@ static RISCVException write_mstateen0(CPURISCVState *env, int csrno, target_ulong new_val) { uint64_t wr_mask = SMSTATEEN_STATEEN | SMSTATEEN0_HSENVCFG; + if (!riscv_has_ext(env, RVF)) { + wr_mask |= SMSTATEEN0_FCSR; + } return write_mstateen(env, csrno, wr_mask, new_val); } @@ -2173,6 +2180,10 @@ static RISCVException write_hstateen0(CPURISCVState *env, int csrno, { uint64_t wr_mask = SMSTATEEN_STATEEN | SMSTATEEN0_HSENVCFG; + if (!riscv_has_ext(env, RVF)) { + wr_mask |= SMSTATEEN0_FCSR; + } + return write_hstateen(env, csrno, wr_mask, new_val); } @@ -2259,6 +2270,10 @@ static RISCVException write_sstateen0(CPURISCVState *env, int csrno, { uint64_t wr_mask = SMSTATEEN_STATEEN | SMSTATEEN0_HSENVCFG; + if (!riscv_has_ext(env, RVF)) { + wr_mask |= SMSTATEEN0_FCSR; + } + return write_sstateen(env, csrno, wr_mask, new_val); } From patchwork Thu May 18 17:50:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mayuresh Chitale X-Patchwork-Id: 1783470 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=a3qzDFyM; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QMcx446sHz20dn for ; Fri, 19 May 2023 03:51:52 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzhmg-0002i2-0u; Thu, 18 May 2023 13:51:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzhme-0002e8-Ls for qemu-devel@nongnu.org; Thu, 18 May 2023 13:51:24 -0400 Received: from mail-oa1-x2d.google.com ([2001:4860:4864:20::2d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzhmZ-0001hm-Ly for qemu-devel@nongnu.org; Thu, 18 May 2023 13:51:24 -0400 Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-1967cd396a1so1465112fac.0 for ; Thu, 18 May 2023 10:51:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1684432278; x=1687024278; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Oi2BPBqhwTqWZsbomFMY6RSHe6ZN6RTyyS7h+sX9gec=; b=a3qzDFyM5W0en9rjuLL8rxgkwe/d/SbD7IP9CjHAtqR+Clx+gMHdtryva863DcBW6c ICjwlWKfOJkamstHDgsuyiV5COMPGBdCji1Jq6hwo9bmE80TqWu7DgjzFmNBJv/9sFpA LCi/VABDfLqLWkBADx7eG3ND3p8egwkWB4bURNh0GFNs9lcPavgdtle/7Oef5uLw7+kV i4FXHi7OlFrgeiNrXcSaMwD4p38Dk6awnVKoc7vvhjORItY5vNcprZ2AX3dzKAXdlQOA CpuQTOmTlApwrP67kPzIALgP9bWazp9AmHvNnMFjT3btQgby7IQuYVM2kyqu61+M+UUj R9vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684432278; x=1687024278; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Oi2BPBqhwTqWZsbomFMY6RSHe6ZN6RTyyS7h+sX9gec=; b=FPPMV9OfOMDsz3t57SDkji5KjbOY9p9DdUVZQSpT0VfKkiDpTvumgPqRqVRgr1PV8E vSIP3iN9HuWruMl5A7KquR6FPUDppm1eW+3yjoIu1gxrvbNsEmr64zAOi0O0D0rEtGhF 3pa7owQ4Y9NSs3DlTo9/GWEtWZaEU9NOwgqNjAsRY96ZZ2vR6P3KO6xorA2nc4aP2d18 TK1TGOym+wMm/u/jYirElvIl2oKKblErvGiwZQpN/I5g6KSMnwy6HmsuQzAbqfPMXT/h M2JorfptkBpwW12KbvsCLwwG8HQ5lL3IRc2AFAY9/4E82R33Pkt/eDCfLuJ0TGxXKHcd aG7w== X-Gm-Message-State: AC+VfDx2E173Zn8Z3VgDomQIZDdd/SfvMFV9Q22uNXBqscitUJZuWO9i /KYRUrj/se29vklrHSSndIWqmV4V26xIPNmLO4WiWA== X-Google-Smtp-Source: ACHHUZ5VKSnZKXh0cN0v+4e/MdZ8yumLieFJ27GcD9M9m2/bpttIk7lsrxO4s7bSNYUL20IHVfUrEw== X-Received: by 2002:a05:6870:9514:b0:183:fab4:efb1 with SMTP id u20-20020a056870951400b00183fab4efb1mr1260184oal.13.1684432277860; Thu, 18 May 2023 10:51:17 -0700 (PDT) Received: from mchitale-vm.. ([103.97.165.210]) by smtp.googlemail.com with ESMTPSA id t13-20020a05683014cd00b006ab22bb324asm890832otq.10.2023.05.18.10.51.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 10:51:17 -0700 (PDT) From: Mayuresh Chitale To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org, alistair.francis@wdc.com Cc: Mayuresh Chitale , Alistair Francis , Daniel Barboza , liweiwei@iscas.ac.cn, Richard Henderson Subject: [PATCH v5 2/3] target/riscv: Reuse tb->flags.FS Date: Thu, 18 May 2023 23:20:57 +0530 Message-Id: <20230518175058.2772506-3-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230518175058.2772506-1-mchitale@ventanamicro.com> References: <20230518175058.2772506-1-mchitale@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2001:4860:4864:20::2d; envelope-from=mchitale@ventanamicro.com; helo=mail-oa1-x2d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When misa.F is 0 tb->flags.FS field is unused and can be used to save the current state of smstateen0.FCSR check which is needed by the floating point translation routines. Signed-off-by: Mayuresh Chitale Reviewed-by: Richard Henderson Reviewed-by: Weiwei Li Reviewed-by: Alistair Francis --- target/riscv/cpu_helper.c | 6 ++++++ target/riscv/insn_trans/trans_rvf.c.inc | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index b68dcfe7b6..695c189f96 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -119,6 +119,12 @@ void cpu_get_tb_cpu_state(CPURISCVState *env, target_ulong *pc, vs = MIN(vs, get_field(env->mstatus_hs, MSTATUS_VS)); } + /* With Zfinx, floating point is enabled/disabled by Smstateen. */ + if (!riscv_has_ext(env, RVF)) { + fs = (smstateen_acc_ok(env, 0, SMSTATEEN0_FCSR) == RISCV_EXCP_NONE) + ? EXT_STATUS_DIRTY : EXT_STATUS_DISABLED; + } + if (cpu->cfg.debug && !icount_enabled()) { flags = FIELD_DP32(flags, TB_FLAGS, ITRIGGER, env->itrigger_enabled); } diff --git a/target/riscv/insn_trans/trans_rvf.c.inc b/target/riscv/insn_trans/trans_rvf.c.inc index b2de4fcf3f..509a6acffe 100644 --- a/target/riscv/insn_trans/trans_rvf.c.inc +++ b/target/riscv/insn_trans/trans_rvf.c.inc @@ -19,9 +19,10 @@ */ #define REQUIRE_FPU do {\ - if (ctx->mstatus_fs == EXT_STATUS_DISABLED) \ - if (!ctx->cfg_ptr->ext_zfinx) \ - return false; \ + if (ctx->mstatus_fs == EXT_STATUS_DISABLED) { \ + ctx->virt_inst_excp = ctx->virt_enabled && ctx->cfg_ptr->ext_zfinx; \ + return false; \ + } \ } while (0) #define REQUIRE_ZFINX_OR_F(ctx) do {\ From patchwork Thu May 18 17:50:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mayuresh Chitale X-Patchwork-Id: 1783471 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=CwZBPU9a; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QMcx71sgrz20dn for ; Fri, 19 May 2023 03:51:55 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzhmj-0002oA-05; Thu, 18 May 2023 13:51:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzhmh-0002kk-8m for qemu-devel@nongnu.org; Thu, 18 May 2023 13:51:27 -0400 Received: from mail-oa1-x2c.google.com ([2001:4860:4864:20::2c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzhmd-0001il-OK for qemu-devel@nongnu.org; Thu, 18 May 2023 13:51:26 -0400 Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-195ee1be41aso1743451fac.1 for ; Thu, 18 May 2023 10:51:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1684432282; x=1687024282; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ry93EuiL339cXmTcSwW+O/TAemEHyYi1HmGB8rjIeQg=; b=CwZBPU9aEPdq8QhrQx1I57TUAK/Yb/uXITlDuXFTsRRUHJ8/r9DiRSodwnS7qgvcvp TqT9jP5u1vcqKon0B62+7NRtIw+LtJ5WFxcZHnO+J410JrLeoRzJ0/QfdiEWT1rXJBOQ i4ehtfjkc1mlklVteXuSyUY8dhNEvHEqQUDnicgT9zqjkQD8i4VFa2403IHWkAjUsL29 KwRE+b7oJVAdZ+RDPENd0Pxyy6ZzeS0Bnr49tyDVzGB66kLnnd0HB1lZYp+08zoetQ1v h3qR5bEQ5sGI6X2uN483reGYFd2KgANzl72tBr6iKtelyGGIQ2TFbl+nRJfNBRX4Pl8e u9Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684432282; x=1687024282; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ry93EuiL339cXmTcSwW+O/TAemEHyYi1HmGB8rjIeQg=; b=KWLjo816XK9f7iXgNBDI2Fl8JKqTV+Ltzh2RJqK2u/j1U1VgBh0tEy+n6O/BNIhtQe HYnK+GmEuH5kveLj8jyf1L4QYjN8IFQx8UCooe9iaSSWTGth2QL6upgeoGhhfMZ7b1g/ EuRAZNCWTUDBiiBMbXO/tHSATUoTslayJgx3ICQr20ghQTiXrZAXpq59uHzWPNasQ9eZ PvuU+c0FUN9pHknyKb6M+6GvcZw2rlwtXeyxeSeZxQQNLHB8P0Msct+aHFBhButWZiL5 2lefgoqy+e+eAou/XXL4HOph6fca5vP8QctUhBXpv2LzxoxTKXFbLSwfJrlBjQqzdvj1 jD/Q== X-Gm-Message-State: AC+VfDyhtcmyMcj61M/0gkddRr8rnII1TepGtVmZtPHjK3XkaC9CTtgE +OyurumlFyTkPrWQWgwOxE/uiX/XO4D7IAMMu3432A== X-Google-Smtp-Source: ACHHUZ6xG0nQIzmibottF0PzhokVUvePgPhBpqOQlDbcmRHaocQry1JfKNMwyEiYAuj8UXVLkRSOSQ== X-Received: by 2002:a05:6870:3884:b0:18b:15cd:9b45 with SMTP id y4-20020a056870388400b0018b15cd9b45mr908685oan.40.1684432282359; Thu, 18 May 2023 10:51:22 -0700 (PDT) Received: from mchitale-vm.. ([103.97.165.210]) by smtp.googlemail.com with ESMTPSA id t13-20020a05683014cd00b006ab22bb324asm890832otq.10.2023.05.18.10.51.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 10:51:22 -0700 (PDT) From: Mayuresh Chitale To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org, alistair.francis@wdc.com Cc: Mayuresh Chitale , Alistair Francis , Daniel Barboza , liweiwei@iscas.ac.cn, Richard Henderson Subject: [PATCH v5 3/3] target/riscv: smstateen knobs Date: Thu, 18 May 2023 23:20:58 +0530 Message-Id: <20230518175058.2772506-4-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230518175058.2772506-1-mchitale@ventanamicro.com> References: <20230518175058.2772506-1-mchitale@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2001:4860:4864:20::2c; envelope-from=mchitale@ventanamicro.com; helo=mail-oa1-x2c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add knobs to allow users to enable smstateen and also export it via the ISA extension string. Signed-off-by: Mayuresh Chitale Reviewed-by: Weiwei Li Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index befa64528f..9420cd670e 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -119,6 +119,7 @@ static const struct isa_ext_data isa_edata_arr[] = { ISA_EXT_DATA_ENTRY(zhinx, PRIV_VERSION_1_12_0, ext_zhinx), ISA_EXT_DATA_ENTRY(zhinxmin, PRIV_VERSION_1_12_0, ext_zhinxmin), ISA_EXT_DATA_ENTRY(smaia, PRIV_VERSION_1_12_0, ext_smaia), + ISA_EXT_DATA_ENTRY(smstateen, PRIV_VERSION_1_12_0, ext_smstateen), ISA_EXT_DATA_ENTRY(ssaia, PRIV_VERSION_1_12_0, ext_ssaia), ISA_EXT_DATA_ENTRY(sscofpmf, PRIV_VERSION_1_12_0, ext_sscofpmf), ISA_EXT_DATA_ENTRY(sstc, PRIV_VERSION_1_12_0, ext_sstc), @@ -1498,8 +1499,8 @@ static Property riscv_cpu_extensions[] = { DEFINE_PROP_UINT16("vlen", RISCVCPU, cfg.vlen, 128), DEFINE_PROP_UINT16("elen", RISCVCPU, cfg.elen, 64), + DEFINE_PROP_BOOL("smstateen", RISCVCPU, cfg.ext_smstateen, false), DEFINE_PROP_BOOL("svadu", RISCVCPU, cfg.ext_svadu, true), - DEFINE_PROP_BOOL("svinval", RISCVCPU, cfg.ext_svinval, false), DEFINE_PROP_BOOL("svnapot", RISCVCPU, cfg.ext_svnapot, false), DEFINE_PROP_BOOL("svpbmt", RISCVCPU, cfg.ext_svpbmt, false),