From nobody Tue Feb 10 20:50:17 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=1588185999; cv=none; d=zohomail.com; s=zohoarc; b=NyPy4LONEBndbb4GYUxIJjYK28D94sPRXnoyOXQkF+qkM+azqMj1eAF6Qb3LhUiMB/z2Wy+OI5Cm5W+KdslPoia8AQktRxFJvKxfOThPVkBRtrUUqLYidIbXaW6gc9hY9zfpnHnOn7XkK9IF4D2xzf4KBo67BQui0/LXa+HsQGg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588185999; 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=jn+ZoYnTuKI6ziuAi7exMM4iE4LPWkR2jvCAPR/TrEw=; b=ew0213Pkk9ZmDbj9Q/xo20qjZAcFHQR/tdgFw+JNxsgJaJwey/BFDwljBR73Lm3DmPKjuTfbxlxBeS4iDtJJIojiK9Wdm5oPN4cwWDh7AAaF1HRUxHMUp6NWhPvE7LTrS4ckkCopT87ldBdHgr1iSsP88JVY56nmFZ3hc/kKxsk= 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 1588185999151331.4449230320637; Wed, 29 Apr 2020 11:46:39 -0700 (PDT) Received: from localhost ([::1]:55188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTrjB-0005ah-TA for importer@patchew.org; Wed, 29 Apr 2020 14:46:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37450) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTraE-0008RB-JK for qemu-devel@nongnu.org; Wed, 29 Apr 2020 14:37:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTraB-0003V4-CW for qemu-devel@nongnu.org; Wed, 29 Apr 2020 14:37:22 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:2041) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jTra5-0003PZ-AX; Wed, 29 Apr 2020 14:37:13 -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; 30 Apr 2020 02:37:06 +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 11:27:10 -0700 Received: from cnf007834.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.55.253]) by uls-op-cesaip01.wdc.com with ESMTP; 29 Apr 2020 11:37:04 -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=1588185434; x=1619721434; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=O7jL6iWlSIEmOeLlTVLecE6kMsdHolcxkpW6c3HjIWE=; b=APeewc8SLinXzReE31C3ZVzUmdbDlZ/WSVbV/Ub/ctjt515duKD5o+PB L7AW0iZuiw3vWcE2UIBoNUIIHJ+gD81HMG7lVzl6WJYP1MVVEeUjb4drD i5JihxrG6OA2NeNzPhYp7cOId4b6O/b4fwdbRdi/h6z5C93gzpb1dxO7N Mb9r7lAX33iC62SuKLTIP/6crOlLX6vIM0iivsSNUc1W2IJGlcJov250W KSX6Wry5Eo2MEzK3HPGOLvq5wY5fMnKSIGfR/mbMi2CIn8N3rrm73uhPT Fa/5ogfnXgvtW4oAgq3RW81IY4cVSltyrhC4Exgkw1AqnXPpbZ2CDYPxN Q==; IronPort-SDR: LOCm9Not8pjUFJhyBPd+z89woasG4fV87YetsjEVZ98CSClOLamz8nbnBQSLicC7/fktn0Td1e TTSOMUcRZnyxBlRP4sZP+ttZ1Ly+g+MfqgWu8Sm3vxnM4yNfoPkgxNef2K5UrYxNLbXc5kFWTE D/oL6Oo35M7KP2GbBtKndGMtSaAypB2lZeVY3HfnR17/SAByRJyc+Xi7+XJWwFWSay9/GiiTVK 0/OdvV03tqFgXL/OAmtRyiPdD6S4r3TU+JLwbGaOIbP6t5cF8/923bFK1EHJvIhJV4KW+2YLDJ lfY= X-IronPort-AV: E=Sophos;i="5.73,332,1583164800"; d="scan'208";a="137935144" IronPort-SDR: 79Gem3mkFByogtgz/CvaPvjnpmN3c6MBM7Yi61e5YUcQ6N+Hb3JVGRxunVa7ZNAdYAAop5Iyi9 1wfE3aRsWh4QzISv4kw3MxCbn9eCLndZs= IronPort-SDR: v8gHI1QJExYs2uLQ0iBbeX557HXKLtOlZnxdDaJjhApS1nqkNXXPQfFwZB+NcqbFvcj4o+Odg7 S0XcFGsyZKqQ== WDCIronportException: Internal From: Alistair Francis To: peter.maydell@linaro.org Subject: [PULL 07/14] hw/riscv: Generate correct "mmu-type" for 32-bit machines Date: Wed, 29 Apr 2020 11:28:49 -0700 Message-Id: <20200429182856.2588202-8-alistair.francis@wdc.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200429182856.2588202-1-alistair.francis@wdc.com> References: <20200429182856.2588202-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.45; envelope-from=prvs=381fbd49e=alistair.francis@wdc.com; helo=esa6.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 14:37:03 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Received-From: 216.71.154.45 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 , palmerdabbelt@google.com, qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Bin Meng 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" From: Bin Meng 32-bit machine should have its CPU's "mmu-type" set to "riscv,sv32". Signed-off-by: Bin Meng Reviewed-by: Alistair Francis Message-id: 1583585319-26603-1-git-send-email-bmeng.cn@gmail.com Message-Id: <1583585319-26603-1-git-send-email-bmeng.cn@gmail.com> Signed-off-by: Alistair Francis --- hw/riscv/sifive_u.c | 4 ++++ hw/riscv/spike.c | 4 ++++ hw/riscv/virt.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index eb0abcae89..0dd0efaa68 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -160,7 +160,11 @@ static void create_fdt(SiFiveUState *s, const struct M= emmapEntry *memmap, qemu_fdt_add_subnode(fdt, nodename); /* cpu 0 is the management hart that does not have mmu */ if (cpu !=3D 0) { +#if defined(TARGET_RISCV32) + qemu_fdt_setprop_string(fdt, nodename, "mmu-type", "riscv,sv32= "); +#else qemu_fdt_setprop_string(fdt, nodename, "mmu-type", "riscv,sv48= "); +#endif isa =3D riscv_isa_string(&s->soc.u_cpus.harts[cpu - 1]); } else { isa =3D riscv_isa_string(&s->soc.e_cpus.harts[0]); diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 5053fe4590..98697a244e 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -102,7 +102,11 @@ static void create_fdt(SpikeState *s, const struct Mem= mapEntry *memmap, char *intc =3D g_strdup_printf("/cpus/cpu@%d/interrupt-controller"= , cpu); char *isa =3D riscv_isa_string(&s->soc.harts[cpu]); qemu_fdt_add_subnode(fdt, nodename); +#if defined(TARGET_RISCV32) + qemu_fdt_setprop_string(fdt, nodename, "mmu-type", "riscv,sv32"); +#else qemu_fdt_setprop_string(fdt, nodename, "mmu-type", "riscv,sv48"); +#endif qemu_fdt_setprop_string(fdt, nodename, "riscv,isa", isa); qemu_fdt_setprop_string(fdt, nodename, "compatible", "riscv"); qemu_fdt_setprop_string(fdt, nodename, "status", "okay"); diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 85ec9e22aa..c621a970aa 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -229,7 +229,11 @@ static void create_fdt(RISCVVirtState *s, const struct= MemmapEntry *memmap, char *intc =3D g_strdup_printf("/cpus/cpu@%d/interrupt-controller"= , cpu); char *isa =3D riscv_isa_string(&s->soc.harts[cpu]); qemu_fdt_add_subnode(fdt, nodename); +#if defined(TARGET_RISCV32) + qemu_fdt_setprop_string(fdt, nodename, "mmu-type", "riscv,sv32"); +#else qemu_fdt_setprop_string(fdt, nodename, "mmu-type", "riscv,sv48"); +#endif qemu_fdt_setprop_string(fdt, nodename, "riscv,isa", isa); qemu_fdt_setprop_string(fdt, nodename, "compatible", "riscv"); qemu_fdt_setprop_string(fdt, nodename, "status", "okay"); --=20 2.26.2