From nobody Mon Feb 9 16:21:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.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=1566605191; cv=none; d=zoho.com; s=zohoarc; b=mAnJq+IlG+9+lb46rgMdah2nwHlpAN3TcZhHBAAETWymh074yP7pxT6EoA4xg6zOuTkM8t3V+QySX8hxEXX+bS15Ls6yeD/ZY6EWc0GtIWd5bDlJrt9kI2ARnSgFULu8HO7CdBAuftR8BEqRovCecyZHOCWjGdB1IcwGyWy4wkE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566605191; 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:ARC-Authentication-Results; bh=xxa8grjEpUAqXEcCULtmtOU6ISAEUm/WljFujxnA4FI=; b=BzTyPP9Kndm3BcdAUErK3I02rUpPVhpK/Qi1DigJYCQSBfYGNn2kTPyMlsc/SU1Q2QntyPBg2h5wFWLfR85VksB5NlXABQ+TIJhXq9lelXVgCxTFfhMmvUABHM7dirL3/JFSwedX9St8bIXtTEyxBh6w1ToNEYRwRrNYo2YGDqY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.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 1566605191381604.7826432679366; Fri, 23 Aug 2019 17:06:31 -0700 (PDT) Received: from localhost ([::1]:35292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i1JZe-0007gz-2J for importer@patchew.org; Fri, 23 Aug 2019 20:06:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49887) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i1JCS-0001F3-C8 for qemu-devel@nongnu.org; Fri, 23 Aug 2019 19:42:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i1JCR-0000LD-AQ for qemu-devel@nongnu.org; Fri, 23 Aug 2019 19:42:32 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:38476) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i1JCR-0000Il-0C; Fri, 23 Aug 2019 19:42:31 -0400 Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 24 Aug 2019 07:42:31 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Aug 2019 16:39:48 -0700 Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.157.58]) by uls-op-cesaip01.wdc.com with ESMTP; 23 Aug 2019 16:42:31 -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=1566603752; x=1598139752; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WPGQbBTRtC+Hpo1q+Eow5D21d9Sh3h6nJuJ7fj9l0zw=; b=EYGb2ZWQsoFfdpO4ecsXU2aOQo6V4Tqkt/CqZxZdOkeFVp/x8icPKwdm 57PHin1F+qdWDIHiHEnz5ZKR45B7PtTff71mkQNmYXaaUK5/YL+emUW9Z Bo1kRB0e6JoEvyIR3VH7oOG33NL3ZOWKajVwhizSM2yZT+fZ4jm8h0EN+ ppgz6jS+fKLFU7gB7wgRG498wx+ZLBmrJuFle5REpjtas6lS8bPJa4X+K qc/xlfXv20Tk47ymGnajetbW6YbeiggYGPUTxHb4eorNZ19pnmlM0nfDF b00zpsAqKu+ryHf4b1mvLuwSyn3tqrkH1a9cKYh13Wgygp6GPAXheOkA2 g==; IronPort-SDR: bKL2jHx7c5VxQv8wABeTxFsme5MyAS6K2vR13pFXYpM3BKq2nZoOl5i/JUiWzR7HKBj3hpeY+g XYHufOcW1xjffZ3Zg7eGWO7GQi4yC1yeOSIBgPx74PgyIjKjH2ZX30IR5aV8zjm8UH1gviqjDN W6Ye+pdAZfrRLfJ63FqhOXd6PJvE2ezaMEACA2ptnnUAkQSsfxOd5YK/K9IYSnU9yP3FKzaIfM qeRD/ildAmp+nErvP6ABquGiHKqOEg2MS8++weTYnWk8cp/gV3jH1hUsVl4uVCDFFFa8h8KwH6 fPU= X-IronPort-AV: E=Sophos;i="5.64,422,1559491200"; d="scan'208";a="117486912" IronPort-SDR: n8iysQxMAhoZRpIrMQc84NmWCFQuEJUrRykHqlT5MeHkTYHhfP7leHZK4aKeSyHyXKGMoUDmhx U6dEOrVgiAF/f7PBaUMpMxTpl2B+5M+tNksjDe9NLgWWLMt5thsPNuKhV72GLKhXBNb5SUaRJJ 49NaagS56DK1IOEsw5ky+M3uKTPDFPbbPYCWFLWch6MvLwHmFqDBhmsLtp+vHwOlos19UOg3Gl Kz4m0G7eqNZEc2PeJrQ9j/e4Sh9nHLQTeepKXKKxwCAInoS/b3umhLNZxUz/eq/MmJN5FTm2Tg fX08HNF5JjtXqS66eJ+hzgbl IronPort-SDR: YEOvA2E4jKGth1Rk1dTwoj0VjY53bna5Yk2MtXRLXnGML5lbo6koZOMmn/8FTcprITRBWZnfqa x9B5noUDD3aBhckzYuvWTr3/ssAlJWRK1gDBy/OKp5IM7Ubrt1okuQjFFTqwKOu1EEBeeQ0yBD 9CdJ7Wpv+pZ5XaS8ZpGGCIz/60geGhy+xpArOePcNLQsptKG5oKXE7f1uEI8xfvTQBff1Bcik/ HJf8gOD6hASzEn9DlPjeEgNcIp/q88QbOJXIkjZg6yzjC+JBKbyj0Z6nmyG4sxsFqOIPvXF13U BtQ= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Date: Fri, 23 Aug 2019 16:38:50 -0700 Message-Id: X-Mailer: git-send-email 2.22.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 216.71.153.144 Subject: [Qemu-devel] [PATCH v1 23/28] target/riscv: Allow specifying number of MMU stages 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: alistair23@gmail.com, Anup.Patel@wdc.com, palmer@sifive.com, alistair.francis@wdc.com, Atish.Patra@wdc.com 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" Signed-off-by: Alistair Francis --- target/riscv/cpu_helper.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 9aa6906acd..8b9871f9ea 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -330,7 +330,7 @@ void riscv_cpu_set_mode(CPURISCVState *env, target_ulon= g newpriv) static int get_physical_address(CPURISCVState *env, hwaddr *physical, int *prot, target_ulong addr, int access_type, int mmu_idx, - bool first_stage) + bool first_stage, bool two_stage) { /* NOTE: the env->pc value visible here will not be * correct, but the value visible to the exception handler @@ -571,9 +571,10 @@ hwaddr riscv_cpu_get_phys_page_debug(CPUState *cs, vad= dr addr) int mmu_idx =3D cpu_mmu_index(&cpu->env, false); =20 if (get_physical_address(&cpu->env, &phys_addr, &prot, addr, 0, mmu_id= x, - true)) { + true, false)) { return -1; } + return phys_addr; } =20 @@ -634,7 +635,7 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, in= t size, __func__, address, access_type, mmu_idx); =20 ret =3D get_physical_address(env, &pa, &prot, address, access_type, mm= u_idx, - true); + true, false); =20 if (mode =3D=3D PRV_M && access_type !=3D MMU_INST_FETCH) { if (get_field(*env->mstatus, MSTATUS_MPRV)) { --=20 2.22.0