abawo/pico-sdk
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

user_irqs should be claimed globally not per core, since vector tabes are shared (#1183)

Browse Source
This commit is contained in:
Graham Sanderson 2023-01-24 08:58:01 -06:00 committed by GitHub
parent 8b8778c59b
commit a66ba7a942
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/rp2_common/hardware_irq/include/hardware/irq.h
View File

@ -18,6 +18,11 @@
#define PICO_DISABLE_SHARED_IRQ_HANDLERS 0 #define PICO_DISABLE_SHARED_IRQ_HANDLERS 0
#endif #endif
// PICO_CONFIG: PICO_VTABLE_PER_CORE, user is using separate vector tables per core, type=bool, default=0, group=hardware_irq
#ifndef PICO_VTABLE_PER_CORE
#define PICO_VTABLE_PER_CORE 0
#endif
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
#include "pico.h" #include "pico.h"

18
src/rp2_common/hardware_irq/irq.c
View File

@ -15,7 +15,17 @@
extern void __unhandled_user_irq(void); extern void __unhandled_user_irq(void);
#if PICO_VTABLE_PER_CORE
static uint8_t user_irq_claimed[NUM_CORES]; static uint8_t user_irq_claimed[NUM_CORES];
static inline uint8_t *user_irq_claimed_ptr(void) {
return &user_irq_claimed[get_core_num()];
}
#else
static uint8_t user_irq_claimed;
static inline uint8_t *user_irq_claimed_ptr(void) {
return &user_irq_claimed;
}
#endif
static inline irq_handler_t *get_vtable(void) { static inline irq_handler_t *get_vtable(void) {
return (irq_handler_t *) scb_hw->vtor; return (irq_handler_t *) scb_hw->vtor;
@ -435,20 +445,20 @@ static uint get_user_irq_claim_index(uint irq_num) {
} }
void user_irq_claim(uint irq_num) { void user_irq_claim(uint irq_num) {
hw_claim_or_assert(&user_irq_claimed[get_core_num()], get_user_irq_claim_index(irq_num), "User IRQ is already claimed"); hw_claim_or_assert(user_irq_claimed_ptr(), get_user_irq_claim_index(irq_num), "User IRQ is already claimed");
} }
void user_irq_unclaim(uint irq_num) { void user_irq_unclaim(uint irq_num) {
hw_claim_clear(&user_irq_claimed[get_core_num()], get_user_irq_claim_index(irq_num)); hw_claim_clear(user_irq_claimed_ptr(), get_user_irq_claim_index(irq_num));
} }
int user_irq_claim_unused(bool required) { int user_irq_claim_unused(bool required) {
int bit = hw_claim_unused_from_range(&user_irq_claimed[get_core_num()], required, 0, NUM_USER_IRQS - 1, "No user IRQs are available"); int bit = hw_claim_unused_from_range(user_irq_claimed_ptr(), required, 0, NUM_USER_IRQS - 1, "No user IRQs are available");
if (bit >= 0) bit = (int)NUM_IRQS - bit - 1; if (bit >= 0) bit = (int)NUM_IRQS - bit - 1;
return bit; return bit;
} }
bool user_irq_is_claimed(uint irq_num) { bool user_irq_is_claimed(uint irq_num) {
return hw_is_claimed(&user_irq_claimed[get_core_num()], get_user_irq_claim_index(irq_num)); return hw_is_claimed(user_irq_claimed_ptr(), get_user_irq_claim_index(irq_num));
} }

4
src/rp2_common/pico_multicore/multicore.c
View File

@ -114,6 +114,10 @@ void multicore_launch_core1_with_stack(void (*entry)(void), uint32_t *stack_bott
stack_ptr[0] = (uintptr_t) entry; stack_ptr[0] = (uintptr_t) entry;
stack_ptr[1] = (uintptr_t) stack_bottom; stack_ptr[1] = (uintptr_t) stack_bottom;
stack_ptr[2] = (uintptr_t) core1_wrapper; stack_ptr[2] = (uintptr_t) core1_wrapper;
#if PICO_VTABLE_PER_CORE
#warning PICO_VTABLE_PER_CORE==1 is not currently supported in pico_multicore
panic_unsupported();
#endif
multicore_launch_core1_raw(core1_trampoline, stack_ptr, scb_hw->vtor); multicore_launch_core1_raw(core1_trampoline, stack_ptr, scb_hw->vtor);
} }