boards: qemu_arc: fix of MPU regions setup for !XIP config

Add some changes to ARC linker script. They make correct alignment
for ROMable region. Now regions borders are aligned with respect
to MPU settings.

Signed-off-by: Nikolay Agishev <[email protected]>

Author: Nikolay Agishev

boards/arc/qemu_arc/arc_mpu_regions.c

@@ -23,12 +23,35 @@ static struct arc_mpu_region mpu_regions[] = {
 #endif /* CONFIG_COVERAGE_GCOV && CONFIG_USERSPACE */
 
 #if DT_REG_SIZE(DT_CHOSEN(zephyr_sram)) > 0
+
+/*
+ * In case if Zephyr is configured with CONFIG_XIP=n it linked into
+ * SRAM. So RAM region should have EXECUTE permission.
+ */
+#ifdef CONFIG_XIP
 	/* Region RAM */
 	MPU_REGION_ENTRY("RAM",
 			 DT_REG_ADDR(DT_CHOSEN(zephyr_sram)),
 			 DT_REG_SIZE(DT_CHOSEN(zephyr_sram)),
 			 REGION_KERNEL_RAM_ATTR | REGION_DYNAMIC),
+#else
+	/* Region RAM */
+	MPU_REGION_ENTRY("RAM_RX",
+			 (uintptr_t)__rom_region_start,
+			 (uintptr_t)__rom_region_size,
+			 REGION_ROM_ATTR),
+
+	 MPU_REGION_ENTRY("RAM_RW",
+#ifdef CONFIG_USERSPACE
+			(uintptr_t)_app_smem_start,
+#else
+			(uintptr_t)__kernel_ram_start,
 #endif
+			(uintptr_t)__kernel_ram_size,
+			REGION_RAM_ATTR),
+#endif /* CONFIG_XIP */
+
+#endif /* zephyr_sram > 0 */
 
 #if DT_REG_SIZE(DT_CHOSEN(zephyr_flash)) > 0
 	/* Region DCCM */

include/zephyr/arch/arc/v2/linker.ld

@@ -93,6 +93,11 @@ SECTIONS {
 
 #include <zephyr/linker/common-rom.ld>
 #include <zephyr/linker/thread-local-storage.ld>
+#ifdef __MWDT_LINKER_CMD__
+/* TODO: add mwdt specific ROM C++ sections */
+#else
+#include <zephyr/linker/cplusplus-rom.ld>
+#endif /* __MWDT_LINKER_CMD__ */
 
 	SECTION_PROLOGUE(_RODATA_SECTION_NAME,,) {
 		*(".rodata")
@@ -103,7 +108,6 @@ SECTIONS {
  * zephyr_linker_sources() Cmake function.
  */
 #include <snippets-rodata.ld>
-
 #include <zephyr/linker/kobject-rom.ld>
 
 #if defined(CONFIG_CPLUSPLUS) && !defined(CONFIG_CPP_STATIC_INIT_GNU) && defined(__MWDT_LINKER_CMD__)
@@ -112,16 +116,13 @@ SECTIONS {
 		KEEP(*(.ctors*))
 		_ectors = .;
 #endif /* CONFIG_CPLUSPLUS && !CONFIG_CPP_STATIC_INIT_GNU && __MWDT_LINKER_CMD__ */
-	} GROUP_LINK_IN(ROMABLE_REGION)
 
-#ifdef __MWDT_LINKER_CMD__
-/* TODO: add mwdt specific ROM C++ sections */
-#else
-#include <zephyr/linker/cplusplus-rom.ld>
-#endif /* __MWDT_LINKER_CMD__ */
+		MPU_ALIGN(ABSOLUTE(.) - __rom_region_start);
+	} GROUP_LINK_IN(ROMABLE_REGION)
 
 	__rodata_region_end = .;
-	MPU_ALIGN(__rodata_region_end - __rom_region_start);
+
+	 MPU_ALIGN(__rodata_region_end - __rom_region_start);
 	__rom_region_end = .;
 	__rom_region_size = __rom_region_end - __rom_region_start;