diff options
| author | Chris Webb <chris@arachsys.com> | 2025-09-09 15:40:51 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2025-09-25 23:59:24 +1000 |
| commit | 81985d20c98e1550c355263f1d6c7bd6150ee0b4 (patch) | |
| tree | 94a7e824b29d4fdbc41fb75cfed91d1bbb2ed693 /ports/zephyr/machine_timer.c | |
| parent | b9523fd58c02dba74239015bf6b2a1983342a06b (diff) | |
shared/runtime/mpirq: Check separate hard IRQ stack correctly.
On the zephyr port, hard IRQ handlers run with a separate stack on a
different thread, so each call to mp_irq_dispatch() and mp_irq_handler()
has to be wrapped with adjustments to the stack-limit checker.
Move these adjustments into the shared mp_irq_dispatch(), introducing
MICROPY_STACK_SIZE_HARD_IRQ which a port can define to non-zero if it
uses a separate stack for hard IRQ handlers. We only need wrap the hard
dispatch case. This should reduce binary size on zephyr without affecting
other ports.
Signed-off-by: Chris Webb <chris@arachsys.com>
Diffstat (limited to 'ports/zephyr/machine_timer.c')
| -rw-r--r-- | ports/zephyr/machine_timer.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/ports/zephyr/machine_timer.c b/ports/zephyr/machine_timer.c index 410e86762..4b660849f 100644 --- a/ports/zephyr/machine_timer.c +++ b/ports/zephyr/machine_timer.c @@ -66,16 +66,6 @@ static mp_obj_t machine_timer_deinit(mp_obj_t self_in); static void machine_timer_callback(struct k_timer *timer) { machine_timer_obj_t *self = (machine_timer_obj_t *)k_timer_user_data_get(timer); - #if MICROPY_STACK_CHECK - // This callback executes in an ISR context so the stack-limit check must - // be changed to use the ISR stack for the duration of this function (so - // that hard IRQ callbacks work). - char *orig_stack_top = MP_STATE_THREAD(stack_top); - size_t orig_stack_limit = MP_STATE_THREAD(stack_limit); - MP_STATE_THREAD(stack_top) = (void *)&self; - MP_STATE_THREAD(stack_limit) = CONFIG_ISR_STACK_SIZE - 512; - #endif - if (mp_irq_dispatch(self->callback, MP_OBJ_FROM_PTR(self), self->ishard) < 0) { // Uncaught exception; disable the callback so it doesn't run again. self->mode = TIMER_MODE_ONE_SHOT; @@ -84,12 +74,6 @@ static void machine_timer_callback(struct k_timer *timer) { if (self->mode == TIMER_MODE_ONE_SHOT) { machine_timer_deinit(self); } - - #if MICROPY_STACK_CHECK - // Restore original stack-limit checking values. - MP_STATE_THREAD(stack_top) = orig_stack_top; - MP_STATE_THREAD(stack_limit) = orig_stack_limit; - #endif } static void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { |