Changeset 435 for trunk/hal/tsar_mips32/drivers/soclib_pic.c

Timestamp:

Feb 20, 2018, 5:32:17 PM (6 years ago)

Author:

alain

Message:

Fix a bad bug in scheduler...

File:

• trunk/hal/tsar_mips32/drivers/soclib_pic.c (modified) (8 diffs)

trunk/hal/tsar_mips32/drivers/soclib_pic.c

@@ -130 +130 @@
                            &pti_status );
 
-    irq_dmsg("\n[DBG] %s : core[%x,%d] enter / WTI = %x / HWI = %x / PTI = %x\n",
-             __FUNCTION__ , local_cxy , core->lid , wti_status , hwi_status , pti_status );
+#if CONFIG_DEBUG_HAL_IRQS
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if (CONFIG_DEBUG_HAL_IRQS < cycle )
+printk("\n[DBG] %s : core[%x,%d] enter / WTI = %x / HWI = %x / PTI = %x / cycle %d\n",
+__FUNCTION__ , local_cxy , core->lid , wti_status , hwi_status , pti_status, cycle );
+#endif
 
     // analyse status and handle up to 3 pending IRQ (one WTI, one HWI, one PTI)
@@ -143 +147 @@
             assert( (index == core->lid) , __FUNCTION__ , "illegal IPI index" );
 
-            irq_dmsg("\n[DBG] %s : core[%x,%d] received an IPI / cycle %d\n",
-             __FUNCTION__ , local_cxy , core->lid , hal_time_stamp() );
-
+#if CONFIG_DEBUG_HAL_IRQS
+if (CONFIG_DEBUG_HAL_IRQS < cycle )
+printk("\n[DBG] %s : core[%x,%d] received an IPI\n", __FUNCTION__ , local_cxy , core->lid );
+#endif
             // acknowledge WTI (this require an XCU read)
             uint32_t   ack  = xcu_base[(XCU_WTI_REG << 5) | core->lid];
@@ -171 +176 @@
             else                                 // call relevant ISR
             {
-                irq_dmsg("\n[DBG] %s : core[%x,%d] received external WTI %d / cycle %d\n",
-                __FUNCTION__ , local_cxy , core->lid , index , hal_time_stamp() );
-
+
+#if CONFIG_DEBUG_HAL_IRQS
+if (CONFIG_DEBUG_HAL_IRQS < cycle )
+printk("\n[DBG] %s : core[%x,%d] received external WTI %d\n",
+__FUNCTION__ , local_cxy , core->lid , index );
+#endif
                 // call ISR
                     src_chdev->isr( src_chdev );
@@ -199 +207 @@
         else                    // call relevant ISR
         {
-            irq_dmsg("\n[DBG] %s : core[%x,%d] received HWI %d / cycle %d\n",
-            __FUNCTION__ , local_cxy , core->lid , index , hal_time_stamp() );
-
+
+#if CONFIG_DEBUG_HAL_IRQS
+if (CONFIG_DEBUG_HAL_IRQS < cycle )
+printk("\n[DBG] %s : core[%x,%d] received HWI %d\n",
+__FUNCTION__ , local_cxy , core->lid , index );
+#endif
             // call ISR
                     src_chdev->isr( src_chdev );
@@ -211 +222 @@
         index = pti_status - 1;
 
-        irq_dmsg("\n[DBG] %s : core[%x,%d] received PTI %d / cycle %d\n",
-        __FUNCTION__ , core->lid , local_cxy , index , hal_time_stamp() );
-
         assert( (index == core->lid) , __FUNCTION__ , "unconsistent PTI index\n");
 
+#if CONFIG_DEBUG_HAL_IRQS
+if (CONFIG_DEBUG_HAL_IRQS < cycle )
+printk("\n[DBG] %s : core[%x,%d] received PTI %d\n",
+__FUNCTION__ , core->lid , local_cxy , index );
+#endif
         // acknowledge PTI (this require a read access to XCU)
         uint32_t   ack  = xcu_base[(XCU_PTI_ACK << 5) | core->lid];
@@ -345 +358 @@
                           chdev_t * src_chdev )
 {
+
+#if CONFIG_DEBUG_HAL_IRQS
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_HAL_IRQS < cycle )
+printk("\n[DBG] %s : thread %x enter for core[%x,%d] / cycle %d\n",
+__FUNCTION__ , CURRENT_THREAD , local_cxy , lid , cycle );
+#endif
+
     // get extended & local pointers on PIC chdev descriptor
     xptr_t     pic_xp  = chdev_dir.pic;
@@ -401 +422 @@
         ((soclib_pic_core_t *)core->pic_extend)->wti_vector[wti_id] = src_chdev;
 
-pic_dmsg("\n[DBG] %s : %s / channel = %d / rx = %d / hwi_id = %d / wti_id = %d / cluster = %x\n",
+#if CONFIG_DEBUG_HAL_IRQS
+if( CONFIG_DEBUG_HAL_IRQS < cycle )
+printk("\n[DBG] %s : %s / channel = %d / rx = %d / hwi_id = %d / wti_id = %d / cluster = %x\n",
 __FUNCTION__ , chdev_func_str( func ) , channel , is_rx , hwi_id , wti_id , local_cxy );
+#endif
 
     }
@@ -420 +444 @@
         ((soclib_pic_core_t *)core->pic_extend)->wti_vector[hwi_id] = src_chdev;
 
-pic_dmsg("\n[DBG] %s : %s / channel = %d / hwi_id = %d / cluster = %x\n",
+#if CONFIG_DEBUG_HAL_IRQS
+if( CONFIG_DEBUG_HAL_IRQS < cycle )
+printk("\n[DBG] %s : %s / channel = %d / hwi_id = %d / cluster = %x\n",
 __FUNCTION__ , chdev_func_str( func ) , channel , hwi_id , local_cxy );
+#endif
 
     }