[RFC,05/12] riscv: Simplify MAXPHYSMEM config

Message ID	20210104195840.1593-6-alex@ghiti.fr
State	New
Headers	show Return-Path: <linux-efi-owner@kernel.org> sender: alex@ghiti.fr) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id CA64720002; Mon, 4 Jan 2021 20:04:08 +0000 (UTC) From: Alexandre Ghiti <alex@ghiti.fr> To: Paul Walmsley <paul.walmsley@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com>, Zong Li <zong.li@sifive.com>, Anup Patel <anup@brainfault.org>, Christoph Hellwig <hch@lst.de>, Ard Biesheuvel <ardb@kernel.org>, Arnd Bergmann <arnd@arndb.de>, linux-efi@vger.kernel.org, linux-arch@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Alexandre Ghiti <alex@ghiti.fr> Subject: [RFC PATCH 05/12] riscv: Simplify MAXPHYSMEM config Date: Mon, 4 Jan 2021 14:58:33 -0500 Message-Id: <20210104195840.1593-6-alex@ghiti.fr> In-Reply-To: <20210104195840.1593-1-alex@ghiti.fr> References: <20210104195840.1593-1-alex@ghiti.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Introduce sv48 support without relocable kernel \| expand [RFC,00/12] Introduce sv48 support without relocable kernel [RFC,01/12] riscv: Move kernel mapping outside of linear mapping [RFC,02/12] riscv: Protect the kernel linear mapping [RFC,03/12] riscv: Get rid of compile time logic with MAX_EARLY_MAPPING_SIZE [RFC,04/12] riscv: Allow to dynamically define VA_BITS [RFC,05/12] riscv: Simplify MAXPHYSMEM config [RFC,06/12] riscv: Prepare ptdump for vm layout dynamic addresses [RFC,07/12] asm-generic: Prepare for riscv use of pud_alloc_one and pud_free [RFC,08/12] riscv: Implement sv48 support [RFC,09/12] riscv: Allow user to downgrade to sv39 when hw supports sv48 [RFC,10/12] riscv: Use pgtable_l4_enabled to output mmu type in cpuinfo [RFC,11/12] riscv: Explicit comment about user virtual address space size [RFC,12/12] riscv: Improve virtual kernel memory layout dump

Message ID

20210104195840.1593-6-alex@ghiti.fr

State

New

Headers

From: Alexandre Ghiti <alex@ghiti.fr>
To: Paul Walmsley <paul.walmsley@sifive.com>,
	Palmer Dabbelt <palmer@dabbelt.com>,
	Zong Li <zong.li@sifive.com>, Anup Patel <anup@brainfault.org>,
	Christoph Hellwig <hch@lst.de>, Ard Biesheuvel <ardb@kernel.org>,
	Arnd Bergmann <arnd@arndb.de>, linux-efi@vger.kernel.org,
	linux-arch@vger.kernel.org, linux-riscv@lists.infradead.org,
	linux-kernel@vger.kernel.org
Cc: Alexandre Ghiti <alex@ghiti.fr>
Subject: [RFC PATCH 05/12] riscv: Simplify MAXPHYSMEM config
Date: Mon,  4 Jan 2021 14:58:33 -0500
Message-Id: <20210104195840.1593-6-alex@ghiti.fr>
In-Reply-To: <20210104195840.1593-1-alex@ghiti.fr>
References: <20210104195840.1593-1-alex@ghiti.fr>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Introduce sv48 support without relocable kernel | expand

Commit Message

Alexandre Ghiti Jan. 4, 2021, 7:58 p.m. UTC

Either the user specifies maximum physical memory size of 2GB or the
user lives with the system constraint which is 1/4th of maximum
addressable memory in Sv39 MMU mode (i.e. 128GB) for now.

Signed-off-by: Alexandre Ghiti <alex@ghiti.fr>
Reviewed-by: Anup Patel <anup@brainfault.org>
---
 arch/riscv/Kconfig | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 2979a44103be..852ab2f7a50d 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -127,7 +127,7 @@  config PAGE_OFFSET
 	default 0xC0000000 if 32BIT && MAXPHYSMEM_2GB
 	default 0x80000000 if 64BIT && !MMU
 	default 0xffffffff80000000 if 64BIT && MAXPHYSMEM_2GB
-	default 0xffffffe000000000 if 64BIT && MAXPHYSMEM_128GB
+	default 0xffffffe000000000 if 64BIT && !MAXPHYSMEM_2GB
 
 config ARCH_FLATMEM_ENABLE
 	def_bool y
@@ -235,19 +235,11 @@  config MODULE_SECTIONS
 	bool
 	select HAVE_MOD_ARCH_SPECIFIC
 
-choice
-	prompt "Maximum Physical Memory"
-	default MAXPHYSMEM_2GB if 32BIT
-	default MAXPHYSMEM_2GB if 64BIT && CMODEL_MEDLOW
-	default MAXPHYSMEM_128GB if 64BIT && CMODEL_MEDANY
-
-	config MAXPHYSMEM_2GB
-		bool "2GiB"
-	config MAXPHYSMEM_128GB
-		depends on 64BIT && CMODEL_MEDANY
-		bool "128GiB"
-endchoice
-
+config MAXPHYSMEM_2GB
+	bool "Maximum Physical Memory 2GiB"
+	default y if 32BIT
+	default y if 64BIT && CMODEL_MEDLOW
+	default n
 
 config SMP
 	bool "Symmetric Multi-Processing"

[RFC,05/12] riscv: Simplify MAXPHYSMEM config

Commit Message

Patch