Unverified Commit db1503d3 authored by Alexandre Ghiti's avatar Alexandre Ghiti Committed by Palmer Dabbelt
Browse files

riscv: Get rid of MAXPHYSMEM configs 



CONFIG_MAXPHYSMEM_* are actually never used, even the nommu defconfigs
selecting the MAXPHYSMEM_2GB had no effects on PAGE_OFFSET since it was
preempted by !MMU case right before.

In addition, the move of the kernel mapping at the end of the address
space broke the use of MAXPHYSMEM_2G with MMU since it defines PAGE_OFFSET
at the same address as the kernel mapping.

Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Fixes: 2bfc6cd8 ("riscv: Move kernel mapping outside of linear mapping")
Signed-off-by: default avatarAlexandre Ghiti <alexandre.ghiti@canonical.com>
Tested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Tested-by: default avatarConor Dooley <Conor.Dooley@microchip.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent fa55b7dc

arch/riscv/Kconfig

+2 −21
Original line number Diff line number Diff line
@@ -158,10 +158,9 @@ config PA_BITS 


config PAGE_OFFSET

	hex

	default 0xC0000000 if 32BIT && MAXPHYSMEM_1GB

	default 0xC0000000 if 32BIT

	default 0x80000000 if 64BIT && !MMU

	default 0xffffffff80000000 if 64BIT && MAXPHYSMEM_2GB

	default 0xffffffe000000000 if 64BIT && MAXPHYSMEM_128GB

	default 0xffffffe000000000 if 64BIT



config KASAN_SHADOW_OFFSET

	hex
@@ -270,24 +269,6 @@ config MODULE_SECTIONS 
	bool

	select HAVE_MOD_ARCH_SPECIFIC



choice

	prompt "Maximum Physical Memory"

	default MAXPHYSMEM_1GB if 32BIT

	default MAXPHYSMEM_2GB if 64BIT && CMODEL_MEDLOW

	default MAXPHYSMEM_128GB if 64BIT && CMODEL_MEDANY



	config MAXPHYSMEM_1GB

		depends on 32BIT

		bool "1GiB"

	config MAXPHYSMEM_2GB

		depends on 64BIT && CMODEL_MEDLOW

		bool "2GiB"

	config MAXPHYSMEM_128GB

		depends on 64BIT && CMODEL_MEDANY

		bool "128GiB"

endchoice





config SMP

	bool "Symmetric Multi-Processing"

	help

arch/riscv/configs/nommu_k210_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ CONFIG_EMBEDDED=y 
CONFIG_SLOB=y

# CONFIG_MMU is not set

CONFIG_SOC_CANAAN=y

CONFIG_SOC_CANAAN_K210_DTB_SOURCE="k210_generic"

CONFIG_MAXPHYSMEM_2GB=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_CMDLINE="earlycon console=ttySIF0"

arch/riscv/configs/nommu_k210_sdcard_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ CONFIG_EMBEDDED=y 
CONFIG_SLOB=y

# CONFIG_MMU is not set

CONFIG_SOC_CANAAN=y

CONFIG_SOC_CANAAN_K210_DTB_SOURCE="k210_generic"

CONFIG_MAXPHYSMEM_2GB=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_CMDLINE="earlycon console=ttySIF0 rootdelay=2 root=/dev/mmcblk0p1 ro"

arch/riscv/configs/nommu_virt_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ CONFIG_SLOB=y 
# CONFIG_SLAB_MERGE_DEFAULT is not set

# CONFIG_MMU is not set

CONFIG_SOC_VIRT=y

CONFIG_MAXPHYSMEM_2GB=y

CONFIG_SMP=y

CONFIG_CMDLINE="root=/dev/vda rw earlycon=uart8250,mmio,0x10000000,115200n8 console=ttyS0"

CONFIG_CMDLINE_FORCE=y