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

Timestamp:

Apr 4, 2018, 2:49:02 PM (7 years ago)

Author:

alain

Message:

Fix a bug in scheduler related to RPC blocking.

File:

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

trunk/hal/tsar_mips32/drivers/soclib_pic.c

@@ -130 +130 @@
                            &pti_status );
 
-#if CONFIG_DEBUG_HAL_IRQS
+#if DEBUG_HAL_IRQS
 uint32_t cycle = (uint32_t)hal_get_cycles();
-if (CONFIG_DEBUG_HAL_IRQS < cycle )
+if (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 );
@@ -143 +143 @@
         index = wti_status - 1;
 
+        ////////////////////////////////////////////////////////
         if( index < LOCAL_CLUSTER->cores_nr )   // it is an IPI
         {
             assert( (index == core->lid) , __FUNCTION__ , "illegal IPI index" );
 
-#if CONFIG_DEBUG_HAL_IRQS
-if (CONFIG_DEBUG_HAL_IRQS < cycle )
+#if DEBUG_HAL_IRQS
+if (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)
+            // acknowledge IRQ (this require an XCU read)
             uint32_t   ack  = xcu_base[(XCU_WTI_REG << 5) | core->lid];
-            
+
             // check RPC FIFO,  and activate or create a RPC thread
             // condition is always true, but we must use the ack value
             if( ack + 1 ) rpc_check();
         }
-        else                                    // it is an external device
+        ////////////////////////////////////////////////////////////////
+        else                                    // it is an external IRQ
         {
             // get pointer on source chdev
@@ -171 +173 @@
 
                 // disable WTI in local XCU controller 
-                uint32_t * base = soclib_pic_xcu_base();
-                base[(XCU_MSK_WTI_DISABLE << 5) | core->lid] = 1 << core->lid;
+                xcu_base[(XCU_MSK_WTI_DISABLE << 5) | core->lid] = 1 << core->lid;
+
+                hal_fence();
             }
             else                                 // call relevant ISR
             {
 
-#if CONFIG_DEBUG_HAL_IRQS
-if (CONFIG_DEBUG_HAL_IRQS < cycle )
+#if DEBUG_HAL_IRQS
+if (DEBUG_HAL_IRQS < cycle )
 printk("\n[DBG] %s : core[%x,%d] received external WTI %d\n",
 __FUNCTION__ , local_cxy , core->lid , index );
@@ -188 +191 @@
         }
 
-        if( hwi_status )      // pending HWI
+    /////////////////////////////////////////////////////////////
+        if( hwi_status )                     // It is an Internal IRQ
         {
         index = hwi_status - 1;
@@ -204 +208 @@
             // disable HWI in local XCU controller
             xcu_base[(XCU_MSK_HWI_DISABLE << 5) | core->lid] = 1 << core->lid;
+
+            hal_fence();
                 }
         else                    // call relevant ISR
         {
 
-#if CONFIG_DEBUG_HAL_IRQS
-if (CONFIG_DEBUG_HAL_IRQS < cycle )
+#if DEBUG_HAL_IRQS
+if (DEBUG_HAL_IRQS < cycle )
 printk("\n[DBG] %s : core[%x,%d] received HWI %d\n",
 __FUNCTION__ , local_cxy , core->lid , index );
@@ -217 +223 @@
         }
         }
-
-    if( pti_status )      // pending PTI
+    ///////////////////////////////////////////////////////
+    if( pti_status )                   // It is a Timer IRQ
         {
         index = pti_status - 1;
@@ -224 +230 @@
         assert( (index == core->lid) , __FUNCTION__ , "unconsistent PTI index\n");
 
-#if CONFIG_DEBUG_HAL_IRQS
-if (CONFIG_DEBUG_HAL_IRQS < cycle )
+#if DEBUG_HAL_IRQS
+if (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)
+        // acknowledge IRQ (this require a read access to XCU)
         uint32_t   ack  = xcu_base[(XCU_PTI_ACK << 5) | core->lid];
 
@@ -359 +365 @@
 {
 
-#if CONFIG_DEBUG_HAL_IRQS
+#if DEBUG_HAL_IRQS
 uint32_t cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_HAL_IRQS < cycle )
+if( 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 );
@@ -422 +428 @@
         ((soclib_pic_core_t *)core->pic_extend)->wti_vector[wti_id] = src_chdev;
 
-#if CONFIG_DEBUG_HAL_IRQS
-if( CONFIG_DEBUG_HAL_IRQS < cycle )
+#if DEBUG_HAL_IRQS
+if( 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 );
@@ -444 +450 @@
         ((soclib_pic_core_t *)core->pic_extend)->wti_vector[hwi_id] = src_chdev;
 
-#if CONFIG_DEBUG_HAL_IRQS
-if( CONFIG_DEBUG_HAL_IRQS < cycle )
+#if DEBUG_HAL_IRQS
+if( 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 );