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=1679747393; cv=none; d=zohomail.com; s=zohoarc; b=IcCnzwIb9uKwWwU0cXYgRVuVT8LK02dv6w9K5S6W97Gg5Bnyqo5NYtutnFX+1jdiKBzIZKxNI3oSBgx3Q4NV1PMNS+jkz9cWM/49AfAzP1SCA9yipWau5zxblQaByWwuhHgk1xxEE8F+p/nYE7tv05/jQqQcyWemxxTJ8tMpCNk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679747393; 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=afbDBfHu3xZ5ENlfuk7S6Io4S9eISw3U+JX32ROX2Ik=; b=betAC4mocqYhdGO+y12KMJfhCShwKdgVrDOpvjArn6Wt7uvioXi1uoxcvZxhRUK4O/iet7gP/Wm/S5fTdZ/DztVasVBIzbwPVav5DBAn7wxKXXfFf1u98E8rNZlDl07PjPe4ZW+7tCcgiSY71bxR6pb/0X+wE+yh8rwrlkS1+zM= 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 167974739387640.0837323124822; Sat, 25 Mar 2023 05:29:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pg30p-0008Dl-Ld; Sat, 25 Mar 2023 08:28:47 -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 1pg30o-0008DZ-E7 for qemu-devel@nongnu.org; Sat, 25 Mar 2023 08:28:46 -0400 Received: from mail-io1-xd2c.google.com ([2607:f8b0:4864:20::d2c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pg30m-0005Xo-Tu for qemu-devel@nongnu.org; Sat, 25 Mar 2023 08:28:46 -0400 Received: by mail-io1-xd2c.google.com with SMTP id bl9so1912640iob.8 for ; Sat, 25 Mar 2023 05:28:44 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 03:54:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679747324; 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=afbDBfHu3xZ5ENlfuk7S6Io4S9eISw3U+JX32ROX2Ik=; b=x/T0dIFr+H8J3B5vI55m4C/iKnxm8r0gj5nbn+tAH+eZF/gJP8UrPQQJGzGL1MKM9V in0tocQBOkZseV+yyr6dH6BKi+X0FUlOlaU4Jpk/RiXSxOFp+h6E9cvUrDLDOIQGzcFk achDG82WYl61V11t54Jlk7E4Shc0n3+e7fV6OJEX1kra7uzfh/X1j33nnV3KENrI6/C0 /ISLQ9UZzNdehYVMbh7H+Yf5KYe2HOi7IyfZzPgNDFGnlk3D3/xr12JGij16S1Dh2zFS SCIcYAPgBcX7zQF4pnf7aiYrkyXYRDqUuUxmuaTvE3cBE5UXZk6Z5+jNlpcjz0dI7ywB RRhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679747324; 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=afbDBfHu3xZ5ENlfuk7S6Io4S9eISw3U+JX32ROX2Ik=; b=WDo7hCj4bJoEjs5WU07WeEDP9h7XJ4V0vAbvr6uco/GILWrpWlVswyd7SRKLK8F17n 3kddW7bjH5u2rzWHXq/QbYEqBOXwOs4Q9YwofVrpKEnA1QpqGcc8Iggh5hA1+a8VJoNu tkuI13Ujayo43Pj9G7VcHkRd2mVJlw52l45mAhvZYSAi/YN3CaScyva9L85cdd43GcBB PpUpGC/Mq382IXpl8T0APkvu3VglMiWwy7rMHhGqgQEMbgazXWB5PNrClouRGO+K1pGD Sy8HqoEs6A2aT7SvEPekrzezz+hLhSDJTPuruNv1jT6nzSHLMJPrJXX0ByBqYxkKojat gsIA== X-Gm-Message-State: AO0yUKWvNT7OOt5v6n7MvynJJW2gstm6FzB/8ybmCZMngt8CSp9sBhCR ltQ1ITQXRRcxBm7CaSBsECenZ+BvYUb+rdo7r/I= X-Google-Smtp-Source: AKy350aqvUQ0m0j0Gw0RwKG20EyVtVbjtEkaYY5nfpWuiuduM6walryf+kjAzIRF/fkNvJrB1RjCLA== X-Received: by 2002:a17:90b:2247:b0:237:b5d4:c0cc with SMTP id hk7-20020a17090b224700b00237b5d4c0ccmr6085698pjb.39.1679741686609; Sat, 25 Mar 2023 03:54:46 -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 18/25] target/riscv: Hoist second stage mode change to callers Date: Sat, 25 Mar 2023 03:54:22 -0700 Message-Id: <20230325105429.1142530-19-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::d2c; envelope-from=richard.henderson@linaro.org; helo=mail-io1-xd2c.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: 1679747394666100001 Content-Type: text/plain; charset="utf-8" Move the check from the top of get_physical_address to the two callers, where passing mmu_idx makes no sense. Signed-off-by: Richard Henderson Reviewed-by: Alistair Francis --- target/riscv/cpu_helper.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 0017ecbf37..833ea6d3fa 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -791,12 +791,6 @@ static int get_physical_address(CPURISCVState *env, hw= addr *physical, use_background =3D true; } =20 - if (first_stage =3D=3D false) { - /* We are in stage 2 translation, this is similar to stage 1. */ - /* Stage 2 is always taken as U-mode */ - mode =3D PRV_U; - } - if (mode =3D=3D PRV_M || !riscv_cpu_cfg(env)->mmu) { *physical =3D addr; *prot =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; @@ -902,7 +896,7 @@ restart: /* Do the second stage translation on the base PTE address. */ int vbase_ret =3D get_physical_address(env, &vbase, &vbase_pro= t, base, NULL, MMU_DATA_LOAD, - mmu_idx, false, true, + MMUIdx_U, false, true, is_debug); =20 if (vbase_ret !=3D TRANSLATE_SUCCESS) { @@ -1274,7 +1268,7 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, = int size, im_address =3D pa; =20 ret =3D get_physical_address(env, &pa, &prot2, im_address, NUL= L, - access_type, mmu_idx, false, true, + access_type, MMUIdx_U, false, true, false); =20 qemu_log_mask(CPU_LOG_MMU, --=20 2.34.1