Commit19844b4

mungewell

authored and

dpgeorge

committed

rp2/modmachine: Prevent lock-up when lightsleep() called within thread.

When `lightsleep()` is called from within a thread the interrupts may notbe enabled on current core, and thus the call to `lightsleep()` nevercompletes.Fixes issue#14092.Signed-off-by: Simon Wood <simon@mungewell.org>

1 parentf76cf29 commit19844b4Copy full SHA for 19844b4

File tree

1 file changed

+13

-3

lines changed

ports/rp2
- modmachine.c

1 file changed

+13

-3

lines changed

`‎ports/rp2/modmachine.c`

Lines changed: 13 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -127,10 +127,10 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {`
`127`	`127`
`128`	`128`	`constuint32_txosc_hz=XOSC_MHZ*1000000;`
`129`	`129`
`130`		`-uint32_tmy_interrupts=save_and_disable_interrupts();`
	`130`	`+uint32_tmy_interrupts=mp_thread_begin_atomic_section();`
`131`	`131`	`#ifMICROPY_PY_NETWORK_CYW43`
`132`	`132`	`if (cyw43_has_pending&&cyw43_poll!=NULL) {`
`133`		`-restore_interrupts(my_interrupts);`
	`133`	`+mp_thread_end_atomic_section(my_interrupts);`
`134`	`134`	`return;`
`135`	`135`	`}`
`136`	`136`	`#endif`
`@@ -165,8 +165,15 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {`
`165`	`165`	`}else {`
`166`	`166`	`uint32_tsleep_en0=clocks_hw->sleep_en0;`
`167`	`167`	`uint32_tsleep_en1=clocks_hw->sleep_en1;`
	`168`	`+booltimer3_enabled=irq_is_enabled(3);`
	`169`	`+`
`168`	`170`	`clocks_hw->sleep_en0=CLOCKS_SLEEP_EN0_CLK_RTC_RTC_BITS;`
`169`	`171`	`if (use_timer_alarm) {`
	`172`	`+// Make sure ALARM3/IRQ3 is enabled on _this_ core`
	`173`	`+timer_hw->inte \|=1 <<3;`
	`174`	`+if (!timer3_enabled) {`
	`175`	`+irq_set_enabled(3, true);`
	`176`	`+ }`
`170`	`177`	`// Use timer alarm to wake.`
`171`	`178`	`clocks_hw->sleep_en1=CLOCKS_SLEEP_EN1_CLK_SYS_TIMER_BITS;`
`172`	`179`	`timer_hw->alarm[3]=timer_hw->timerawl+delay_ms*1000;`
`@@ -177,6 +184,9 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {`
`177`	`184`	`scb_hw->scr \|=M0PLUS_SCR_SLEEPDEEP_BITS;`
`178`	`185`	`__wfi();`
`179`	`186`	`scb_hw->scr &= ~M0PLUS_SCR_SLEEPDEEP_BITS;`
	`187`	`+if (!timer3_enabled) {`
	`188`	`+irq_set_enabled(3, false);`
	`189`	`+ }`
`180`	`190`	`clocks_hw->sleep_en0=sleep_en0;`
`181`	`191`	`clocks_hw->sleep_en1=sleep_en1;`
`182`	`192`	`}`
`@@ -186,7 +196,7 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {`
`186`	`196`
`187`	`197`	`// Bring back all clocks.`
`188`	`198`	`clocks_init();`
`189`		`-restore_interrupts(my_interrupts);`
	`199`	`+mp_thread_end_atomic_section(my_interrupts);`
`190`	`200`	`}`
`191`	`201`
`192`	`202`	`NORETURNstaticvoidmp_machine_deepsleep(size_tn_args,constmp_obj_t*args) {`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit19844b4

File tree

1 file changed

1 file changed

`‎ports/rp2/modmachine.c`

0 commit comments