blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-13 11:09:12 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/systick_loop_v5.1' into 'release/v5.1'

Browse Source 
freertos: Fix Systick stuck when systimer was not reset (v5.1)

See merge request espressif/esp-idf!24321
This commit is contained in:
Marius Vikhammer 2023-07-03 20:34:58 +08:00
commit 7d72773d88
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/freertos/FreeRTOS-Kernel-SMP/portable/riscv/port.c
View File

@ -153,7 +153,10 @@ void vPortSetupTimer(void)
systimer_ll_apply_counter_value(systimer_hal.dev, SYSTIMER_COUNTER_OS_TICK); systimer_ll_apply_counter_value(systimer_hal.dev, SYSTIMER_COUNTER_OS_TICK);
for (cpuid = 0; cpuid < SOC_CPU_CORES_NUM; cpuid++) { for (cpuid = 0; cpuid < SOC_CPU_CORES_NUM; cpuid++) {
// Set stall option and alarm mode to default state. Below they will be set to a required state.
systimer_hal_counter_can_stall_by_cpu(&systimer_hal, SYSTIMER_COUNTER_OS_TICK, cpuid, false); systimer_hal_counter_can_stall_by_cpu(&systimer_hal, SYSTIMER_COUNTER_OS_TICK, cpuid, false);
uint32_t alarm_id = SYSTIMER_ALARM_OS_TICK_CORE0 + cpuid;
systimer_hal_select_alarm_mode(&systimer_hal, alarm_id, SYSTIMER_ALARM_MODE_ONESHOT);
} }
for (cpuid = 0; cpuid < portNUM_PROCESSORS; ++cpuid) { for (cpuid = 0; cpuid < portNUM_PROCESSORS; ++cpuid) {

3
components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/port.c
View File

@ -243,7 +243,10 @@ void vPortSetupTimer(void)
systimer_ll_apply_counter_value(systimer_hal.dev, SYSTIMER_COUNTER_OS_TICK); systimer_ll_apply_counter_value(systimer_hal.dev, SYSTIMER_COUNTER_OS_TICK);
for (cpuid = 0; cpuid < SOC_CPU_CORES_NUM; cpuid++) { for (cpuid = 0; cpuid < SOC_CPU_CORES_NUM; cpuid++) {
// Set stall option and alarm mode to default state. Below they will be set to a required state.
systimer_hal_counter_can_stall_by_cpu(&systimer_hal, SYSTIMER_COUNTER_OS_TICK, cpuid, false); systimer_hal_counter_can_stall_by_cpu(&systimer_hal, SYSTIMER_COUNTER_OS_TICK, cpuid, false);
uint32_t alarm_id = SYSTIMER_ALARM_OS_TICK_CORE0 + cpuid;
systimer_hal_select_alarm_mode(&systimer_hal, alarm_id, SYSTIMER_ALARM_MODE_ONESHOT);
} }
for (cpuid = 0; cpuid < portNUM_PROCESSORS; ++cpuid) { for (cpuid = 0; cpuid < portNUM_PROCESSORS; ++cpuid) {

3
components/freertos/FreeRTOS-Kernel/portable/port_systick.c
View File

@ -92,7 +92,10 @@ void vPortSetupTimer(void)
systimer_ll_apply_counter_value(systimer_hal.dev, SYSTIMER_COUNTER_OS_TICK); systimer_ll_apply_counter_value(systimer_hal.dev, SYSTIMER_COUNTER_OS_TICK);
for (cpuid = 0; cpuid < SOC_CPU_CORES_NUM; cpuid++) { for (cpuid = 0; cpuid < SOC_CPU_CORES_NUM; cpuid++) {
// Set stall option and alarm mode to default state. Below they will be set to a required state.
systimer_hal_counter_can_stall_by_cpu(&systimer_hal, SYSTIMER_COUNTER_OS_TICK, cpuid, false); systimer_hal_counter_can_stall_by_cpu(&systimer_hal, SYSTIMER_COUNTER_OS_TICK, cpuid, false);
uint32_t alarm_id = SYSTIMER_ALARM_OS_TICK_CORE0 + cpuid;
systimer_hal_select_alarm_mode(&systimer_hal, alarm_id, SYSTIMER_ALARM_MODE_ONESHOT);
} }
for (cpuid = 0; cpuid < portNUM_PROCESSORS; ++cpuid) { for (cpuid = 0; cpuid < portNUM_PROCESSORS; ++cpuid) {