michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc: arm: Don't touch interrupts in kinetis watchdog init

Browse source 
The early boot watchdog init for kinetis was incorrectly disabling and
reenabling interrupts to preserve timing during the unlock sequence.
However, interrupts are already disabled before this routine executes
and the kernel is not yet ready to enable them when this routine exits.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
This commit is contained in:
Maureen Helm 2018-12-13 15:54:40 -06:00 • committed by Kumar Gala
commit ac562d537b
2 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
soc/arm/nxp_kinetis/k6x/wdog.S
View file

@ -50,8 +50,6 @@ SECTION_FUNC(TEXT,_WdogInit)
* interrupts to keep the code atomic and ensure the timing.
*/
cpsid i
ldr r0, =PERIPH_ADDR_BASE_WDOG
movw r1, #WDOG_UNLOCK_1_CMD
@ -72,7 +70,5 @@ SECTION_FUNC(TEXT,_WdogInit)
bics r1, r2
strh r1, [r0, #WDOG_SCTRL_HI_OFFSET]
cpsie i
bx lr

4
soc/arm/nxp_kinetis/kwx/wdog.S
View file

@ -50,8 +50,6 @@ SECTION_FUNC(TEXT,_WdogInit)
* interrupts to keep the code atomic and ensure the timing.
*/
cpsid i
ldr r0, =PERIPH_ADDR_BASE_WDOG
movw r1, #WDOG_UNLOCK_1_CMD
@ -72,7 +70,5 @@ SECTION_FUNC(TEXT,_WdogInit)
bics r1, r2
strh r1, [r0, #WDOG_SCTRL_HI_OFFSET]
cpsie i
bx lr