alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

esp32: Dis interrupts up to 5 lvl for DPORT

Browse Source 
Disable interrupts for both DPORT workarounds up to 5 lvl.

Closes: https://esp32.com/viewtopic.php?f=2&t=10981&sid=d125cec233070ed4d2c5410bf5d3d74a
Closes: IDF-728
This commit is contained in:
Konstantin Kondrashov 2019-06-25 19:23:10 +08:00 committed by bot
parent ca1e5e5bc5
commit 76f97f3abd
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp32/Kconfig
View File

@ -1022,6 +1022,13 @@ config ESP32_RTCDATA_IN_FAST_MEM
This option depends on the CONFIG_FREERTOS_UNICORE option because RTC fast memory This option depends on the CONFIG_FREERTOS_UNICORE option because RTC fast memory
can be accessed only by PRO_CPU core. can be accessed only by PRO_CPU core.
config ESP32_DPORT_DIS_INTERRUPT_LVL
int "Disable the interrupt level for the DPORT workarounds"
default 5
help
To prevent interrupting DPORT workarounds,
need to disable interrupt with a maximum used level in the system.
endmenu # ESP32-Specific endmenu # ESP32-Specific
menu Wi-Fi menu Wi-Fi
@ -1306,7 +1313,6 @@ config ESP32_PHY_MAX_TX_POWER
endmenu # PHY endmenu # PHY
menu "Power Management" menu "Power Management"
config PM_ENABLE config PM_ENABLE

2
components/esp32/dport_access.c
View File

@ -256,7 +256,7 @@ uint32_t IRAM_ATTR esp_dport_access_reg_read(uint32_t reg)
unsigned int intLvl; unsigned int intLvl;
__asm__ __volatile__ (\ __asm__ __volatile__ (\
"movi %[APB], "XTSTR(0x3ff40078)"\n"\ "movi %[APB], "XTSTR(0x3ff40078)"\n"\
"rsil %[LVL], "XTSTR(3)"\n"\ "rsil %[LVL], "XTSTR(CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL)"\n"\
"l32i %[APB], %[APB], 0\n"\ "l32i %[APB], %[APB], 0\n"\
"l32i %[REG], %[REG], 0\n"\ "l32i %[REG], %[REG], 0\n"\
"wsr %[LVL], "XTSTR(PS)"\n"\ "wsr %[LVL], "XTSTR(PS)"\n"\

9
components/esp32/dport_panic_highint_hdl.S
View File

@ -31,9 +31,10 @@ Interrupt , a high-priority interrupt, is used for several things:
*/ */
#define L4_INTR_STACK_SIZE 8 #define L4_INTR_STACK_SIZE 12
#define L4_INTR_A2_OFFSET 0 #define L4_INTR_A2_OFFSET 0
#define L4_INTR_A3_OFFSET 4 #define L4_INTR_A3_OFFSET 4
#define L4_INTR_A4_OFFSET 8
.data .data
_l4_intr_stack: _l4_intr_stack:
.space L4_INTR_STACK_SIZE .space L4_INTR_STACK_SIZE
@ -145,10 +146,11 @@ xt_highint4:
movi a0, (1<<ETS_DPORT_INUM) movi a0, (1<<ETS_DPORT_INUM)
wsr a0, INTCLEAR wsr a0, INTCLEAR
/* Save A2, A3 so we can use those registers */ /* Save A2, A3, A4 so we can use those registers */
movi a0, _l4_intr_stack movi a0, _l4_intr_stack
s32i a2, a0, L4_INTR_A2_OFFSET s32i a2, a0, L4_INTR_A2_OFFSET
s32i a3, a0, L4_INTR_A3_OFFSET s32i a3, a0, L4_INTR_A3_OFFSET
s32i a4, a0, L4_INTR_A4_OFFSET
/* handle dport interrupt */ /* handle dport interrupt */
/* get CORE_ID */ /* get CORE_ID */
@ -168,6 +170,7 @@ xt_highint4:
s32i a2, a0, 0 /* clear intr */ s32i a2, a0, 0 /* clear intr */
movi a0, 1 /* other cpu id */ movi a0, 1 /* other cpu id */
3: 3:
rsil a4, CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL /* disable nested iterrupt */
/* set and wait flag */ /* set and wait flag */
movi a2, dport_access_start movi a2, dport_access_start
addx4 a2, a0, a2 addx4 a2, a0, a2
@ -180,10 +183,12 @@ xt_highint4:
l32i a3, a2, 0 l32i a3, a2, 0
beqz a3, .check_dport_access_end beqz a3, .check_dport_access_end
wsr a4, PS /* restore iterrupt level */
/* Done. Restore registers and return. */ /* Done. Restore registers and return. */
movi a0, _l4_intr_stack movi a0, _l4_intr_stack
l32i a2, a0, L4_INTR_A2_OFFSET l32i a2, a0, L4_INTR_A2_OFFSET
l32i a3, a0, L4_INTR_A3_OFFSET l32i a3, a0, L4_INTR_A3_OFFSET
l32i a4, a0, L4_INTR_A4_OFFSET
rsync /* ensure register restored */ rsync /* ensure register restored */
rsr a0, EXCSAVE_4 /* restore a0 */ rsr a0, EXCSAVE_4 /* restore a0 */

2
components/esp32/include/esp_dport_access.h
View File

@ -41,7 +41,7 @@ void esp_dport_access_int_abort(void);
#else #else
#define DPORT_STALL_OTHER_CPU_START() esp_dport_access_stall_other_cpu_start() #define DPORT_STALL_OTHER_CPU_START() esp_dport_access_stall_other_cpu_start()
#define DPORT_STALL_OTHER_CPU_END() esp_dport_access_stall_other_cpu_end() #define DPORT_STALL_OTHER_CPU_END() esp_dport_access_stall_other_cpu_end()
#define DPORT_INTERRUPT_DISABLE() unsigned int intLvl = XTOS_SET_INTLEVEL(XCHAL_EXCM_LEVEL) #define DPORT_INTERRUPT_DISABLE() unsigned int intLvl = XTOS_SET_INTLEVEL(CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL)
#define DPORT_INTERRUPT_RESTORE() XTOS_RESTORE_JUST_INTLEVEL(intLvl) #define DPORT_INTERRUPT_RESTORE() XTOS_RESTORE_JUST_INTLEVEL(intLvl)
#endif #endif