From: Palmer Dabbelt <palmerdabbelt@google.com>
Date: Thu, 1 Jul 2021 04:50:32 +0000 (-0700)
Subject: Merge branch 'riscv-wx-mappings' into for-next
X-Git-Tag: v5.15~756^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=01112e5e20f5298a81639806cd0a3c587aade467;p=platform%2Fkernel%2Flinux-starfive.git

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
---

01112e5e20f5298a81639806cd0a3c587aade467
diff --cc arch/riscv/kernel/setup.c
index 5c6d2a1fdbc7,02d811127f48..b0c6f372a9ec
--- a/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