Remove BL602 timer interrupt

Author: ckormanyos

ref_app/src/mcal/am6254_soc/mcal_gpt.cpp

@@ -11,11 +11,19 @@
 
 auto mcal::gpt::secure::get_time_elapsed() -> mcal::gpt::value_type
 {
-  // Get the system tick from the system counter register.
-  const value_type consistent_microsecond_tick = static_cast<value_type>(ARM64_READ_SYSREG(CNTPCT_EL0));
+  // Get the consistent system tick from the system counter register.
+  const value_type
+    consistent_microsecond_tick
+    {
+      static_cast<value_type>(ARM64_READ_SYSREG(CNTPCT_EL0))
+    };
 
   // Convert the consistent tick to microseconds.
-  return static_cast<value_type>(static_cast<value_type>(consistent_microsecond_tick + UINT64_C(100)) / UINT64_C(200));
+  return
+    static_cast<value_type>
+    (
+      static_cast<value_type>(consistent_microsecond_tick + UINT64_C(100)) / UINT64_C(200)
+    );
 }
 
 auto mcal::gpt::secure::get_time_elapsed_core1() -> mcal::gpt::value_type_core1

ref_app/target/micros/bl602_sifive_e24_riscv/Code/Appli/mcal_gpt.cpp

@@ -5,74 +5,71 @@
 //  or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include "BL602.h"
-
 #include <mcal_gpt.h>
 
-//-----------------------------------------------------------------------------------------
-// Defines
-//-----------------------------------------------------------------------------------------
-namespace
+#include "BL602.h"
+
+namespace local
 {
   constexpr std::uint64_t TIMEOUT_1S { UINT64_C(10000000) };
 
-  // The one (and only one) system tick.
-  volatile auto mcal_gpt_system_tick = mcal::gpt::value_type { };
-
   auto gpt_is_initialized() -> bool& __attribute__((used, noinline));
 
+  auto get_consistent_tick
+  {
+    []()
+    {
+      // Return the system tick using a multiple read to ensure data consistency.
+
+      const volatile std::uint64_t time_first  { CLIC_MTIME };
+      const volatile std::uint64_t time_second { CLIC_MTIME };
+
+      const bool
+        is_steady
+        {
+          (static_cast<std::uint32_t>(time_second) >= static_cast<std::uint32_t>(time_first))
+        };
+
+      return
+        static_cast<mcal::gpt::value_type>
+        (
+          is_steady ? time_first : CLIC_MTIME
+        );
+    }
+  };
+
   auto gpt_is_initialized() -> bool&
   {
-    static auto is_init = bool { };
+    static bool is_init { };
 
     return is_init;
   }
-}
-
-extern "C" void Isr_TIMER_Interrupt (void) __attribute__((interrupt,used,noinline));
-
-extern "C"
-void Isr_TIMER_Interrupt (void)
-{
-  // Set the next timer timeout timeout.
-
-  CLIC_MTIMECMP = (uint64_t)(CLIC_MTIME + TIMEOUT_1S);
-}
+} // namespace local
 
 extern "C" auto mcal_gpt_init() -> void;
 
 extern "C" auto mcal_gpt_init() -> void
 {
-  /* enabled selective hardware vectoring */
-  CLIC_CFG |= 1ul;
-
-  /* enable timer interrupt in CLIC vectored mode */
-  CLIC_INTIE[7] = 1u;
 }
 
 auto mcal::gpt::init(const config_type*) -> void { }
 
 auto mcal::gpt::secure::get_time_elapsed() -> mcal::gpt::value_type
 {
-  if(!gpt_is_initialized())
+  if(!local::gpt_is_initialized())
   {
-    // Set the next timer interrupt timeout.
-    CLIC_MTIMECMP = (uint64_t)(CLIC_MTIME + TIMEOUT_1S);
-
     // Set the is-initialized indication flag.
-    gpt_is_initialized() = true;
+    local::gpt_is_initialized() = true;
   }
 
-  // Return the system tick using a multiple read to ensure data consistency.
-
-  const volatile uint64_t time_first  = CLIC_MTIME;
-  const volatile uint64_t time_second = CLIC_MTIME;
-
-  const volatile bool is_steady = (((uint32_t) time_second > (uint32_t) time_first) ? true : false);
-
-  value_type consistent_microsecond_tick = (is_steady ? time_first : CLIC_MTIME);
-
-  consistent_microsecond_tick /= 10U;
-
-  return consistent_microsecond_tick;
+  // Convert the consistent tick to microseconds.
+  return
+    static_cast<mcal::gpt::value_type>
+    (
+      static_cast<mcal::gpt::value_type>
+      (
+          static_cast<mcal::gpt::value_type>(local::get_consistent_tick() + UINT32_C(5))
+        / UINT32_C(10)
+      )
+    );
 }

ref_app/target/micros/bl602_sifive_e24_riscv/startup/intvect.c

@@ -35,7 +35,7 @@ static void UndefinedHandler(void);
 static void UndefinedHandler(void){ for(;;); }
 
 void Isr_SW_Interrupt      (void) __attribute__((weak, alias("UndefinedHandler")));
-void Isr_TIMER_Interrupt   (void) __attribute__((interrupt,used,noinline));
+void Isr_TIMER_Interrupt   (void) __attribute__((weak, alias("UndefinedHandler")));
 void Isr_Ext_Interrupt     (void) __attribute__((weak, alias("UndefinedHandler")));
 void Isr_CLIC_SW_Interrupt (void) __attribute__((weak, alias("UndefinedHandler")));
 void L1C_BMX_ERR           (void) __attribute__((weak, alias("UndefinedHandler")));