Revert "[nrf fromtree] arch: arm: aarch32: Always use VTOR when it is available"

This reverts commit 6b13a51.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>

Author: rlubos

arch/arm/core/aarch32/cortex_m/Kconfig

@@ -276,13 +276,12 @@ config SW_VECTOR_RELAY
 
 config SW_VECTOR_RELAY_CLIENT
 	bool "Enable Software Vector Relay (client)"
-	default y if BOOTLOADER_MCUBOOT
-	depends on ARMV6_M_ARMV8_M_BASELINE && !(CPU_CORTEX_M0_HAS_VECTOR_TABLE_REMAP || CPU_CORTEX_M_HAS_VTOR)
+	depends on !SW_VECTOR_RELAY
+	default y if BOOTLOADER_MCUBOOT && !(CPU_CORTEX_M0_HAS_VECTOR_TABLE_REMAP || CPU_CORTEX_M_HAS_VTOR)
 	help
-	  Another image has enabled SW_VECTOR_RELAY, and will be forwarding
-	  exceptions and HW interrupts to this image. Enable this option to make
-	  sure the vector table pointer in RAM is set properly by the image upon
-	  initialization.
+	  Another image has enabled SW_VECTOR_RELAY, and will relay interrupts
+	  to this image. Enable this to make sure the vector table pointer in
+	  RAM is left alone.
 
 endmenu
 

arch/arm/core/aarch32/cortex_m/relay_vector_table.ld

@@ -30,3 +30,5 @@
 
 KEEP(*(.vector_relay_table))
 KEEP(*(".vector_relay_table.*"))
+KEEP(*(.vector_relay_handler))
+KEEP(*(".vector_relay_handler.*"))

arch/arm/core/aarch32/irq_relay.S

@@ -29,7 +29,7 @@ _ASM_FILE_PROLOGUE
 GDATA(_vector_table_pointer)
 GDATA(z_main_stack)
 
-SECTION_FUNC(TEXT, __vector_relay_handler)
+SECTION_FUNC(vector_relay_handler, __vector_relay_handler)
 	mrs	r0, ipsr;
 	lsls	r0, r0, $0x02;
 

arch/arm/core/aarch32/prep_c.c

@@ -37,46 +37,56 @@
 
 #include <string.h>
 
+#ifdef CONFIG_CPU_CORTEX_M_HAS_VTOR
+
+#ifdef CONFIG_XIP
+#ifdef CONFIG_SW_VECTOR_RELAY
+#define VECTOR_ADDRESS ((uintptr_t)__vector_relay_table)
+#else
+#define VECTOR_ADDRESS ((uintptr_t)_vector_start)
+#endif
+#else /* CONFIG_XIP */
+#define VECTOR_ADDRESS CONFIG_SRAM_BASE_ADDRESS
+#endif /* CONFIG_XIP */
+
+#else /* CONFIG_CPU_CORTEX_M_HAS_VTOR */
+
+#define VECTOR_ADDRESS 0
+
+#endif /* CONFIG_CPU_CORTEX_M_HAS_VTOR */
+
 #if defined(CONFIG_SW_VECTOR_RELAY) || defined(CONFIG_SW_VECTOR_RELAY_CLIENT)
 Z_GENERIC_SECTION(.vt_pointer_section) __attribute__((used))
 void *_vector_table_pointer;
 #endif
 
-#ifdef CONFIG_CPU_CORTEX_M_HAS_VTOR
 
-#ifdef CONFIG_XIP
-#define VECTOR_ADDRESS ((uintptr_t)_vector_start)
+#ifdef CONFIG_CPU_CORTEX_M_HAS_VTOR
+static inline void relocate_vector_table(void)
 #else
-#define VECTOR_ADDRESS CONFIG_SRAM_BASE_ADDRESS
+void __weak relocate_vector_table(void)
 #endif
-static inline void relocate_vector_table(void)
 {
+#if defined(CONFIG_CPU_CORTEX_M_HAS_VTOR) && !defined(CONFIG_SW_VECTOR_RELAY_CLIENT)
 	SCB->VTOR = VECTOR_ADDRESS & SCB_VTOR_TBLOFF_Msk;
 	__DSB();
 	__ISB();
-}
-
-#else
-
-#define VECTOR_ADDRESS 0
-
-void __weak relocate_vector_table(void)
-{
+#endif
+#if !defined(CONFIG_CPU_CORTEX_M_HAS_VTOR) || defined(CONFIG_SW_VECTOR_RELAY_CLIENT)
 #if defined(CONFIG_XIP) && (CONFIG_FLASH_BASE_ADDRESS != 0) || \
     !defined(CONFIG_XIP) && (CONFIG_SRAM_BASE_ADDRESS != 0)
 	size_t vector_size = (size_t)_vector_end - (size_t)_vector_start;
 	(void)memcpy(VECTOR_ADDRESS, _vector_start, vector_size);
 #elif defined(CONFIG_SW_VECTOR_RELAY) || defined(CONFIG_SW_VECTOR_RELAY_CLIENT)
 	_vector_table_pointer = _vector_start;
 #endif
+#endif /* !defined(CONFIG_CPU_CORTEX_M_HAS_VTOR) || defined(CONFIG_SW_VECTOR_RELAY_CLIENT) */
 }
 
 #if defined(__GNUC__)
 #pragma GCC diagnostic pop
 #endif
 
-#endif /* CONFIG_CPU_CORTEX_M_HAS_VTOR */
-
 #if defined(CONFIG_CPU_HAS_FPU)
 static inline void z_arm_floating_point_init(void)
 {