From nobody Tue Feb 10 19:00:23 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1679745377; cv=none; d=zohomail.com; s=zohoarc; b=bqq3tqHZ1pOEbXuuxK6U2+wKL9lWq7squWGJh5x7wdnFs5lHHH3Ig6uWDnzimjA2eTjOEGLkNX4bysUsbFqR6n49M+rr1DN2Jl11OrjmPEkv9jlKAYkBMDKa/J4OhGZa/3UCrRdVQjqJhxGSk1dl1gi7UeDlyd8aP6vP65sMhUU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679745377; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I3FEu/nTbPKwKvyLx5sbEt9ZFhxKMxxn+3nzIHWc9gU=; b=J/WSEUdbPqOSKjmZqAXhG5YYXO6XPS5qNajXWMY5NAwUDuUiHuci16Ykxu3GhOehae8B8t8kD/WzZ51O7nQATeRoPd1xTYObAY0p7PNquH+/BgZvldz2wpEwKlO6+ps9JoVHG9YdUCmoKs+h9OdEIN3lZZcXYP8q9zjy/rICvSs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1679745377661735.9856886430166; Sat, 25 Mar 2023 04:56:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pg2UP-0000NQ-Lq; Sat, 25 Mar 2023 07:55:17 -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 1pg2UO-0000N2-1l for qemu-devel@nongnu.org; Sat, 25 Mar 2023 07:55:16 -0400 Received: from mail-yw1-x1136.google.com ([2607:f8b0:4864:20::1136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pg2UM-00009D-Kz for qemu-devel@nongnu.org; Sat, 25 Mar 2023 07:55:15 -0400 Received: by mail-yw1-x1136.google.com with SMTP id 00721157ae682-545ce8e77fcso5249807b3.1 for ; Sat, 25 Mar 2023 04:55:14 -0700 (PDT) Received: from stoup.. ([2602:ae:1544:6601:790a:6e23:4a91:70a]) by smtp.gmail.com with ESMTPSA id p14-20020a17090a2d8e00b0023af4eb597csm1234684pjd.52.2023.03.25.03.54.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 03:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679745313; 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=I3FEu/nTbPKwKvyLx5sbEt9ZFhxKMxxn+3nzIHWc9gU=; b=LYWKCvLHaAYuAQZxBCAMiezRvI6/e4ZAgy3ynQyhohJynXqICj2Ap2zjwf5vF6ohHy XNeq4mCKOWfx4DjM19n4ukYIBPlV+uFIWOUUmvAMhpH6rnItPDNdgxfI0sOuBhMZbh0s UXpV5vmdKmRi8n1EOIihh8+OLeMD6CLxHuyyzW3q7TOHoNrTW6BTr04T+IW3+MmGh2Rx 2jS6C1INGrfQ4v2YG8rEKTanQCN/wWBeqZOJshraaHzw3DCNIfjNo4yCgTE6EACFWU4z D810bA1E9hpzTryy1L04rIdflrZiIZNhHJog6arjupDhY0M9S/OQ3t121+w/pH+rpq6W dv4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679745313; 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=I3FEu/nTbPKwKvyLx5sbEt9ZFhxKMxxn+3nzIHWc9gU=; b=5jAcJWenElUa1Djk5Q0bXo6Oq6P0SNf/DccLfRdTFTYAVWT3xPN+iuDu9/zgd3kAZJ h98excfNYfiBT8dMLwJ/e2JJDvO9XJdoqdJz39hClihDgPRMtWCopj2+vEw7QcYc2CtI PcHl4c7K3b8S+1Pse17tevYnnBFvZ7pTi+UhOYBGTVXKcyxbtqUOeu8A1Z4269Zn2eIW /YzWOBFl6yH7/fmQWtVkEJXUKzK2Wm4jI2zBSZMuut5OWW6jp4r2egZj0xem4+QRBkKu aQB010rb+l8JeusdgYjPiPySAKY2nyaGMYX7750lrmaLBlQ9Y6K31/vfW3J88fo0CfpU 9RnQ== X-Gm-Message-State: AAQBX9exxgqqXckPf1iru+6YPeVZbzi7PjjgJysHoN9V52w3bpn8UB67 74GhcdwSAYt75/K6XFfe4a0ILNgdjnpLDUHrxEQ= X-Google-Smtp-Source: AKy350YxUxBcUZoUYTeRvKW3PpZvY9cxXhwx72rX1UZALSva9WldJnq+fUDx0YUN2ra3FYjMb+o0KQ== X-Received: by 2002:a17:90b:1d0b:b0:23f:2661:f94c with SMTP id on11-20020a17090b1d0b00b0023f2661f94cmr6313885pjb.47.1679741687456; Sat, 25 Mar 2023 03:54:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, palmer@dabbelt.com, zhiwei_liu@linux.alibaba.com, fei2.wu@intel.com Subject: [PATCH v6 19/25] target/riscv: Hoist pbmte and hade out of the level loop Date: Sat, 25 Mar 2023 03:54:23 -0700 Message-Id: <20230325105429.1142530-20-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230325105429.1142530-1-richard.henderson@linaro.org> References: <20230325105429.1142530-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1136; envelope-from=richard.henderson@linaro.org; helo=mail-yw1-x1136.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1679745379474100003 Content-Type: text/plain; charset="utf-8" These values are constant for every level of pte lookup. Signed-off-by: Richard Henderson Reviewed-by: Alistair Francis --- target/riscv/cpu_helper.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 833ea6d3fa..00f70a3dd5 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -870,6 +870,14 @@ static int get_physical_address(CPURISCVState *env, hw= addr *physical, return TRANSLATE_FAIL; } =20 + bool pbmte =3D env->menvcfg & MENVCFG_PBMTE; + bool hade =3D env->menvcfg & MENVCFG_HADE; + + if (first_stage && two_stage && riscv_cpu_virt_enabled(env)) { + pbmte =3D pbmte && (env->henvcfg & HENVCFG_PBMTE); + hade =3D hade && (env->henvcfg & HENVCFG_HADE); + } + int ptshift =3D (levels - 1) * ptidxbits; int i; =20 @@ -930,14 +938,6 @@ restart: return TRANSLATE_FAIL; } =20 - bool pbmte =3D env->menvcfg & MENVCFG_PBMTE; - bool hade =3D env->menvcfg & MENVCFG_HADE; - - if (first_stage && two_stage && riscv_cpu_virt_enabled(env)) { - pbmte =3D pbmte && (env->henvcfg & HENVCFG_PBMTE); - hade =3D hade && (env->henvcfg & HENVCFG_HADE); - } - if (riscv_cpu_sxl(env) =3D=3D MXL_RV32) { ppn =3D pte >> PTE_PPN_SHIFT; } else if (pbmte || cpu->cfg.ext_svnapot) { --=20 2.34.1