[BH-1873] Update FreeRTOS ticks before re-enabling interrupts

Fix of the issue that when leaving WFI mode
interrupts were being enabled before catching
up FreeRTOS ticks, what resulted in IRQ
handlers working on out-of-date system tick
counter.

Author: Lefucjusz

module-bsp/board/linux/lpm/LinuxLPM.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "LinuxLPM.h"
@@ -56,4 +56,11 @@ namespace bsp
     void LinuxLPM::EnableSysTick()
     {}
 
+    std::uint32_t LinuxLPM::DisableInterrupts()
+    {
+        return 0;
+    }
+
+    void LinuxLPM::EnableInterrupts([[maybe_unused]] std::uint32_t primask)
+    {}
 } // namespace bsp

module-bsp/board/linux/lpm/LinuxLPM.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -26,5 +26,8 @@ namespace bsp
 
         void DisableSysTick() final;
         void EnableSysTick() final;
+
+        std::uint32_t DisableInterrupts() final;
+        void EnableInterrupts(std::uint32_t primask) final;
     };
 } // namespace bsp

module-bsp/board/rt1051/bellpx/bsp/KeyInputCommon.hpp

@@ -1,21 +1,21 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
 namespace bsp
 {
-    enum class NotificationSource : uint8_t
+    enum class NotificationSource : std::uint8_t
     {
-        leftSideKeyPress = 1,
-        leftSideKeyRelease,
-        rightSideKeyPress,
-        rightSideKeyRelease,
-        lightCenterKeyPress,
-        lightCenterKeyRelease,
-        latchKeyPress,
-        latchKeyRelease,
-        rotaryEncoder,
+        LeftSideKeyPress = 1,
+        LeftSideKeyRelease,
+        RightSideKeyPress,
+        RightSideKeyRelease,
+        LightCenterKeyPress,
+        LightCenterKeyRelease,
+        LatchKeyPress,
+        LatchKeyRelease,
+        RotaryEncoder,
         Invalid = 0xFF
     };
 } // namespace bsp

module-bsp/board/rt1051/bellpx/bsp/lpm/RT1051LPM.cpp

@@ -1,8 +1,9 @@
-// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "RT1051LPM.hpp"
 #include "WfiController.hpp"
+#include <fsl_common.h>
 
 namespace bsp
 {
@@ -31,4 +32,28 @@ namespace bsp
     {
         return getLastTimeSpentInWfi();
     }
+
+    void RT1051LPM::DisableSysTick()
+    {
+        SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
+        NVIC_ClearPendingIRQ(SysTick_IRQn);
+    }
+
+    void RT1051LPM::EnableSysTick()
+    {
+        SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
+    }
+
+    std::uint32_t RT1051LPM::DisableInterrupts()
+    {
+        const auto primask = DisableGlobalIRQ();
+        __DSB();
+        __ISB();
+        return primask;
+    }
+
+    void RT1051LPM::EnableInterrupts(std::uint32_t primask)
+    {
+        EnableGlobalIRQ(primask);
+    }
 } // namespace bsp

module-bsp/board/rt1051/bellpx/bsp/lpm/RT1051LPM.hpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -15,7 +15,14 @@ namespace bsp
 
         void AllowEnteringWfiMode() final;
         void BlockEnteringWfiMode() final;
+
         std::uint32_t EnterWfiModeIfAllowed() final;
         std::uint32_t GetLastTimeSpentInWfi() final;
+
+        void DisableSysTick() final;
+        void EnableSysTick() final;
+
+        std::uint32_t DisableInterrupts() final;
+        void EnableInterrupts(std::uint32_t primask) final;
     };
 } // namespace bsp

module-bsp/board/rt1051/bellpx/bsp/lpm/WfiController.cpp

@@ -91,17 +91,6 @@ namespace bsp
         {
             return ((PMU->REG_2P5 & PMU_REG_2P5_BO_VDD2P5_MASK) != 0);
         }
-
-        void disableSystick()
-        {
-            SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
-            NVIC_ClearPendingIRQ(SysTick_IRQn);
-        }
-
-        void enableSystick()
-        {
-            SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
-        }
     } // namespace
 
     void allowEnteringWfiMode()
@@ -141,13 +130,8 @@ namespace bsp
         setWaitModeConfig();
         peripheralEnterDozeMode();
 
-        disableSystick();
         const auto enterWfiTicks = ulHighFrequencyTimerTicks();
 
-        const auto savedPrimask = DisableGlobalIRQ();
-        __DSB();
-        __ISB();
-
         /* Clear the SLEEPDEEP bit to go into sleep mode (WAIT) */
         SCB->SCR &= ~SCB_SCR_SLEEPDEEP_Msk;
 
@@ -160,16 +144,14 @@ namespace bsp
         __NOP();
 
         const auto exitWfiTicks = ulHighFrequencyTimerTicks();
-        enableSystick();
+        timeSpentInWFI          = ulHighFrequencyTimerTicksToMs(utils::computeIncrease(exitWfiTicks, enterWfiTicks));
 
         peripheralExitDozeMode();
+        setRunModeConfig();
         watchdog::refresh();
-        EnableGlobalIRQ(savedPrimask);
 
         blockEnteringWfiMode();
-        setRunModeConfig();
 
-        timeSpentInWFI = ulHighFrequencyTimerTicksToMs(utils::computeIncrease(exitWfiTicks, enterWfiTicks));
         return timeSpentInWFI;
     }
 } // namespace bsp

module-bsp/board/rt1051/bellpx/bsp/rotary_encoder/rotary_encoder.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "rotary_encoder.hpp"
@@ -91,7 +91,7 @@ namespace bsp::rotary_encoder
     {
         BaseType_t xHigherPriorityTaskWoken = pdFALSE;
         if (gHandleIrq != nullptr) {
-            std::uint8_t val = static_cast<std::uint8_t>(NotificationSource::rotaryEncoder);
+            std::uint8_t val = static_cast<std::uint8_t>(NotificationSource::RotaryEncoder);
             xQueueSendFromISR(gHandleIrq, &val, &xHigherPriorityTaskWoken);
         }
         return xHigherPriorityTaskWoken;