Changeset 630 for soft/giet_vm/giet_drivers/sdc_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/sdc_driver.c (modified) (6 diffs)

soft/giet_vm/giet_drivers/sdc_driver.c

@@ -20 +20 @@
 
 #define  SDC_POLLING_TIMEOUT  1000000   // number of retries for polling PXCI 
+
+//////////////////////////////////////////////////////////////////////////////////
+//      Extern variables
+//////////////////////////////////////////////////////////////////////////////////
+
+// allocated in the boot.c or kernel_init.c files
+extern static_scheduler_t* _schedulers[X_SIZE][Y_SIZE][NB_PROCS_MAX]; 
 
 ///////////////////////////////////////////////////////////////////////////////////
@@ -401 +408 @@
     // in descheduling mode, we deschedule the task
     // and use an interrupt to reschedule the task.
-    // We need a critical section, because we must reset the RUN bit
+    // We need a critical section, because we must set the NORUN bit
         // before to launch the transfer, and we don't want to be 
     // descheduled between these two operations. 
@@ -426 +433 @@
         _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 );
+        
         // start transfer
         _sdc_set_register( AHCI_PXCI, (1<<ptw) );
@@ -489 +498 @@
  
             // identify waiting task 
-            unsigned int remote_procid  = _ahci_gtid[ptr]>>16;
-            unsigned int ltid           = _ahci_gtid[ptr] & 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);
+            unsigned int procid  = _ahci_gtid[ptr]>>16;
+            unsigned int ltid    = _ahci_gtid[ptr] & 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);
  
-            // re-activates waiting task
-            _set_task_slot( remote_x,
-                            remote_y,
-                            remote_p,
-                            ltid,
-                            CTX_RUN_ID,
-                            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 waiting task 
-            _xcu_send_wti( remote_cluster , 
-                           remote_p , 
+            _xcu_send_wti( cluster , 
+                           p , 
                            0 );          // don't force context switch
 
@@ -514 +520 @@
         "  resume task %d running on P[%d,%d,%d] / status = %x\n",
         ptr , _get_proctime() ,
-        ltid , remote_x , remote_y , remote_p , _ahci_status[ptr] );
+        ltid , x , y , p , _ahci_status[ptr] );
 #endif
         }
@@ -521 +527 @@
             break;
         }
-    }
+    }  // end for completed commands
 }  // end _sdc_isr()