michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: arm: common Armv8-M support

Browse source 
This PR includes the required changes in order to support
conditional compilation for Armv8-M architecture. Two
variants of the Armv8-M architecture are defined:
- the Armv8-M Baseline (backwards compatible with ARMv6-M),
- the Armv8-M Mainline (backwards compatible with ARMv7-M).

Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
This commit is contained in:
Ioannis Glaropoulos 2018-02-06 23:47:58 +01:00 • committed by Kumar Gala
commit a0a03d7597
21 changed files with 197 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

41
arch/arm/core/cortex_m/Kconfig
View file

@ -65,16 +65,26 @@ config CPU_CORTEX_M0_HAS_VECTOR_TABLE_REMAP
This option signifies the Cortex-M0 has some mechanisms that can map This option signifies the Cortex-M0 has some mechanisms that can map
the vector table to SRAM the vector table to SRAM
config ARMV6_M config ARMV6_M_ARMV8_M_BASELINE
bool bool
# Omit prompt to signify "hidden" option # Omit prompt to signify "hidden" option
default n default n
select ATOMIC_OPERATIONS_C select ATOMIC_OPERATIONS_C
select ISA_THUMB2 select ISA_THUMB2
help help
This option signifies the use of an ARMv6-M processor implementation. This option signifies the use of an ARMv6-M processor
implementation, or the use of an ARMv8-M processor
supporting the Baseline implementation.
config ARMV7_M Notes:
- A Processing Element (PE) without the Main Extension
is also referred to as a Baseline Implementation. A
Baseline implementation has a subset of the instructions,
registers, and features, of a Mainline implementation.
- ARMv6-M compatibility is provided by all ARMv8-M
implementations.
config ARMV7_M_ARMV8_M_MAINLINE
bool bool
# Omit prompt to signify "hidden" option # Omit prompt to signify "hidden" option
default n default n
@ -84,40 +94,51 @@ config ARMV7_M
select CPU_CORTEX_M_HAS_VTOR select CPU_CORTEX_M_HAS_VTOR
select CPU_CORTEX_M_HAS_PROGRAMMABLE_FAULT_PRIOS select CPU_CORTEX_M_HAS_PROGRAMMABLE_FAULT_PRIOS
help help
This option signifies the use of an ARMv7-M processor implementation. This option signifies the use of an ARMv7-M processor
implementation, or the use of an ARMv8-M processor
implementation supporting the Main Extension.
Notes:
- A Processing Element (PE) with the Main Extension is also
referred to as a Mainline Implementation.
- ARMv7-M compatibility requires the Main Extension.
From https://developer.arm.com/products/architecture/m-profile:
The Main Extension provides backwards compatibility
with ARMv7-M.
config CPU_CORTEX_M0 config CPU_CORTEX_M0
bool bool
# Omit prompt to signify "hidden" option # Omit prompt to signify "hidden" option
select ARMV6_M select ARMV6_M_ARMV8_M_BASELINE
help help
This option signifies the use of a Cortex-M0 CPU This option signifies the use of a Cortex-M0 CPU
config CPU_CORTEX_M0PLUS config CPU_CORTEX_M0PLUS
bool bool
# Omit prompt to signify "hidden" option # Omit prompt to signify "hidden" option
select ARMV6_M select ARMV6_M_ARMV8_M_BASELINE
help help
This option signifies the use of a Cortex-M0+ CPU This option signifies the use of a Cortex-M0+ CPU
config CPU_CORTEX_M3 config CPU_CORTEX_M3
bool bool
# Omit prompt to signify "hidden" option # Omit prompt to signify "hidden" option
select ARMV7_M select ARMV7_M_ARMV8_M_MAINLINE
help help
This option signifies the use of a Cortex-M3 CPU This option signifies the use of a Cortex-M3 CPU
config CPU_CORTEX_M4 config CPU_CORTEX_M4
bool bool
# Omit prompt to signify "hidden" option # Omit prompt to signify "hidden" option
select ARMV7_M select ARMV7_M_ARMV8_M_MAINLINE
help help
This option signifies the use of a Cortex-M4 CPU This option signifies the use of a Cortex-M4 CPU
config CPU_CORTEX_M7 config CPU_CORTEX_M7
bool bool
# Omit prompt to signify "hidden" option # Omit prompt to signify "hidden" option
select ARMV7_M select ARMV7_M_ARMV8_M_MAINLINE
default n default n
help help
This option signifies the use of a Cortex-M7 CPU This option signifies the use of a Cortex-M7 CPU
@ -177,7 +198,7 @@ config XIP
endmenu endmenu
menu "ARM Cortex-M0/M0+/M3/M4/M7 options" menu "ARM Cortex-M0/M0+/M3/M4/M7 options"
depends on ARMV6_M || ARMV7_M depends on ARMV6_M_ARMV8_M_BASELINE || ARMV7_M_ARMV8_M_MAINLINE
config GEN_ISR_TABLES config GEN_ISR_TABLES
default y default y

6
arch/arm/core/cortex_m/reset.S
View file

@ -58,14 +58,14 @@ SECTION_SUBSEC_FUNC(TEXT,_reset_section,__reset)
SECTION_SUBSEC_FUNC(TEXT,_reset_section,__start) SECTION_SUBSEC_FUNC(TEXT,_reset_section,__start)
/* lock interrupts: will get unlocked when switch to main task */ /* lock interrupts: will get unlocked when switch to main task */
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
cpsid i cpsid i
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
movs.n r0, #_EXC_IRQ_DEFAULT_PRIO movs.n r0, #_EXC_IRQ_DEFAULT_PRIO
msr BASEPRI, r0 msr BASEPRI, r0
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
#ifdef CONFIG_WDOG_INIT #ifdef CONFIG_WDOG_INIT
/* board-specific watchdog initialization is necessary */ /* board-specific watchdog initialization is necessary */

6
arch/arm/core/cortex_m/vector_table.S
View file

@ -39,7 +39,7 @@ SECTION_SUBSEC_FUNC(exc_vector_table,_vector_table_section,_vector_table)
.word __nmi .word __nmi
.word __hard_fault .word __hard_fault
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
.word __reserved .word __reserved
.word __reserved .word __reserved
.word __reserved .word __reserved
@ -49,7 +49,7 @@ SECTION_SUBSEC_FUNC(exc_vector_table,_vector_table_section,_vector_table)
.word __reserved .word __reserved
.word __svc .word __svc
.word __reserved .word __reserved
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
.word __mpu_fault .word __mpu_fault
.word __bus_fault .word __bus_fault
.word __usage_fault .word __usage_fault
@ -61,7 +61,7 @@ SECTION_SUBSEC_FUNC(exc_vector_table,_vector_table_section,_vector_table)
.word __debug_monitor .word __debug_monitor
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
.word __reserved .word __reserved
.word __pendsv .word __pendsv
#if defined(CONFIG_CORTEX_M_SYSTICK) #if defined(CONFIG_CORTEX_M_SYSTICK)

6
arch/arm/core/cortex_m/vector_table.h
View file

@ -38,9 +38,9 @@ GTEXT(_vector_table)
GTEXT(__reset) GTEXT(__reset)
GTEXT(__nmi) GTEXT(__nmi)
GTEXT(__hard_fault) GTEXT(__hard_fault)
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
GTEXT(__svc) GTEXT(__svc)
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
GTEXT(__mpu_fault) GTEXT(__mpu_fault)
GTEXT(__bus_fault) GTEXT(__bus_fault)
GTEXT(__usage_fault) GTEXT(__usage_fault)
@ -48,7 +48,7 @@ GTEXT(__svc)
GTEXT(__debug_monitor) GTEXT(__debug_monitor)
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
GTEXT(__pendsv) GTEXT(__pendsv)
GTEXT(__reserved) GTEXT(__reserved)

12
arch/arm/core/cpu_idle.S
View file

@ -120,15 +120,15 @@ SECTION_FUNC(TEXT, k_cpu_idle)
mov lr, r0 mov lr, r0
#endif #endif
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
cpsie i cpsie i
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
/* clear BASEPRI so wfi is awakened by incoming interrupts */ /* clear BASEPRI so wfi is awakened by incoming interrupts */
eors.n r0, r0 eors.n r0, r0
msr BASEPRI, r0 msr BASEPRI, r0
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
wfi wfi
@ -177,7 +177,7 @@ SECTION_FUNC(TEXT, k_cpu_atomic_idle)
/* r0: interrupt mask from caller */ /* r0: interrupt mask from caller */
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
/* No BASEPRI, call wfe directly (SEVONPEND set in _CpuIdleInit()) */ /* No BASEPRI, call wfe directly (SEVONPEND set in _CpuIdleInit()) */
wfe wfe
@ -186,7 +186,7 @@ SECTION_FUNC(TEXT, k_cpu_atomic_idle)
cpsie i cpsie i
_irq_disabled: _irq_disabled:
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
/* r1: zero, for setting BASEPRI (needs a register) */ /* r1: zero, for setting BASEPRI (needs a register) */
eors.n r1, r1 eors.n r1, r1
@ -199,5 +199,5 @@ _irq_disabled:
cpsie i cpsie i
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
bx lr bx lr

8
arch/arm/core/exc_exit.S
View file

@ -90,12 +90,12 @@ SECTION_SUBSEC_FUNC(TEXT, _HandlerModeExit, _ExcExit)
#ifdef CONFIG_TIMESLICING #ifdef CONFIG_TIMESLICING
push {lr} push {lr}
bl _update_time_slice_before_swap bl _update_time_slice_before_swap
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
pop {r0} pop {r0}
mov lr, r0 mov lr, r0
#else #else
pop {lr} pop {lr}
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
#endif /* CONFIG_TIMESLICING */ #endif /* CONFIG_TIMESLICING */
/* context switch required, pend the PendSV exception */ /* context switch required, pend the PendSV exception */
@ -111,12 +111,12 @@ _EXIT_EXC:
#ifdef CONFIG_STACK_SENTINEL #ifdef CONFIG_STACK_SENTINEL
push {lr} push {lr}
bl _check_stack_sentinel bl _check_stack_sentinel
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
pop {r0} pop {r0}
mov lr, r0 mov lr, r0
#else #else
pop {lr} pop {lr}
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
#endif /* CONFIG_STACK_SENTINEL */ #endif /* CONFIG_STACK_SENTINEL */
bx lr bx lr

32
arch/arm/core/fault.c
View file

@ -59,8 +59,8 @@ void _FaultDump(const NANO_ESF *esf, int fault)
k_current_get(), k_current_get(),
esf->pc); esf->pc);
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
int escalation = 0; int escalation = 0;
if (3 == fault) { /* hard fault */ if (3 == fault) { /* hard fault */
@ -92,7 +92,7 @@ void _FaultDump(const NANO_ESF *esf, int fault)
SCB->CFSR |= SCB_CFSR_USGFAULTSR_Msk; SCB->CFSR |= SCB_CFSR_USGFAULTSR_Msk;
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
} }
#endif #endif
@ -112,8 +112,9 @@ static void _FaultThreadShow(const NANO_ESF *esf)
k_current_get(), esf->pc); k_current_get(), esf->pc);
} }
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
#elif defined(CONFIG_ARMV7_M) /* HardFault is used for all fault conditions on ARMv6-M. */
#elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
/** /**
* *
@ -240,7 +241,7 @@ static void _DebugMonitor(const NANO_ESF *esf)
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
/** /**
* *
@ -254,9 +255,9 @@ static void _HardFault(const NANO_ESF *esf)
{ {
PR_EXC("***** HARD FAULT *****\n"); PR_EXC("***** HARD FAULT *****\n");
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
_FaultThreadShow(esf); _FaultThreadShow(esf);
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
if (SCB->HFSR & SCB_HFSR_VECTTBL_Msk) { if (SCB->HFSR & SCB_HFSR_VECTTBL_Msk) {
PR_EXC(" Bus fault on vector table read\n"); PR_EXC(" Bus fault on vector table read\n");
} else if (SCB->HFSR & SCB_HFSR_FORCED_Msk) { } else if (SCB->HFSR & SCB_HFSR_FORCED_Msk) {
@ -271,7 +272,7 @@ static void _HardFault(const NANO_ESF *esf)
} }
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
} }
/** /**
@ -316,8 +317,9 @@ static void _FaultDump(const NANO_ESF *esf, int fault)
case 3: case 3:
_HardFault(esf); _HardFault(esf);
break; break;
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
#elif defined(CONFIG_ARMV7_M) /* HardFault is used for all fault conditions on ARMv6-M. */
#elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
case 4: case 4:
_MpuFault(esf, 0); _MpuFault(esf, 0);
break; break;
@ -332,7 +334,7 @@ static void _FaultDump(const NANO_ESF *esf, int fault)
break; break;
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
default: default:
_ReservedException(esf, fault); _ReservedException(esf, fault);
break; break;
@ -375,10 +377,10 @@ void _Fault(const NANO_ESF *esf)
*/ */
void _FaultInit(void) void _FaultInit(void)
{ {
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
SCB->CCR |= SCB_CCR_DIV_0_TRP_Msk; SCB->CCR |= SCB_CCR_DIV_0_TRP_Msk;
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
} }

20
arch/arm/core/fault_s.S
View file

@ -20,15 +20,16 @@ _ASM_FILE_PROLOGUE
GTEXT(_Fault) GTEXT(_Fault)
GTEXT(__hard_fault) GTEXT(__hard_fault)
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
#elif defined(CONFIG_ARMV7_M) /* HardFault is used for all fault conditions on ARMv6-M. */
#elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
GTEXT(__mpu_fault) GTEXT(__mpu_fault)
GTEXT(__bus_fault) GTEXT(__bus_fault)
GTEXT(__usage_fault) GTEXT(__usage_fault)
GTEXT(__debug_monitor) GTEXT(__debug_monitor)
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
GTEXT(__reserved) GTEXT(__reserved)
/** /**
@ -55,18 +56,19 @@ GTEXT(__reserved)
*/ */
SECTION_SUBSEC_FUNC(TEXT,__fault,__hard_fault) SECTION_SUBSEC_FUNC(TEXT,__fault,__hard_fault)
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
#elif defined(CONFIG_ARMV7_M) /* HardFault is used for all fault conditions on ARMv6-M. */
#elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
SECTION_SUBSEC_FUNC(TEXT,__fault,__mpu_fault) SECTION_SUBSEC_FUNC(TEXT,__fault,__mpu_fault)
SECTION_SUBSEC_FUNC(TEXT,__fault,__bus_fault) SECTION_SUBSEC_FUNC(TEXT,__fault,__bus_fault)
SECTION_SUBSEC_FUNC(TEXT,__fault,__usage_fault) SECTION_SUBSEC_FUNC(TEXT,__fault,__usage_fault)
SECTION_SUBSEC_FUNC(TEXT,__fault,__debug_monitor) SECTION_SUBSEC_FUNC(TEXT,__fault,__debug_monitor)
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
SECTION_SUBSEC_FUNC(TEXT,__fault,__reserved) SECTION_SUBSEC_FUNC(TEXT,__fault,__reserved)
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
/* force unlock interrupts */ /* force unlock interrupts */
cpsie i cpsie i
@ -83,7 +85,7 @@ _stack_frame_msp:
mrs r0, MSP mrs r0, MSP
_stack_frame_endif: _stack_frame_endif:
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
/* force unlock interrupts */ /* force unlock interrupts */
eors.n r0, r0 eors.n r0, r0
msr BASEPRI, r0 msr BASEPRI, r0
@ -102,7 +104,7 @@ _stack_frame_endif:
* frame is on the PSP */ * frame is on the PSP */
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
push {lr} push {lr}
bl _Fault bl _Fault

12
arch/arm/core/irq_manage.c
View file

@ -146,12 +146,12 @@ void _irq_spurious(void *unused)
#ifdef CONFIG_SYS_POWER_MANAGEMENT #ifdef CONFIG_SYS_POWER_MANAGEMENT
void _arch_isr_direct_pm(void) void _arch_isr_direct_pm(void)
{ {
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
int key; int key;
/* irq_lock() does what we wan for this CPU */ /* irq_lock() does what we wan for this CPU */
key = irq_lock(); key = irq_lock();
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
/* Lock all interrupts. irq_lock() will on this CPU only disable those /* Lock all interrupts. irq_lock() will on this CPU only disable those
* lower than BASEPRI, which is not what we want. See comments in * lower than BASEPRI, which is not what we want. See comments in
* arch/arm/core/isr_wrapper.S * arch/arm/core/isr_wrapper.S
@ -159,7 +159,7 @@ void _arch_isr_direct_pm(void)
__asm__ volatile("cpsid i" : : : "memory"); __asm__ volatile("cpsid i" : : : "memory");
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
if (_kernel.idle) { if (_kernel.idle) {
s32_t idle_val = _kernel.idle; s32_t idle_val = _kernel.idle;
@ -168,13 +168,13 @@ void _arch_isr_direct_pm(void)
_sys_power_save_idle_exit(idle_val); _sys_power_save_idle_exit(idle_val);
} }
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
irq_unlock(key); irq_unlock(key);
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
__asm__ volatile("cpsie i" : : : "memory"); __asm__ volatile("cpsie i" : : : "memory");
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
} }
#endif #endif

4
arch/arm/core/irq_offload.c
View file

@ -22,7 +22,7 @@ void _irq_do_offload(void)
void irq_offload(irq_offload_routine_t routine, void *parameter) void irq_offload(irq_offload_routine_t routine, void *parameter)
{ {
#if defined(CONFIG_ARMV6_M) && defined(CONFIG_ASSERT) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE) && defined(CONFIG_ASSERT)
/* Cortex M0 hardfaults if you make a SVC call with interrupts /* Cortex M0 hardfaults if you make a SVC call with interrupts
* locked. * locked.
*/ */
@ -30,7 +30,7 @@ void irq_offload(irq_offload_routine_t routine, void *parameter)
__asm__ volatile("mrs %0, PRIMASK;" : "=r" (key) : : "memory"); __asm__ volatile("mrs %0, PRIMASK;" : "=r" (key) : : "memory");
__ASSERT(key == 0, "irq_offload called with interrupts locked\n"); __ASSERT(key == 0, "irq_offload called with interrupts locked\n");
#endif #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE && CONFIG_ASSERT */
k_sched_lock(); k_sched_lock();
offload_routine = routine; offload_routine = routine;

22
arch/arm/core/isr_wrapper.S
View file

@ -72,7 +72,7 @@ SECTION_FUNC(TEXT, _isr_wrapper)
ldr r0, [r2, #_kernel_offset_to_idle] ldr r0, [r2, #_kernel_offset_to_idle]
cmp r0, #0 cmp r0, #0
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
beq _idle_state_cleared beq _idle_state_cleared
movs.n r1, #0 movs.n r1, #0
/* clear kernel idle state */ /* clear kernel idle state */
@ -80,7 +80,7 @@ SECTION_FUNC(TEXT, _isr_wrapper)
blx _sys_power_save_idle_exit blx _sys_power_save_idle_exit
_idle_state_cleared: _idle_state_cleared:
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
ittt ne ittt ne
movne r1, #0 movne r1, #0
/* clear kernel idle state */ /* clear kernel idle state */
@ -88,22 +88,22 @@ _idle_state_cleared:
blxne _sys_power_save_idle_exit blxne _sys_power_save_idle_exit
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
cpsie i /* re-enable interrupts (PRIMASK = 0) */ cpsie i /* re-enable interrupts (PRIMASK = 0) */
#endif #endif
mrs r0, IPSR /* get exception number */ mrs r0, IPSR /* get exception number */
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
ldr r1, =16 ldr r1, =16
subs r0, r1 /* get IRQ number */ subs r0, r1 /* get IRQ number */
lsls r0, #3 /* table is 8-byte wide */ lsls r0, #3 /* table is 8-byte wide */
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
sub r0, r0, #16 /* get IRQ number */ sub r0, r0, #16 /* get IRQ number */
lsl r0, r0, #3 /* table is 8-byte wide */ lsl r0, r0, #3 /* table is 8-byte wide */
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
ldr r1, =_sw_isr_table ldr r1, =_sw_isr_table
add r1, r1, r0 /* table entry: ISRs must have their MSB set to stay add r1, r1, r0 /* table entry: ISRs must have their MSB set to stay
* in thumb mode */ * in thumb mode */
@ -113,24 +113,24 @@ _idle_state_cleared:
stm sp!,{r0-r3} /* Save r0 to r4 into stack */ stm sp!,{r0-r3} /* Save r0 to r4 into stack */
push {lr} push {lr}
bl read_timer_end_of_isr bl read_timer_end_of_isr
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
pop {r3} pop {r3}
mov lr,r3 mov lr,r3
#else #else
pop {lr} pop {lr}
#endif #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
ldm sp!,{r0-r3} /* Restore r0 to r4 regs */ ldm sp!,{r0-r3} /* Restore r0 to r4 regs */
#endif #endif
blx r3 /* call ISR */ blx r3 /* call ISR */
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
pop {r3} pop {r3}
mov lr, r3 mov lr, r3
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
pop {lr} pop {lr}
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
/* exception return is done in _IntExit() */ /* exception return is done in _IntExit() */
b _IntExit b _IntExit

42
arch/arm/core/swap.S
View file

@ -46,12 +46,12 @@ SECTION_FUNC(TEXT, __pendsv)
/* Register the context switch */ /* Register the context switch */
push {lr} push {lr}
bl _sys_k_event_logger_context_switch bl _sys_k_event_logger_context_switch
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
pop {r0} pop {r0}
mov lr, r0 mov lr, r0
#else #else
pop {lr} pop {lr}
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
#endif /* CONFIG_KERNEL_EVENT_LOGGER_CONTEXT_SWITCH */ #endif /* CONFIG_KERNEL_EVENT_LOGGER_CONTEXT_SWITCH */
/* load _kernel into r1 and current k_thread into r2 */ /* load _kernel into r1 and current k_thread into r2 */
@ -65,7 +65,7 @@ SECTION_FUNC(TEXT, __pendsv)
/* save callee-saved + psp in thread */ /* save callee-saved + psp in thread */
mrs ip, PSP mrs ip, PSP
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
/* Store current r4-r7 */ /* Store current r4-r7 */
stmea r0!, {r4-r7} stmea r0!, {r4-r7}
/* copy r8-r12 into r3-r7 */ /* copy r8-r12 into r3-r7 */
@ -76,7 +76,7 @@ SECTION_FUNC(TEXT, __pendsv)
mov r7, ip mov r7, ip
/* store r8-12 */ /* store r8-12 */
stmea r0!, {r3-r7} stmea r0!, {r3-r7}
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
stmia r0, {v1-v8, ip} stmia r0, {v1-v8, ip}
#ifdef CONFIG_FP_SHARING #ifdef CONFIG_FP_SHARING
add r0, r2, #_thread_offset_to_preempt_float add r0, r2, #_thread_offset_to_preempt_float
@ -84,7 +84,7 @@ SECTION_FUNC(TEXT, __pendsv)
#endif /* CONFIG_FP_SHARING */ #endif /* CONFIG_FP_SHARING */
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
/* /*
* Prepare to clear PendSV with interrupts unlocked, but * Prepare to clear PendSV with interrupts unlocked, but
@ -97,14 +97,14 @@ SECTION_FUNC(TEXT, __pendsv)
ldr v3, =_SCS_ICSR_UNPENDSV ldr v3, =_SCS_ICSR_UNPENDSV
/* protect the kernel state while we play with the thread lists */ /* protect the kernel state while we play with the thread lists */
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
cpsid i cpsid i
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
movs.n r0, #_EXC_IRQ_DEFAULT_PRIO movs.n r0, #_EXC_IRQ_DEFAULT_PRIO
msr BASEPRI, r0 msr BASEPRI, r0
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
/* _kernel is still in r1 */ /* _kernel is still in r1 */
@ -130,7 +130,7 @@ SECTION_FUNC(TEXT, __pendsv)
movs.n r3, #0 movs.n r3, #0
str r3, [r2, #_thread_offset_to_basepri] str r3, [r2, #_thread_offset_to_basepri]
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
/* BASEPRI not available, previous interrupt disable state /* BASEPRI not available, previous interrupt disable state
* maps to PRIMASK. * maps to PRIMASK.
* *
@ -158,7 +158,7 @@ _thread_irq_disabled:
/* restore r4-r7, go back 9*4 bytes to the start of the stored block */ /* restore r4-r7, go back 9*4 bytes to the start of the stored block */
subs r0, #36 subs r0, #36
ldmia r0!, {r4-r7} ldmia r0!, {r4-r7}
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
/* restore BASEPRI for the incoming thread */ /* restore BASEPRI for the incoming thread */
msr BASEPRI, r0 msr BASEPRI, r0
@ -188,7 +188,7 @@ _thread_irq_disabled:
ldmia r0, {v1-v8, ip} ldmia r0, {v1-v8, ip}
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
msr PSP, ip msr PSP, ip
@ -197,19 +197,19 @@ _thread_irq_disabled:
push {lr} push {lr}
bl read_timer_end_of_swap bl read_timer_end_of_swap
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
pop {r3} pop {r3}
mov lr,r3 mov lr,r3
#else #else
pop {lr} pop {lr}
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
ldm sp!,{r0-r3} /* Load back regs ro to r4 */ ldm sp!,{r0-r3} /* Load back regs ro to r4 */
#endif /* CONFIG_EXECUTION_BENCHMARKING */ #endif /* CONFIG_EXECUTION_BENCHMARKING */
/* exc return */ /* exc return */
bx lr bx lr
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
SECTION_FUNC(TEXT, __svc) SECTION_FUNC(TEXT, __svc)
/* Use EXC_RETURN state to find out if stack frame is on the /* Use EXC_RETURN state to find out if stack frame is on the
* MSP or PSP * MSP or PSP
@ -256,7 +256,7 @@ _oops:
blx _do_kernel_oops blx _do_kernel_oops
pop {pc} pop {pc}
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
/** /**
* *
* @brief Service call handler * @brief Service call handler
@ -326,7 +326,7 @@ _oops:
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
/** /**
* *
@ -370,12 +370,12 @@ SECTION_FUNC(TEXT, __swap)
#ifdef CONFIG_EXECUTION_BENCHMARKING #ifdef CONFIG_EXECUTION_BENCHMARKING
push {lr} push {lr}
bl read_timer_start_of_swap bl read_timer_start_of_swap
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
pop {r3} pop {r3}
mov lr,r3 mov lr,r3
#else #else
pop {lr} pop {lr}
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
#endif /* CONFIG_EXECUTION_BENCHMARKING */ #endif /* CONFIG_EXECUTION_BENCHMARKING */
ldr r1, =_kernel ldr r1, =_kernel
ldr r2, [r1, #_kernel_offset_to_current] ldr r2, [r1, #_kernel_offset_to_current]
@ -389,7 +389,7 @@ SECTION_FUNC(TEXT, __swap)
ldr r1, [r1] ldr r1, [r1]
str r1, [r2, #_thread_offset_to_swap_return_value] str r1, [r2, #_thread_offset_to_swap_return_value]
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
/* No priority-based interrupt masking on M0/M0+, /* No priority-based interrupt masking on M0/M0+,
* pending PendSV is used instead of svc * pending PendSV is used instead of svc
*/ */
@ -403,11 +403,11 @@ SECTION_FUNC(TEXT, __swap)
* of a higher priority pending. * of a higher priority pending.
*/ */
cpsie i cpsie i
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
svc #0 svc #0
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
/* coming back from exception, r2 still holds the pointer to _current */ /* coming back from exception, r2 still holds the pointer to _current */
ldr r0, [r2, #_thread_offset_to_swap_return_value] ldr r0, [r2, #_thread_offset_to_swap_return_value]

12
arch/arm/include/cortex_m/exc.h
View file

@ -55,12 +55,12 @@ static ALWAYS_INLINE int _IsInIsr(void)
/* Only non-NULL if currently running an offloaded function */ /* Only non-NULL if currently running an offloaded function */
|| offload_routine != NULL || offload_routine != NULL
#endif #endif
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
/* On ARMv6-M there is no nested execution bit, so we check /* On ARMv6-M there is no nested execution bit, so we check
* exception 3, hard fault, to a detect a nested exception. * exception 3, hard fault, to a detect a nested exception.
*/ */
|| (vector == 3) || (vector == 3)
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
/* If not in thread mode, and if RETTOBASE bit in ICSR is 0, /* If not in thread mode, and if RETTOBASE bit in ICSR is 0,
* then there are preempted active exceptions to execute. * then there are preempted active exceptions to execute.
*/ */
@ -75,7 +75,7 @@ static ALWAYS_INLINE int _IsInIsr(void)
#endif /* CONFIG_BOARD_QEMU_CORTEX_M3 */ #endif /* CONFIG_BOARD_QEMU_CORTEX_M3 */
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
; ;
} }
@ -119,8 +119,8 @@ static ALWAYS_INLINE void _ExcSetup(void)
*/ */
static ALWAYS_INLINE void _ClearFaults(void) static ALWAYS_INLINE void _ClearFaults(void)
{ {
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
/* Reset all faults */ /* Reset all faults */
SCB->CFSR = SCB_CFSR_USGFAULTSR_Msk | SCB->CFSR = SCB_CFSR_USGFAULTSR_Msk |
SCB_CFSR_MEMFAULTSR_Msk | SCB_CFSR_MEMFAULTSR_Msk |
@ -130,7 +130,7 @@ static ALWAYS_INLINE void _ClearFaults(void)
SCB->HFSR = 0xffffffff; SCB->HFSR = 0xffffffff;
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
} }
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */

6
arch/arm/include/kernel_arch_func.h
View file

@ -59,14 +59,14 @@ _arch_switch_to_main_thread(struct k_thread *main_thread,
"msr PSP, %0 \t\n" "msr PSP, %0 \t\n"
/* unlock interrupts */ /* unlock interrupts */
#ifdef CONFIG_ARMV6_M #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
"cpsie i \t\n" "cpsie i \t\n"
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
"movs %%r1, #0 \n\t" "movs %%r1, #0 \n\t"
"msr BASEPRI, %%r1 \n\t" "msr BASEPRI, %%r1 \n\t"
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
/* branch to _thread_entry(_main, 0, 0, 0) */ /* branch to _thread_entry(_main, 0, 0, 0) */
"mov %%r0, %1 \n\t" "mov %%r0, %1 \n\t"

25
dts/arm/armv8-m.dtsi Normal file
View file

@ -0,0 +1,25 @@
#include "skeleton.dtsi"
/ {
soc {
#address-cells = <1>;
#size-cells = <1>;
compatible = "simple-bus";
interrupt-parent = <&nvic>;
ranges;
nvic: interrupt-controller@e000e100 {
compatible = "arm,v8m-nvic";
reg = <0xe000e100 0xc00>;
interrupt-controller;
#interrupt-cells = <2>;
};
systick: timer@e000e010 {
compatible = "arm,armv8m-systick";
reg = <0xe000e010 0x10>;
status = "disabled";
};
};
};

32
dts/bindings/interrupt-controller/arm,v8m-nvic.yaml Normal file
View file

@ -0,0 +1,32 @@
---
title: ARMv8-M NVIC Interrupt Controller
version: 0.1
description: >
This binding describes the ARMv8-M Nested Vectored Interrupt Controller.
properties:
compatible:
category: required
type: string
description: compatible strings
constraint: "arm,v8m-nvic"
reg:
category: required
type: int
description: mmio register space
generation: define
arm,num-irq-priority-bits:
category: required
type: int
description: number of bits of IRQ priorities
generation: define
cell_string: IRQ
"#cells":
- irq
- priority
...

12
include/arch/arm/cortex_m/asm_inline_gcc.h
View file

@ -118,13 +118,13 @@ static ALWAYS_INLINE unsigned int _arch_irq_lock(void)
{ {
unsigned int key; unsigned int key;
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
__asm__ volatile("mrs %0, PRIMASK;" __asm__ volatile("mrs %0, PRIMASK;"
"cpsid i" "cpsid i"
: "=r" (key) : "=r" (key)
: :
: "memory"); : "memory");
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
unsigned int tmp; unsigned int tmp;
__asm__ volatile( __asm__ volatile(
@ -136,7 +136,7 @@ static ALWAYS_INLINE unsigned int _arch_irq_lock(void)
: "memory"); : "memory");
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
return key; return key;
} }
@ -163,16 +163,16 @@ static ALWAYS_INLINE unsigned int _arch_irq_lock(void)
static ALWAYS_INLINE void _arch_irq_unlock(unsigned int key) static ALWAYS_INLINE void _arch_irq_unlock(unsigned int key)
{ {
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
if (key) { if (key) {
return; return;
} }
__asm__ volatile("cpsie i" : : : "memory"); __asm__ volatile("cpsie i" : : : "memory");
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
__asm__ volatile("msr BASEPRI, %0" : : "r"(key) : "memory"); __asm__ volatile("msr BASEPRI, %0" : : "r"(key) : "memory");
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
} }

4
include/arch/arm/cortex_m/cmsis.h
View file

@ -94,11 +94,11 @@ typedef enum {
Reset_IRQn = -15, Reset_IRQn = -15,
NonMaskableInt_IRQn = -14, NonMaskableInt_IRQn = -14,
HardFault_IRQn = -13, HardFault_IRQn = -13,
#if defined(CONFIG_ARMV7_M) #if defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
MemoryManagement_IRQn = -12, MemoryManagement_IRQn = -12,
BusFault_IRQn = -11, BusFault_IRQn = -11,
UsageFault_IRQn = -10, UsageFault_IRQn = -10,
#endif /* CONFIG_ARMV7_M */ #endif /* CONFIG_ARMV7_M_ARMV8_M_MAINLINE */
SVCall_IRQn = -5, SVCall_IRQn = -5,
DebugMonitor_IRQn = -4, DebugMonitor_IRQn = -4,
PendSV_IRQn = -2, PendSV_IRQn = -2,

6
include/arch/arm/cortex_m/error.h
View file

@ -34,7 +34,7 @@ extern void _SysFatalErrorHandler(unsigned int reason, const NANO_ESF *esf);
#define _SVC_CALL_IRQ_OFFLOAD 1 #define _SVC_CALL_IRQ_OFFLOAD 1
#define _SVC_CALL_RUNTIME_EXCEPT 2 #define _SVC_CALL_RUNTIME_EXCEPT 2
#if defined(CONFIG_ARMV6_M) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
/* ARMv6 will hard-fault if SVC is called with interrupts locked. Just /* ARMv6 will hard-fault if SVC is called with interrupts locked. Just
* force them unlocked, the thread is in an undefined state anyway * force them unlocked, the thread is in an undefined state anyway
* *
@ -53,7 +53,7 @@ extern void _SysFatalErrorHandler(unsigned int reason, const NANO_ESF *esf);
: "memory"); \ : "memory"); \
CODE_UNREACHABLE; \ CODE_UNREACHABLE; \
} while (0) } while (0)
#elif defined(CONFIG_ARMV7_M) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
#define _ARCH_EXCEPT(reason_p) do { \ #define _ARCH_EXCEPT(reason_p) do { \
__asm__ volatile ( \ __asm__ volatile ( \
"eors.n r0, r0\n\t" \ "eors.n r0, r0\n\t" \
@ -67,7 +67,7 @@ extern void _SysFatalErrorHandler(unsigned int reason, const NANO_ESF *esf);
} while (0) } while (0)
#else #else
#error Unknown ARM architecture #error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M */ #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
#ifdef __cplusplus #ifdef __cplusplus
} }

2
tests/kernel/arm_irq_vector_table/testcase.yaml
View file

@ -1,4 +1,4 @@
tests: tests:
test: test:
filter: CONFIG_ARMV7_M filter: CONFIG_ARMV7_M_ARMV8_M_MAINLINE
tags: core bat_commit tags: core bat_commit

2
tests/kernel/gen_isr_table/testcase.yaml
View file

@ -1,4 +1,4 @@
tests: tests:
test: test:
filter: CONFIG_GEN_ISR_TABLES and CONFIG_ARMV7_M filter: CONFIG_GEN_ISR_TABLES and CONFIG_ARMV7_M_ARMV8_M_MAINLINE
tags: core tags: core