Changeset 281 for soft/giet_vm/giet_kernel

Timestamp:

Jan 30, 2014, 5:32:13 PM (11 years ago)

Author:

cfuguet

Message:

Modifications in GIET_VM:

• Supporting platforms with more than one IRQ per processor from the XICU.

When this is the case, the IRQ per processor can be signalled
by the XCU peripheric number of channels on the XML file.

The xml_parser will generate a constant on the hard_config.h
file, called IRQ_PER_PROCESSOR and this constant will be use
by the GIET_VM to create accordingly the irq masks on the
ICU

Location:

soft/giet_vm/giet_kernel

Files:

• irq_handler.c (modified) (2 diffs)
• kernel_init.c (modified) (2 diffs)

soft/giet_vm/giet_kernel/irq_handler.c

@@ -21 +21 @@
 #include <ioc_driver.h>
 #include <dma_driver.h>
-#include<mapping_info.h>
+#include <mapping_info.h>
 #include <utils.h>
 
@@ -59 +59 @@
     // get the highest priority active IRQ index 
 
+    unsigned int icu_out_index = local_id * IRQ_PER_PROCESSOR;
+
 #if USE_XICU
-    ko = _xcu_get_index( cluster_id, local_id, &irq_id );
+    ko = _xcu_get_index( cluster_id, icu_out_index, &irq_id );
 #else
-    ko = _icu_get_index( cluster_id, local_id, &irq_id );
+    ko = _icu_get_index( cluster_id, icu_out_index, &irq_id );
 #endif
 

soft/giet_vm/giet_kernel/kernel_init.c

@@ -261 +261 @@
 #endif
 
-    // GIET-VM consraint : only one IRQ type per irq_id 
+    // GIET-VM constraint : only one IRQ type per irq_id 
     if ( hwi_mask & swi_mask & pti_mask )
     {
@@ -268 +268 @@
     }
 
+
+    // The ICU output index is computed as the local processor id multiplied by
+    // the number of ICU outputs connected to each processor.
+    int icu_out_index = local_pid * IRQ_PER_PROCESSOR; 
+
 #if USE_XICU
-    _xcu_set_mask(cluster_xy, local_pid, hwi_mask, IRQ_TYPE_HWI); // set HWI_MASK
-    _xcu_set_mask(cluster_xy, local_pid, swi_mask, IRQ_TYPE_SWI); // set SWI_MASK
-    _xcu_set_mask(cluster_xy, local_pid, pti_mask, IRQ_TYPE_PTI); // set PTI_MASK
+    _xcu_set_mask(cluster_xy, icu_out_index, hwi_mask, IRQ_TYPE_HWI); // set HWI_MASK
+    _xcu_set_mask(cluster_xy, icu_out_index, swi_mask, IRQ_TYPE_SWI); // set SWI_MASK
+    _xcu_set_mask(cluster_xy, icu_out_index, pti_mask, IRQ_TYPE_PTI); // set PTI_MASK
 #else
-    _icu_set_mask(cluster_xy, local_pid, (hwi_mask | pti_mask | swi_mask) );   
+    _icu_set_mask(cluster_xy, icu_out_index, (hwi_mask | pti_mask | swi_mask) );   
 #endif