Changeset 14 for trunk/kernel/devices/dev_icu.c

Timestamp:

May 3, 2017, 1:23:24 PM (7 years ago)

Author:

alain

Message:

Bugs fix.

File:

• trunk/kernel/devices/dev_icu.c (modified) (6 diffs)

trunk/kernel/devices/dev_icu.c

@@ -82 +82 @@
     if( irq_type == HWI_TYPE ) 
     {
-        assert( (irq_index < icu->ext.icu.hwi_nr) , __FUNCTION__ , "illegal HWI" );
-    }
-    if( irq_type == WTI_TYPE )
-    {
-        assert( (irq_index < icu->ext.icu.wti_nr) , __FUNCTION__ , "illegal WTI" );
-    }
-    if( irq_type == PTI_TYPE )
-    {
-        assert( (irq_index < icu->ext.icu.pti_nr) , __FUNCTION__ , "illegal PTI" );
+        if( irq_index >= icu->ext.icu.hwi_nr )
+        {
+            printk("\n[PANIC] in %s : illegal HWI index = %d / max = %d\n", 
+                   __FUNCTION__ , irq_index , icu->ext.icu.hwi_nr );
+            hal_core_sleep();
+        }
+    }
+    else if( irq_type == WTI_TYPE )
+    {
+        if( irq_index >= icu->ext.icu.wti_nr )
+        {
+            printk("\n[PANIC] in %s : illegal WTI index = %d / max = %d\n", 
+                   __FUNCTION__ , irq_index , icu->ext.icu.wti_nr );
+            hal_core_sleep();
+        }
+    }
+    else  //  irq_type == PTI_TYPE 
+    {
+        if( irq_index >= icu->ext.icu.pti_nr )
+        {
+            printk("\n[PANIC] in %s : illegal PTI index = %d / max = %d\n",
+                   __FUNCTION__ , irq_index , icu->ext.icu.pti_nr );
+            hal_core_sleep();
+        }
     }
 }  // end dev_icu_check_irq()
@@ -107 +122 @@
     dev_icu_check_irq( icu , irq_type , irq_index );
 
-    // (1) call implementation specific ICU driver to enable IRQ
+    // call implementation specific ICU driver to enable IRQ
     if( icu->impl == IMPL_ICU_XCU ) 
     {
-        soclib_xcu_enable_irq( icu , 1<<irq_index , irq_type , lid );
-    }
-
-    // (2) get selected core local pointer, and register
-    // source chdev pointer in relevant interrupt vector
-    core_t * core = &LOCAL_CLUSTER->core_tbl[lid];
-        core_set_irq_vector_entry( core , irq_type , irq_index , src_chdev );
-
-    // (3) register IRQ type and index in source chdev descriptor
-    src_chdev->irq_type = irq_type;
-    src_chdev->irq_id   = irq_index;
-
+         soclib_xcu_enable_irq( icu , 1<<irq_index , irq_type , lid );
+    }
+
+    // This is only done for an HWI, or for a WTI that is not an IPI
+    if( (irq_type != PTI_TYPE) && (src_chdev != NULL) )
+    {
+        // get selected core local pointer, and register
+        // source chdev pointer in relevant interrupt vector
+        core_t * core = &LOCAL_CLUSTER->core_tbl[lid];
+            core_set_irq_vector_entry( core , irq_type , irq_index , src_chdev );
+
+        // (3) register IRQ type and index in source chdev descriptor
+        src_chdev->irq_type = irq_type;
+        src_chdev->irq_id   = irq_index;
+    }
 }  // end dev_icu_enable_irq()
 
@@ -136 +154 @@
     dev_icu_check_irq( icu , irq_type , irq_index );
 
-    // (1) call the implementation specific ICU driver to disable IRQ 
+    // call the implementation specific ICU driver to disable IRQ 
     if( icu->impl == IMPL_ICU_XCU ) 
     {
@@ -142 +160 @@
     }
 
-    // (2) get selected remote core local pointer, and remove
-    // the source chdev xptr from relevant interrupt vector
-
-    core_t * core = &LOCAL_CLUSTER->core_tbl[lid];
-        core_set_irq_vector_entry( core , irq_type , irq_index , NULL );
-
+    // This is only done for HWI or WTI that are not IPI
+    if( irq_type != PTI_TYPE )
+    {
+        // get selected remote core local pointer, and remove
+        // the source chdev xptr from relevant interrupt vector
+        core_t * core = &LOCAL_CLUSTER->core_tbl[lid];
+            core_set_irq_vector_entry( core , irq_type , irq_index , NULL );
+    }
 } // end dev_icu_disable_irq()
+
+///////////////////////////////////////
+void dev_icu_get_masks( lid_t      lid,
+                        uint32_t * hwi_mask,
+                        uint32_t * wti_mask,
+                        uint32_t * pti_mask )
+{
+    // get local pointer on local ICU chdev
+    xptr_t    icu_xp = chdev_dir.icu[local_cxy];
+    chdev_t * icu    = (chdev_t *)GET_PTR( icu_xp );
+
+    if( icu->impl == IMPL_ICU_XCU )
+    {
+        soclib_xcu_get_masks( icu , lid , hwi_mask , wti_mask , pti_mask );
+    }
+}
 
 //////////////////////////////////////////////
@@ -312 +348 @@
         dev_icu_ack_timer( index );
 
-        // TODO execute all actions related to TICK event
-        core_clock( core );
+        if( index < LOCAL_CLUSTER->cores_nr )  // its a TICK event
+        {
+            // TODO execute all actions related to TICK event
+            core_clock( core );
+        }
+        else
+        {
+            printk("\n[WARNING] in %s : no handler for PTI %d on core %d in cluster %x\n",
+                   __FUNCTION__ , index , core->lid , local_cxy );
+                core->spurious_irqs ++;
+            dev_icu_disable_irq( core->lid , PTI_TYPE , index ); 
+        }
         }
 }  // end dev_icu_irq_handler()
@@ -340 +386 @@
     // release lock
     spinlock_unlock( lock );
-
+ 
     return index;
 }  // end dev_icu_wti_alloc()