Changeset 630 for soft/giet_vm/giet_drivers/bdv_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/bdv_driver.c (modified) (3 diffs)

soft/giet_vm/giet_drivers/bdv_driver.c

@@ -23 +23 @@
 
 ///////////////////////////////////////////////////////////////////////////////
+//      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
 ///////////////////////////////////////////////////////////////////////////////
@@ -162 +169 @@
         _it_disable( &save_sr ); 
 
-        // reset runnable 
-        _set_task_slot( x, y, p, ltid, CTX_RUN_ID, 0 );  
+        // Set NORUN_MASK_IOC bit 
+        static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[x][y][p];
+        unsigned int*       ptr     = &psched->context[ltid][CTX_NORUN_ID];
+        _atomic_or( ptr , NORUN_MASK_IOC );
         
         // launch transfer
@@ -234 +243 @@
 
     // identify task waiting on BDV
-    unsigned int remote_procid  = _bdv_gtid>>16;
-    unsigned int ltid           = _bdv_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 procid  = _bdv_gtid>>16;
+    unsigned int ltid    = _bdv_gtid & 0xFFFF;
+    unsigned int cluster = procid >> P_WIDTH;
+    unsigned int x       = cluster >> Y_WIDTH;
+    unsigned int y       = cluster & ((1<<Y_WIDTH)-1);
+    unsigned int p       = procid & ((1<<P_WIDTH)-1);
+
+    // Reset NORUN_MASK_IOC bit 
+    static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[x][y][p];
+    unsigned int*       ptr     = &psched->context[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( cluster,   
+                   p, 
                    0 );          // don't force context switch 
 
 #if GIET_DEBUG_IOC  
-unsigned int procid  = _get_procid();
-unsigned int x       = procid >> (Y_WIDTH + P_WIDTH);
-unsigned int y       = (procid >> P_WIDTH) & ((1<<Y_WIDTH)-1);
-unsigned int p       = procid & ((1<<P_WIDTH)-1);
+unsigned int pid  = _get_procid();
+unsigned int c_x  = pid >> (Y_WIDTH + P_WIDTH);
+unsigned int c_y  = (pid >> P_WIDTH) & ((1<<Y_WIDTH)-1);
+unsigned int c_p  = pid & ((1<<P_WIDTH)-1);
 if ( _get_proctime() > GIET_DEBUG_IOC )
 _printf("\n[BDV DEBUG] Processor[%d,%d,%d] enters _bdv_isr() at cycle %d\n"
         "  for task %d running on P[%d,%d,%d] / bdv_status = %x\n",
-        x , y , p , _get_proctime() ,
-        ltid , remote_x , remote_y , remote_p , status );
+        c_x , c_y , c_p , _get_proctime() ,
+        ltid , x , y , p , status );
 #endif