michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: arm: cortex_m: Add config for SW_VECTOR_RELAY_CLIENT

Browse source 
Define vector relay tables for bootloader only.
If an image is not a bootloader image (such as an MCUboot image)
but it is a standard Zephyr firmware, chain-loadable by a
bootloader, then this image will not need to relay IRQs itself.
In this case SW_VECTOR_RELAY_CLIENT should be used to setting the
vector table pointer in RAM so the parent image can forward the
interrupts to it.

Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
Co-authored-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>
Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
This commit is contained in:
Ioannis Glaropoulos 2020-06-18 22:52:31 +02:00 • committed by Anas Nashif
commit fde3116f19
5 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/core/aarch32/cortex_m/CMakeLists.txt
View file

@ -19,7 +19,9 @@ zephyr_linker_sources_ifdef(CONFIG_SW_VECTOR_RELAY
relay_vector_table.ld
)
zephyr_linker_sources_ifdef(CONFIG_SW_VECTOR_RELAY
if (CONFIG_SW_VECTOR_RELAY OR CONFIG_SW_VECTOR_RELAY_CLIENT)
zephyr_linker_sources(
RAM_SECTIONS
vt_pointer_section.ld
)
endif()

16
arch/arm/core/aarch32/cortex_m/Kconfig
View file

@ -267,16 +267,26 @@ config DYNAMIC_DIRECT_INTERRUPTS
config SW_VECTOR_RELAY
bool "Enable Software Vector Relay"
default y if BOOTLOADER_MCUBOOT
depends on ARMV6_M_ARMV8_M_BASELINE && !(CPU_CORTEX_M0_HAS_VECTOR_TABLE_REMAP || CPU_CORTEX_M_HAS_VTOR)
help
Add Vector Table relay handler and relay vector table, to
relay interrupts based on a vector table pointer. This is only
When building bootloader firmware this option adds a
Vector Table relay handler and relay vector table, to
relay interrupts based on a vector table pointer.
This is only
required for Cortex-M0 (or an Armv8-M baseline core) with no hardware
vector table relocation mechanisms or for Cortex-M0+
(or an Armv8-M baseline core) with no VTOR and no other hardware
relocation table mechanisms.
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)
help
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
rsource "mpu/Kconfig"

2
arch/arm/core/aarch32/cortex_m/vt_pointer_section.ld
View file

@ -5,4 +5,4 @@
{
*(.vt_pointer_section)
*(".vt_pointer_section.*")
}
} GROUP_LINK_IN(RAMABLE_REGION)

5
arch/arm/core/aarch32/irq_relay.S
View file

@ -26,7 +26,10 @@
_ASM_FILE_PROLOGUE
#if defined(CONFIG_SW_VECTOR_RELAY)
/* When CONFIG_BOOTLOADER_MCUBOOT is set the firmware image
* is chain-loadable and does not need to forward interrupts.
*/
#if defined(CONFIG_SW_VECTOR_RELAY) && !defined(CONFIG_BOOTLOADER_MCUBOOT)
GDATA(_vector_table_pointer)
GDATA(z_main_stack)

7
arch/arm/core/aarch32/prep_c.c
View file

@ -53,8 +53,9 @@ static inline void relocate_vector_table(void)
#else
#if defined(CONFIG_SW_VECTOR_RELAY)
Z_GENERIC_SECTION(.vt_pointer_section) void *_vector_table_pointer;
#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
#define VECTOR_ADDRESS 0
@ -65,7 +66,7 @@ void __weak relocate_vector_table(void)
!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)
#elif defined(CONFIG_SW_VECTOR_RELAY) || defined(CONFIG_SW_VECTOR_RELAY_CLIENT)
_vector_table_pointer = _vector_start;
#endif
}