From nobody Tue Feb 10 10:20:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; 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=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1588192723; cv=none; d=zohomail.com; s=zohoarc; b=ZC6AeAB36Pi76ab1Vcg4cWXDPAQ+864HjPn0VWFGQBsoWKsLgcCbWXaCJZjPlDJ1Mc7KMmiy+BySU6p/LV5aSInBSF3PJBCHBXXHdfqYk0zi1y5GX35OrOI/uGgP/Bsi552sHfCaczX1jqMCMyFgPXrOh+XGVOw9Wx6UWV44xgo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588192723; 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=iopKmEUlffccM1o3d8HmFte4DqI1Dz3E5c8xHQteNuU=; b=gkzGfyDWQiLT6sENFt9JaMOixetApelzvpQoNiHX3r7YV6xCua+9Zo++AtRGwreoaReXrvnMNucMfAKTD8Uh7qJmeXAIBo1Uw3GgSgIYa4YtriV5i5VY1a00cisFjKtyhJnApsMwah+gW56wZ7dMBgV+I7MDV6255POV/849CTY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.com; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588192723334835.4770621604092; Wed, 29 Apr 2020 13:38:43 -0700 (PDT) Received: from localhost ([::1]:39818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTtTe-0002qd-2w for importer@patchew.org; Wed, 29 Apr 2020 16:38:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53826) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTtOk-0007va-RY for qemu-devel@nongnu.org; Wed, 29 Apr 2020 16:37:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTtO4-0006FV-UM for qemu-devel@nongnu.org; Wed, 29 Apr 2020 16:33:38 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:7550) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jTtJz-000664-80; Wed, 29 Apr 2020 16:28:43 -0400 Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 30 Apr 2020 04:28:38 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2020 13:18:43 -0700 Received: from usa004631.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.56.145]) by uls-op-cesaip01.wdc.com with ESMTP; 29 Apr 2020 13:28:38 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1588192123; x=1619728123; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XLpDvnqj9bkxM9N2CIUAMQTvObl1PtMILsBu24h494E=; b=UZY1vkgsrmNKW8FDMLsvO70uh5AHeb/iUaQNVHqWznvG9X6hreiuVXZS rrkbuvNguOkjo3ZqjEAKDLJ3f3hKUORLQCCbmpzMb4b9kE+SwYNegSHY0 hlrSmhObiMS8VbzSzi+p9WXWoZXjHpkDgRjmUZoBh1FSsqkKjRaNO1TVu DuhYQAzECod4Br97CHsa1xOjAzbqhbsH0rfzPOM6/QVFmkHetxtFVNMqX itIMH3MEqmVbfo+YeH/kTlCe8W12SNTx6NRv0QyZS5YBTvg0GX9tCKAkD MqWe34l+jrYGqPRXSfRQRRrs+dIeH9q5YqjkNTaxv3R2gIRPvTrUL0sMi A==; IronPort-SDR: UdjDx9iFsruECsy2wfDI2KcGNgrWoV4jmhxcMu9gD/dWpWVcP1XmCY/n3rs0rWeL+PYpunfCqP Qci7aw8QKqZVbgbkrtB2FdQgj2ZryfQ+JyS90gE+YSZ+2Yw+Soo5+kq9ny0/RW6/Zl/hlU6WjS T40E/zgZmKBMY6TySZ5sSWiPEcY5cXiB5n1N9vm4QHgISlGBmv+RBhhoTlVOMCu4miFMJ1Q5Nj mqg6mUpJrUiKRh+6+QGNvvdM2amFk1xGUMJnaO5TWmieTd4FFFg3JBuVaLfT84ysvp5gK8MHsB Eac= X-IronPort-AV: E=Sophos;i="5.73,333,1583164800"; d="scan'208";a="136507034" IronPort-SDR: IPGAcAFd5veTwIa6ZWEq4RF8qkyH3KTnX2pFBr1NELEKh+N3tPz5vA80DgjQMFL80Ypp7XwqVw bcHxlpkWu/tkUDXCBWES+0exa61Snmtk8= IronPort-SDR: VKp1u+Iwkj1aknyShC2BYwcTnom+wbBoaTOAFmRiabV9V+OUXCNRnmW5fJw7E5v3FUom6VhUf6 76nNQD4UKMPw== WDCIronportException: Internal From: Alistair Francis To: peter.maydell@linaro.org Subject: [PULL v2 04/14] riscv: Don't use stage-2 PTE lookup protection flags Date: Wed, 29 Apr 2020 13:19:56 -0700 Message-Id: <20200429202006.775322-5-alistair.francis@wdc.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200429202006.775322-1-alistair.francis@wdc.com> References: <20200429202006.775322-1-alistair.francis@wdc.com> 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=216.71.154.42; envelope-from=prvs=381fbd49e=alistair.francis@wdc.com; helo=esa4.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 16:28:37 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Received-From: 216.71.154.42 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-riscv@nongnu.org, Anup Patel , palmerdabbelt@google.com, Richard Henderson , qemu-devel@nongnu.org, Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" When doing the fist of a two stage lookup (Hypervisor extensions) don't set the current protection flags from the second stage lookup of the base address PTE. Signed-off-by: Alistair Francis Reviewed-by: Richard Henderson Tested-by: Anup Patel Message-id: 931db85d6890ed4bc2b527fd1011197cd28299aa.1585262586.git.alistai= r.francis@wdc.com Message-Id: <931db85d6890ed4bc2b527fd1011197cd28299aa.1585262586.git.alista= ir.francis@wdc.com> --- target/riscv/cpu_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index d3ba9efb02..f36d184b7b 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -452,10 +452,11 @@ restart: hwaddr pte_addr; =20 if (two_stage && first_stage) { + int vbase_prot; hwaddr vbase; =20 /* Do the second stage translation on the base PTE address. */ - get_physical_address(env, &vbase, prot, base, access_type, + get_physical_address(env, &vbase, &vbase_prot, base, access_ty= pe, mmu_idx, false, true); =20 pte_addr =3D vbase + idx * ptesize; --=20 2.26.2