1 files changed, 35 insertions, 19 deletions

diff --git a/bsps/shared/dev/clock/clockimpl.h b/bsps/shared/dev/clock/clockimpl.h
index e922c0b320..b27f7c15bc 100644
--- a/bsps/shared/dev/clock/clockimpl.h
+++ b/bsps/shared/dev/clock/clockimpl.h
@@ -42,6 +42,7 @@
 #include <bsp.h>
 #include <rtems/clockdrv.h>
 #include <rtems/score/percpu.h>
+#include <rtems/score/processormaskimpl.h>
 #include <rtems/score/smpimpl.h>
 #include <rtems/score/timecounter.h>
 #include <rtems/score/thread.h>
@@ -63,6 +64,13 @@
 #error "Fast Idle PLUS n ISRs per tick is not supported"
 #endif
 
+#if defined(BSP_FEATURE_IRQ_EXTENSION) || \
+    (CPU_SIMPLE_VECTORED_INTERRUPTS != TRUE)
+typedef void * Clock_isr_argument;
+#else
+typedef rtems_vector_number Clock_isr_argument;
+#endif
+
 /**
  * @brief Do nothing by default.
  */
@@ -81,7 +89,7 @@
  * @brief Do nothing by default.
  */
 #ifndef Clock_driver_support_at_tick
-  #define Clock_driver_support_at_tick()
+  #define Clock_driver_support_at_tick( arg ) do { (void) arg; } while (0)
 #endif
 
 /**
@@ -96,8 +104,9 @@
  * instead of the default.
  */
 #ifndef Clock_driver_timecounter_tick
-static void Clock_driver_timecounter_tick( void )
+static void Clock_driver_timecounter_tick( Clock_isr_argument arg )
 {
+  (void) arg;
 #if defined(CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER)
   rtems_clock_tick();
 #elif defined(RTEMS_SMP) && defined(CLOCK_DRIVER_USE_ONLY_BOOT_PROCESSOR)
@@ -139,25 +148,31 @@ volatile uint32_t    Clock_driver_ticks;
 #error "Clock_driver_support_shutdown_hardware() is no longer supported"
 #endif
 
+#if CLOCK_DRIVER_USE_FAST_IDLE
+static bool _Clock_Has_watchdogs(const Per_CPU_Control *cpu)
+{
+  size_t i;
+
+  for (i = 0; i < RTEMS_ARRAY_SIZE(cpu->Watchdog.Header); ++i) {
+    if (_Watchdog_Header_first(&cpu->Watchdog.Header[i]) != NULL) {
+      return true;
+    }
+  }
+
+  return false;
+}
+#endif
+
 /**
  *  @brief Clock_isr
  *
  *  This is the clock tick interrupt handler.
  *
- *  @param vector Vector number.
+ *  @param arg is the clock interrupt handler argument.
  */
-#if defined(BSP_FEATURE_IRQ_EXTENSION) || \
-    (CPU_SIMPLE_VECTORED_INTERRUPTS != TRUE)
-void Clock_isr(void *arg);
-void Clock_isr(void *arg)
-{
-#else
-rtems_isr Clock_isr(rtems_vector_number vector);
-rtems_isr Clock_isr(
-  rtems_vector_number vector
-)
+void Clock_isr( Clock_isr_argument arg );
+void Clock_isr( Clock_isr_argument arg )
 {
-#endif
   /*
    *  Accurate count of ISRs
    */
@@ -165,7 +180,7 @@ rtems_isr Clock_isr(
 
   #if CLOCK_DRIVER_USE_FAST_IDLE
     {
-      Clock_driver_timecounter_tick();
+      Clock_driver_timecounter_tick( arg );
 
       if (_SMP_Get_processor_maximum() == 1) {
         struct timecounter *tc;
@@ -182,6 +197,7 @@ rtems_isr Clock_isr(
           cpu_self->thread_dispatch_disable_level == cpu_self->isr_nest_level
             && cpu_self->heir == cpu_self->executing
             && cpu_self->executing->is_idle
+            && _Clock_Has_watchdogs(cpu_self)
         ) {
           ISR_lock_Context lock_context;
 
@@ -194,7 +210,7 @@ rtems_isr Clock_isr(
         }
       }
 
-      Clock_driver_support_at_tick();
+      Clock_driver_support_at_tick( arg );
     }
   #else
     /*
@@ -202,14 +218,14 @@ rtems_isr Clock_isr(
      *
      *  The counter/timer may or may not be set to automatically reload.
      */
-    Clock_driver_support_at_tick();
+    Clock_driver_support_at_tick( arg );
 
     #if CLOCK_DRIVER_ISRS_PER_TICK
       /*
        *  The driver is multiple ISRs per clock tick.
        */
       if ( !Clock_driver_isrs ) {
-        Clock_driver_timecounter_tick();
+        Clock_driver_timecounter_tick( arg );
 
         Clock_driver_isrs = CLOCK_DRIVER_ISRS_PER_TICK_VALUE;
       }
@@ -218,7 +234,7 @@ rtems_isr Clock_isr(
       /*
        *  The driver is one ISR per clock tick.
        */
-      Clock_driver_timecounter_tick();
+      Clock_driver_timecounter_tick( arg );
     #endif
   #endif
 }