From patchwork Fri Mar 3 08:37:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 13158474 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 38D1CC64EC4 for ; Fri, 3 Mar 2023 08:44:46 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pY0zq-0000rx-D2; Fri, 03 Mar 2023 03:42:34 -0500 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 1pY0zi-00007B-1w for qemu-devel@nongnu.org; Fri, 03 Mar 2023 03:42:26 -0500 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pY0zg-00087I-HN for qemu-devel@nongnu.org; Fri, 03 Mar 2023 03:42:25 -0500 Received: by mail-pf1-x42f.google.com with SMTP id ay18so1095164pfb.2 for ; Fri, 03 Mar 2023 00:42:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; t=1677832943; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:from:to:cc:subject:date :message-id:reply-to; bh=PUkOCCts2DVch5VnVOvAOKGqLYUpNhJBdp+jfQXvKAo=; b=tmIWCJb8VV8xbWmoVFdDJkEGHEp68cFRkn8ADAUYqnS0HPcz1XOl2ip+0Uw7DC/K8O 6LvQsj8g/CHAg3He7/vTjogQLFBynHw459zJ2+3iSxDrIbRVvZEX9Uq1Ir26AoPp8lGn IunKxt+9KCqQc2hkLvuZ1XmU8Dc3v+iBr1fQFv2vFZEbRKsFyru7GeFojYzaEAneuUJR 17cQwhSB9WanwP4gzTtnrz9zvuAGz59/yKu0mzQOQTc0kBn9mPzU+U4Xlwn9a+iX0S3q F+H+kJsLRbMPSt/Wa64TCRp7hKtYR6KzPTUXlBX1XSJR1cbuIM25pTrrxsPz5wMmPX3h ywIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677832943; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PUkOCCts2DVch5VnVOvAOKGqLYUpNhJBdp+jfQXvKAo=; b=dOnU5BZPCa8hOZmd2nM+dqxuhkA8Cl4Q+aKq343pZfFffv2aZQugxLqL35pesIj9vd LgdJ8j+PWKW9xedhCwh55KGsyoJ+Q1uOBNRTwz0qwYtXhiiZeNrmOgUjUW35Ks4Hl46/ cKqRukF8gyjp3WYeDAhVyn4QQhpSIHlNTH1neD6x6dRl2333axWtIQFuHWhvsc6suIJc pgkaHybrrfdv6WvQ9vista1aeDfunXk8y4bqgaTRzNR6eB683q8We2uagpw8ptKosbWg 3dDTd+G7iTjztTLvmE60dQ2GRoWwl9wjVHMd21zwrjUsb3IS+EMHuagkxHslgAzbK3fK MPqQ== X-Gm-Message-State: AO0yUKXIA1NsVsBz/r16KoeLHWiYzCWuh9+SfbdJ3JOdsPyXFS9zoTea HDCv+GnW2IrUesdl8NXunSIQGg== X-Google-Smtp-Source: AK7set+GtcCiGFWS5DSNlwLaPAuQAQKHCq5nbBpEa9VB2lJKgOJWWlPM+Jra5hX+kCW+rtSCLbQ8IQ== X-Received: by 2002:aa7:8f3d:0:b0:5a9:bcf7:ea75 with SMTP id y29-20020aa78f3d000000b005a9bcf7ea75mr1310363pfr.10.1677832943043; Fri, 03 Mar 2023 00:42:23 -0800 (PST) Received: from localhost ([135.180.224.71]) by smtp.gmail.com with ESMTPSA id t13-20020aa7938d000000b0058837da69edsm1019540pfe.128.2023.03.03.00.42.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 00:42:22 -0800 (PST) Subject: [PULL 49/59] target/riscv: Fix the relationship of PBMTE/STCE fields between menvcfg and henvcfg Date: Fri, 3 Mar 2023 00:37:30 -0800 Message-Id: <20230303083740.12817-50-palmer@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230303083740.12817-1-palmer@rivosinc.com> References: <20230303083740.12817-1-palmer@rivosinc.com> MIME-Version: 1.0 Cc: qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Weiwei Li , Junqiang Wang , Daniel Henrique Barboza , Palmer Dabbelt From: Palmer Dabbelt To: Peter Maydell Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=palmer@rivosinc.com; helo=mail-pf1-x42f.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Weiwei Li henvcfg.PBMTE/STCE are read-only zero if menvcfg.PBMTE/STCE are zero. Signed-off-by: Weiwei Li Signed-off-by: Junqiang Wang Reviewed-by: Daniel Henrique Barboza Message-ID: <20230224040852.37109-3-liweiwei@iscas.ac.cn> Signed-off-by: Palmer Dabbelt --- target/riscv/csr.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index b20b00a9a7..b86c1aa6fa 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -1956,7 +1956,11 @@ static RISCVException read_henvcfg(CPURISCVState *env, int csrno, return ret; } - *val = env->henvcfg; + /* + * henvcfg.pbmte is read_only 0 when menvcfg.pbmte = 0 + * henvcfg.stce is read_only 0 when menvcfg.stce = 0 + */ + *val = env->henvcfg & (~(HENVCFG_PBMTE | HENVCFG_STCE) | env->menvcfg); return RISCV_EXCP_NONE; } @@ -1972,7 +1976,7 @@ static RISCVException write_henvcfg(CPURISCVState *env, int csrno, } if (riscv_cpu_mxl(env) == MXL_RV64) { - mask |= HENVCFG_PBMTE | HENVCFG_STCE; + mask |= env->menvcfg & (HENVCFG_PBMTE | HENVCFG_STCE); } env->henvcfg = (env->henvcfg & ~mask) | (val & mask); @@ -1990,14 +1994,15 @@ static RISCVException read_henvcfgh(CPURISCVState *env, int csrno, return ret; } - *val = env->henvcfg >> 32; + *val = (env->henvcfg & (~(HENVCFG_PBMTE | HENVCFG_STCE) | + env->menvcfg)) >> 32; return RISCV_EXCP_NONE; } static RISCVException write_henvcfgh(CPURISCVState *env, int csrno, target_ulong val) { - uint64_t mask = HENVCFG_PBMTE | HENVCFG_STCE; + uint64_t mask = env->menvcfg & (HENVCFG_PBMTE | HENVCFG_STCE); uint64_t valh = (uint64_t)val << 32; RISCVException ret;