Merge branch 'riscv-wx-mappings' into for-next

This contains both the short-term fix for the W+X boot mappings and the
larger cleanup.

* riscv-wx-mappings:
  riscv: Map the kernel with correct permissions the first time
  riscv: Introduce set_kernel_memory helper
  riscv: Simplify xip and !xip kernel address conversion macros
  riscv: Remove CONFIG_PHYS_RAM_BASE_FIXED
  riscv: mm: Fix W+X mappings at boot

diff --cc arch/riscv/Kconfig
Simple merge

diff --cc arch/riscv/include/asm/page.h
Simple merge

diff --cc arch/riscv/include/asm/pgtable.h
Simple merge

diff --cc arch/riscv/kernel/setup.c
index 5c6d2a1fdbc745da0f75a572c2d6b65c148f15dc,02d811127f485c48cbabe1f14da5ecad8bd6c147..b0c6f372a9ec2eef945450dd439bd7fdf6ce8f0b
--- 1/arch/riscv/kernel/setup.c
--- 2/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
@@@ -289,11 -291,10 +289,6 @@@ void __init setup_arch(char **cmdline_p
        init_resources();
        sbi_init();
  
-       if (IS_ENABLED(CONFIG_STRICT_KERNEL_RWX)) {
-               protect_kernel_text_data();
-               protect_kernel_linear_mapping_text_rodata();
-       }
 -#ifdef CONFIG_SWIOTLB
 -      swiotlb_init(1);
 -#endif
--
  #ifdef CONFIG_KASAN
        kasan_init();
  #endif

diff --cc arch/riscv/mm/init.c
Simple merge