From nobody Fri Dec 19 07:03:23 2025 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=1590598967; cv=none; d=zohomail.com; s=zohoarc; b=kCG3phb7YiCLJ/g8VSDqPb4JythCrSMV15beL8Rb6YUhJI3XVU7FuscwBR//twsP/SXdlHgPsUhMA+OCeI7uqGuPPt3c9wqZPMAqW+FacMuBnJnGPCu3NGtlB/+GPDt/7CiW+TX0QBopCUJQINnNRseGMFQ5/qezYWLIf52Yw8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590598967; 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=62sut+gu2wow94ErZt47OAfVFjgHLjuBgpYOd7WV5yU=; b=WCIxFmGgQNwppBn3tC9yGzfB8IUMPjn+/B+W+CBlWtbqphdE/ZaXRsTeWj8qQVRLDz/g+luyxe450rscBIE256pSiKvimXjHXfl1LHWNTSuyDKST4ECCNSKs7tZ8LwokQc1k58GDtyvSxVNg0bdVcfXVQ33JGs3FkdsKkeIzotY= 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 1590598967538645.2766748666078; Wed, 27 May 2020 10:02:47 -0700 (PDT) Received: from localhost ([::1]:51384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdzS2-00075c-7E for importer@patchew.org; Wed, 27 May 2020 13:02:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdzOM-0001S8-A1; Wed, 27 May 2020 12:58:58 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:63648) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdzOL-0002D9-6M; Wed, 27 May 2020 12:58:57 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 28 May 2020 00:58:55 +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; 27 May 2020 09:48:11 -0700 Received: from 71vjjc2.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.57.96]) by uls-op-cesaip01.wdc.com with ESMTP; 27 May 2020 09:58:55 -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=1590598737; x=1622134737; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=95oYIs1BVKa8lJpKUNyTJ6K2xLTQpJSfhvRfZcrvMYo=; b=delIy1EtSOlZ6gUnMsvovEPhxZaMLXAyA7kSGmr6xdzhV5VM5no0CmIt SnPs/X9SCptYdvSX1txBEPag18xZBQys3kLkrwqo5AdE7ONEQsoQYasWE 5exuYx6UreIzvWun3T98lKTO5GZ0wtgPC6jasxB7CM154lpDgGq0DLW/W dxKyvEkcQ10F9njBr0nPLQBy9ovAmtwPLdH+JrMuaAVlxATVw6aa1zVfR JNVlGR2IIyDy2BgPmRdFOF3+RfGGsD483xJj+TUGihgNLa1kaKFbN4KAf wAyD+oKEArId4otT5DqUywXBQGg97CEnSqu81Z0gq1C2pUqTX47rg7UgX g==; IronPort-SDR: GK9DAE69ax+S39YK89UvGl1iUsYAUNFcJn9im9b3Dh0z8flsl9xPil7uZj6cHXUAlUwrex21nQ sx6+OVLz8oTIkq7EEdiHHc5dwIyY2lNa+6LfYDoQmQ2xYgKwqH3P/4RTHUPCPTKqrhb9C+Wewj cYca33ExEfsAhygFERGEKLHGu7kL9906v8ODucWdO0XS3fdPVl0qzajYjVvIIonYCgnH2z4tO6 rmjmTyF3MIh8yisUxyWD6dGq/EghEmT3ir1nswAYMErHpbiPY3S9AY/ZGBASyGo+AKD1Prtt66 9e0= X-IronPort-AV: E=Sophos;i="5.73,442,1583164800"; d="scan'208";a="140062122" IronPort-SDR: 6k6vJv38jsQRvF0QhZhqzwYpXuAKzXEfDjmpXTWXtAN+J+4mpfUFtMUptZnc8A6+s28mi7k4jp AEa4VmTwDFwL31iCL22uNRddu6aw/2mGA= IronPort-SDR: bs+Nexc6C/cgczZaRzb/7xwjmqT/WsSywsfN1WBEJOTnZjyg/Uwja3h3Oy+PTQuNj2fk6N9lXd PYpN3+q6E67A== WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v4 03/10] target/riscv: Disable the MMU correctly Date: Wed, 27 May 2020 09:50:20 -0700 Message-Id: <756439d4816fb3bd7ef84b458bdb6ab3442cdeac.1590598125.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: 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.45; envelope-from=prvs=40961fbaf=alistair.francis@wdc.com; helo=esa6.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/27 12:58:55 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: alistair.francis@wdc.com, bmeng.cn@gmail.com, palmer@dabbelt.com, alistair23@gmail.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" Previously if we didn't enable the MMU it would be enabled in the realize() function anyway. Let's ensure that if we don't want the MMU we disable it. We also don't need to enable the MMU as it will be enalbed in realize() by default. Signed-off-by: Alistair Francis --- target/riscv/cpu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 5eb3c02735..8deba3d16d 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -142,7 +142,6 @@ static void rv32gcsu_priv1_09_1_cpu_init(Object *obj) set_misa(env, RV32 | RVI | RVM | RVA | RVF | RVD | RVC | RVS | RVU); set_priv_version(env, PRIV_VERSION_1_09_1); set_resetvec(env, DEFAULT_RSTVEC); - set_feature(env, RISCV_FEATURE_MMU); set_feature(env, RISCV_FEATURE_PMP); } =20 @@ -152,7 +151,6 @@ static void rv32gcsu_priv1_10_0_cpu_init(Object *obj) set_misa(env, RV32 | RVI | RVM | RVA | RVF | RVD | RVC | RVS | RVU); set_priv_version(env, PRIV_VERSION_1_10_0); set_resetvec(env, DEFAULT_RSTVEC); - set_feature(env, RISCV_FEATURE_MMU); set_feature(env, RISCV_FEATURE_PMP); } =20 @@ -163,6 +161,7 @@ static void rv32imacu_nommu_cpu_init(Object *obj) set_priv_version(env, PRIV_VERSION_1_10_0); set_resetvec(env, DEFAULT_RSTVEC); set_feature(env, RISCV_FEATURE_PMP); + qdev_prop_set_bit(DEVICE(obj), "mmu", false); } =20 static void rv32imafcu_nommu_cpu_init(Object *obj) @@ -172,6 +171,7 @@ static void rv32imafcu_nommu_cpu_init(Object *obj) set_priv_version(env, PRIV_VERSION_1_10_0); set_resetvec(env, DEFAULT_RSTVEC); set_feature(env, RISCV_FEATURE_PMP); + qdev_prop_set_bit(DEVICE(obj), "mmu", false); } =20 #elif defined(TARGET_RISCV64) @@ -190,7 +190,6 @@ static void rv64gcsu_priv1_09_1_cpu_init(Object *obj) set_misa(env, RV64 | RVI | RVM | RVA | RVF | RVD | RVC | RVS | RVU); set_priv_version(env, PRIV_VERSION_1_09_1); set_resetvec(env, DEFAULT_RSTVEC); - set_feature(env, RISCV_FEATURE_MMU); set_feature(env, RISCV_FEATURE_PMP); } =20 @@ -200,7 +199,6 @@ static void rv64gcsu_priv1_10_0_cpu_init(Object *obj) set_misa(env, RV64 | RVI | RVM | RVA | RVF | RVD | RVC | RVS | RVU); set_priv_version(env, PRIV_VERSION_1_10_0); set_resetvec(env, DEFAULT_RSTVEC); - set_feature(env, RISCV_FEATURE_MMU); set_feature(env, RISCV_FEATURE_PMP); } =20 @@ -211,6 +209,7 @@ static void rv64imacu_nommu_cpu_init(Object *obj) set_priv_version(env, PRIV_VERSION_1_10_0); set_resetvec(env, DEFAULT_RSTVEC); set_feature(env, RISCV_FEATURE_PMP); + qdev_prop_set_bit(DEVICE(obj), "mmu", false); } =20 #endif --=20 2.26.2