djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7196 from dhalbert/rp2-pin-alarm-race

Browse Source 
RP2040: ignore pin changes before deep sleep
This commit is contained in:
Dan Halbert 2022-11-12 09:36:15 -05:00 committed by GitHub
commit 9e94d7e758
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/raspberrypi/common-hal/alarm/__init__.c
View File

@ -234,6 +234,9 @@ void NORETURN common_hal_alarm_enter_deep_sleep(void) {
// Reset uses the watchdog. Use scratch registers to store wake reason // Reset uses the watchdog. Use scratch registers to store wake reason
watchdog_hw->scratch[RP_WKUP_SCRATCH_REG] = _get_wakeup_cause(); watchdog_hw->scratch[RP_WKUP_SCRATCH_REG] = _get_wakeup_cause();
// Just before reset, enable the pinalarm interrupt.
alarm_pin_pinalarm_entering_deep_sleep();
reset_cpu(); reset_cpu();
} }

23
ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c
View File

@ -38,7 +38,7 @@
STATIC bool woke_up; STATIC bool woke_up;
STATIC uint64_t alarm_triggered_pins; // 36 actual pins STATIC uint64_t alarm_triggered_pins; // 36 actual pins
STATIC uint64_t alarm_reserved_pins; // 36 actual pins STATIC uint64_t alarm_reserved_pins; // 36 actual pins
STATIC bool _pinalarm_set = false; STATIC bool _not_yet_deep_sleeping = false;
#define GPIO_IRQ_ALL_EVENTS 0x15u #define GPIO_IRQ_ALL_EVENTS 0x15u
@ -46,13 +46,22 @@ STATIC void gpio_callback(uint gpio, uint32_t events) {
alarm_triggered_pins |= (1 << gpio); alarm_triggered_pins |= (1 << gpio);
woke_up = true; woke_up = true;
// does this need to be called, to prevent IRQ from constantly going off? // gpio_acknowledge_irq(gpio, events) is called automatically, before this callback is called.
gpio_acknowledge_irq(gpio, events);
// Disable IRQ automatically if (_not_yet_deep_sleeping) {
// Event went off prematurely, before we went to sleep, so set it again.
gpio_set_irq_enabled(gpio, events, false);
} else {
// Went off during sleep.
// Disable IRQ automatically.
gpio_set_irq_enabled(gpio, events, false); gpio_set_irq_enabled(gpio, events, false);
gpio_set_dormant_irq_enabled(gpio, events, false); gpio_set_dormant_irq_enabled(gpio, events, false);
} }
}
void alarm_pin_pinalarm_entering_deep_sleep() {
_not_yet_deep_sleeping = false;
}
void common_hal_alarm_pin_pinalarm_construct(alarm_pin_pinalarm_obj_t *self, const mcu_pin_obj_t *pin, bool value, bool edge, bool pull) { void common_hal_alarm_pin_pinalarm_construct(alarm_pin_pinalarm_obj_t *self, const mcu_pin_obj_t *pin, bool value, bool edge, bool pull) {
self->pin = pin; self->pin = pin;
@ -156,11 +165,7 @@ void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_ob
gpio_set_dormant_irq_enabled((uint)alarm->pin->number, event, true); gpio_set_dormant_irq_enabled((uint)alarm->pin->number, event, true);
} }
_pinalarm_set = true; _not_yet_deep_sleeping = true;
} }
} }
} }
bool alarm_pin_pinalarm_is_set(void) {
return _pinalarm_set;
}

2
ports/raspberrypi/common-hal/alarm/pin/PinAlarm.h
View File

@ -46,4 +46,4 @@ void alarm_pin_pinalarm_reset(void);
void alarm_pin_pinalarm_light_reset(void); void alarm_pin_pinalarm_light_reset(void);
void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms); void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms);
bool alarm_pin_pinalarm_woke_this_cycle(void); bool alarm_pin_pinalarm_woke_this_cycle(void);
bool alarm_pin_pinalarm_is_set(void); void alarm_pin_pinalarm_entering_deep_sleep(void);