NotificationsYou must be signed in to change notification settings
Fork8.2k
Star20.4k

Commit50cfd54

committed

rp2: Sleep changes.

Stop using soft timer for mp_wfe_or_timeout. Now uses the alarm poolagain as issues with this code have been fixed. This resolves the "sev"issue that stops the rp2 port going idle.Change the sleep code to use the hardware timer library and alarm 2 asalarm 3 is used by the alarm poolSigned-off-by: Peter Harper <peter.harper@raspberrypi.com>

1 parent2a3a22d commit50cfd54Copy full SHA for 50cfd54

File tree

3 files changed

+20

-27

lines changed

ports/rp2

3 files changed

+20

-27

lines changed

`‎ports/rp2/main.c`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,6 @@ int main(int argc, char **argv) {`
`85`	`85`	`#endif`
`86`	`86`
`87`	`87`	`pendsv_init();`
`88`		`-soft_timer_init();`
`89`	`88`
`90`	`89`	`// Set the MCU frequency and as a side effect the peripheral clock to 48 MHz.`
`91`	`90`	`set_sys_clock_khz(SYS_CLK_KHZ, false);`

`‎ports/rp2/modmachine.c`

Lines changed: 19 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,9 @@ static void mp_machine_idle(void) {`
`121`	`121`	`MICROPY_INTERNAL_WFE(1);`
`122`	`122`	`}`
`123`	`123`
	`124`	`+staticvoidalarm_sleep_callback(uintalarm_id) {`
	`125`	`+}`
	`126`	`+`
`124`	`127`	`staticvoidmp_machine_lightsleep(size_tn_args,constmp_obj_t*args) {`
`125`	`128`	`mp_int_tdelay_ms=0;`
`126`	`129`	`booluse_timer_alarm= false;`
`@@ -190,22 +193,15 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {`
`190`	`193`	`// Disable ROSC.`
`191`	`194`	`rosc_hw->ctrl=ROSC_CTRL_ENABLE_VALUE_DISABLE <<ROSC_CTRL_ENABLE_LSB;`
`192`	`195`
	`196`	`+intalarm_num=2;`
`193`	`197`	`if (n_args==0) {`
`194`	`198`	`#ifMICROPY_PY_NETWORK_CYW43`
`195`	`199`	`gpio_set_dormant_irq_enabled(CYW43_PIN_WL_HOST_WAKE,GPIO_IRQ_LEVEL_HIGH, true);`
`196`	`200`	`#endif`
`197`	`201`	`xosc_dormant();`
`198`	`202`	`}else {`
`199`		`-booltimer3_enabled=irq_is_enabled(3);`
`200`		`-`
`201`		`-constuint32_talarm_num=3;`
`202`		`-constuint32_tirq_num=TIMER_ALARM_IRQ_NUM(timer_hw,alarm_num);`
	`203`	`+hardware_alarm_claim(alarm_num);`
`203`	`204`	`if (use_timer_alarm) {`
`204`		`-// Make sure ALARM3/IRQ3 is enabled on _this_ core`
`205`		`-if (!timer3_enabled) {`
`206`		`-irq_set_enabled(irq_num, true);`
`207`		`- }`
`208`		`-hw_set_bits(&timer_hw->inte,1u <<alarm_num);`
`209`	`205`	`// Use timer alarm to wake.`
`210`	`206`	`clocks_hw->sleep_en0=0x0;`
`211`	`207`	`#ifPICO_RP2040`
`@@ -215,8 +211,12 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {`
`215`	`211`	`#else`
`216`	`212`	`#error Unknown processor`
`217`	`213`	`#endif`
`218`		`-timer_hw->intr=1u <<alarm_num;// clear any IRQ`
`219`		`-timer_hw->alarm[alarm_num]=timer_hw->timerawl+delay_ms*1000;`
	`214`	`+hardware_alarm_set_callback(alarm_num,alarm_sleep_callback);`
	`215`	`+if (hardware_alarm_set_target(alarm_num,make_timeout_time_ms(delay_ms))) {`
	`216`	`+hardware_alarm_set_callback(alarm_num,NULL);`
	`217`	`+hardware_alarm_unclaim(alarm_num);`
	`218`	`+alarm_num=-1;`
	`219`	`+ }`
`220`	`220`	`}else {`
`221`	`221`	`// TODO: Use RTC alarm to wake.`
`222`	`222`	`clocks_hw->sleep_en0=0x0;`
`@@ -246,11 +246,10 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {`
`246`	`246`	`#endif`
`247`	`247`
`248`	`248`	`// Go into low-power mode.`
`249`		`-__wfi();`
`250`		`-`
`251`		`-if (!timer3_enabled) {`
`252`		`-irq_set_enabled(irq_num, false);`
	`249`	`+if (alarm_num >=0) {`
	`250`	`+__wfi();`
`253`	`251`	`}`
	`252`	`+`
`254`	`253`	`clocks_hw->sleep_en0 \|= ~(0u);`
`255`	`254`	`clocks_hw->sleep_en1 \|= ~(0u);`
`256`	`255`	`}`
`@@ -264,6 +263,11 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) {`
`264`	`263`
`265`	`264`	`// Re-sync mp_hal_time_ns() counter with aon timer.`
`266`	`265`	`mp_hal_time_ns_set_from_rtc();`
	`266`	`+if (alarm_num >=0) {`
	`267`	`+hardware_alarm_cancel(alarm_num);`
	`268`	`+hardware_alarm_set_callback(alarm_num,NULL);`
	`269`	`+hardware_alarm_unclaim(alarm_num);`
	`270`	`+ }`
`267`	`271`	`}`
`268`	`272`
`269`	`273`	`NORETURNstaticvoidmp_machine_deepsleep(size_tn_args,constmp_obj_t*args) {`

`‎ports/rp2/mphalport.c`

Lines changed: 1 addition & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -266,15 +266,5 @@ void soft_timer_init(void) {`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`voidmp_wfe_or_timeout(uint32_ttimeout_ms) {`
`269`		`-soft_timer_entry_ttimer;`
`270`		`-`
`271`		`-// Note the timer doesn't have an associated callback, it just exists to create a`
`272`		`-// hardware interrupt to wake the CPU`
`273`		`-soft_timer_static_init(&timer,SOFT_TIMER_MODE_ONE_SHOT,0,NULL);`
`274`		`-soft_timer_insert(&timer,timeout_ms);`
`275`		`-`
`276`		`-__wfe();`
`277`		`-`
`278`		`-// Clean up the timer node if it's not already`
`279`		`-soft_timer_remove(&timer);`
	`269`	`+best_effort_wfe_or_timeout(delayed_by_ms(get_absolute_time(),timeout_ms));`
`280`	`270`	`}`

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!

Commit50cfd54

File tree

3 files changed

3 files changed

`‎ports/rp2/main.c`

`‎ports/rp2/modmachine.c`

`‎ports/rp2/mphalport.c`

0 commit comments