lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 021/846] riscv: Get rid of MAXPHYSMEM configs
    Date
    From: Alexandre Ghiti <alexandre.ghiti@canonical.com>

    commit db1503d355a79d1d4255a9996f20e72848b74a56 upstream.

    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: Geert Uytterhoeven <geert@linux-m68k.org>
    Fixes: 2bfc6cd81bd1 ("riscv: Move kernel mapping outside of linear mapping")
    Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
    Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Tested-by: Conor Dooley <Conor.Dooley@microchip.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/riscv/Kconfig | 23 ++---------------------
    arch/riscv/configs/nommu_k210_defconfig | 2 --
    arch/riscv/configs/nommu_k210_sdcard_defconfig | 2 --
    arch/riscv/configs/nommu_virt_defconfig | 1 -
    4 files changed, 2 insertions(+), 26 deletions(-)

    --- a/arch/riscv/Kconfig
    +++ b/arch/riscv/Kconfig
    @@ -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
    --- a/arch/riscv/configs/nommu_k210_defconfig
    +++ b/arch/riscv/configs/nommu_k210_defconfig
    @@ -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"
    --- a/arch/riscv/configs/nommu_k210_sdcard_defconfig
    +++ b/arch/riscv/configs/nommu_k210_sdcard_defconfig
    @@ -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"
    --- a/arch/riscv/configs/nommu_virt_defconfig
    +++ b/arch/riscv/configs/nommu_virt_defconfig
    @@ -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

    \
     
     \ /
      Last update: 2022-01-24 23:43    [W:2.347 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site