Changeset 630 for soft/giet_vm/giet_drivers/mwr_driver.c

Timestamp:

Jul 18, 2015, 3:04:15 PM (9 years ago)

Author:

alain

Message:

Update the peripheral drivers using descheduling,
to comply with the modified NORUN bit-vector in task context.

File:

• soft/giet_vm/giet_drivers/mwr_driver.c (modified) (5 diffs)

soft/giet_vm/giet_drivers/mwr_driver.c

@@ -41 +41 @@
 #endif
 
-
-/////////////////////////////////////////////////////////////////////////////
-//      Global variables (all arrays are indexed by the cluster index)
+/////////////////////////////////////////////////////////////////////////////
+//      Extern variables
+/////////////////////////////////////////////////////////////////////////////
+
+// allocated in the boot.c or kernel_init.c files
+extern static_scheduler_t* _schedulers[X_SIZE][Y_SIZE][NB_PROCS_MAX]; 
+
+/////////////////////////////////////////////////////////////////////////////
+//      Global variables 
+/////////////////////////////////////////////////////////////////////////////
+// All arrays are indexed by the cluster index.
 /////////////////////////////////////////////////////////////////////////////
 
@@ -150 +158 @@
 {
     // get coprocessor coordinates and characteristics
-    // the processor executing the ISR an the coprocessor
-    // are in the same cluster
+    // processor executing ISR and coprocessor are in the same cluster
     unsigned int gpid       = _get_procid();
     unsigned int cluster_xy = gpid >> P_WIDTH;
@@ -160 +167 @@
     unsigned int nb_to      = info & 0xFF;
     unsigned int nb_from    = (info>>8) & 0xFF;
+
     unsigned int channel;
     unsigned int status;
     unsigned int error = 0;
 
-    // check status, report errors and reset all channels
+    // check status, report errors and reset for all channels
     for ( channel = 0 ; channel < (nb_to + nb_from) ; channel++ )
     {
@@ -199 +207 @@
     // identify task waiting on coprocessor completion
     // this task can run in a remote cluster 
-    unsigned int gtid           = _coproc_gtid[cluster_id];
-    unsigned int remote_procid  = gtid>>16;
-    unsigned int ltid           = gtid & 0xFFFF;
-    unsigned int remote_cluster = remote_procid >> P_WIDTH;
-    unsigned int remote_x       = remote_cluster >> Y_WIDTH;
-    unsigned int remote_y       = remote_cluster & ((1<<Y_WIDTH)-1);
-    unsigned int remote_p       = remote_procid & ((1<<P_WIDTH)-1);
-
-    // re-activates sleeping task
-    _set_task_slot( remote_x,
-                    remote_y,
-                    remote_p,
-                    ltid,        
-                    CTX_RUN_ID,  // CTX_RUN slot 
-                    1 );         // running value
+    unsigned int r_gtid    = _coproc_gtid[cluster_id];
+    unsigned int r_procid  = r_gtid>>16;
+    unsigned int r_ltid    = r_gtid & 0xFFFF;
+    unsigned int r_cluster = r_procid >> P_WIDTH;
+    unsigned int r_x       = r_cluster >> Y_WIDTH;
+    unsigned int r_y       = r_cluster & ((1<<Y_WIDTH)-1);
+    unsigned int r_p       = r_procid & ((1<<P_WIDTH)-1);
+
+    // Reset NORUN_MASK_IOC bit 
+    static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[r_x][r_y][r_p];
+    unsigned int*       ptr     = &psched->context[r_ltid][CTX_NORUN_ID];
+    _atomic_and( ptr , ~NORUN_MASK_IOC );
 
     // send a WAKUP WTI to processor running the sleeping task 
-    _xcu_send_wti( remote_cluster,   
-                   remote_p, 
+    _xcu_send_wti( r_cluster,   
+                   r_p, 
                    0 );          // don't force context switch 
 
@@ -224 +229 @@
 _printf("\n[GIET DEBUG COPROC] P[%d,%d,%d] executes _mwr_isr() at cycle %d\n"
         "  for task %d running on P[%d,%d,%d] / error = %d\n",
-        x , y , p , _get_proctime() , ltid , remote_x , remote_y , remote_p , error );
-#endif
-}
+        x , y , p , _get_proctime() , ltid , r_x , r_y , r_p , error );
+#endif
+}  // end _mwr_isr()