From ac562d537b44c6d858ea9791cad301c5af427b6e Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Thu, 13 Dec 2018 15:54:40 -0600 Subject: [PATCH] soc: arm: Don't touch interrupts in kinetis watchdog init 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 --- soc/arm/nxp_kinetis/k6x/wdog.S | 4 ---- soc/arm/nxp_kinetis/kwx/wdog.S | 4 ---- 2 files changed, 8 deletions(-) diff --git a/soc/arm/nxp_kinetis/k6x/wdog.S b/soc/arm/nxp_kinetis/k6x/wdog.S index 52cbc3af2af..b505095385a 100644 --- a/soc/arm/nxp_kinetis/k6x/wdog.S +++ b/soc/arm/nxp_kinetis/k6x/wdog.S @@ -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 diff --git a/soc/arm/nxp_kinetis/kwx/wdog.S b/soc/arm/nxp_kinetis/kwx/wdog.S index d80b6ee3ba6..1f1c51ec604 100644 --- a/soc/arm/nxp_kinetis/kwx/wdog.S +++ b/soc/arm/nxp_kinetis/kwx/wdog.S @@ -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