Changeset 246 for soft/giet_vm/sys/drivers.c

Timestamp:

Jul 9, 2013, 3:54:53 PM (11 years ago)

Author:

meunier

Message:

Cosmétique + gestion du reset de l'irq du timer ou de l'xicu lors d'un task_switch

File:

• soft/giet_vm/sys/drivers.c (modified) (4 diffs)

soft/giet_vm/sys/drivers.c

@@ -248 +248 @@
 
 
-////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////
 // _timer_reset_irq_cpt()
-////////////////////////////////////////////////
-//unsigned int _timer_reset_irq_cpt(unsigned int cluster_id, unsigned int local_id) {
-//    // parameters checking 
-//    if (cluster_id >= NB_CLUSTERS) {
-//        return 1;
-//    }
-//    if (local_id >= NB_TIM_CHANNELS) {
-//        return 2;
-//    }
-//
-//#if USE_XICU
-//#error // not implemented
-//#else
-//    unsigned int * timer_address = (unsigned int *) ((char *) &seg_tim_base + (cluster_id * GIET_CLUSTER_INCREMENT));
-//    unsigned int timer_period = timer_address[local_id * TIMER_SPAN + TIMER_PERIOD];
-//
-//    timer_address[local_id * TIMER_SPAN + TIMER_PERIOD] = timer_period;
-//#endif
-//
-//    return 0;
-//}
+///////////////////////////////////////////////////////////////////////
+// This function resets the period at the end of which
+// an interrupt is sent. To do so, we re-write the period
+// ini the proper register, what causes the count to restart.
+// The period value is read from the same (TIMER_PERIOD) register,
+// this is why in appearance we do nothing useful (read a value
+// from a register and write this value in the same register)
+// This function is called during a context switch (user or preemptive)
+///////////////////////////////////////////////////////////////////////
+unsigned int _timer_reset_irq_cpt(unsigned int cluster_id, unsigned int local_id) {
+    // parameters checking 
+    if (cluster_id >= NB_CLUSTERS) {
+        return 1;
+    }
+    if (local_id >= NB_TIM_CHANNELS) {
+        return 2;
+    }
+
+#if USE_XICU
+    unsigned int * timer_address = (unsigned int *) ((char *) &seg_icu_base + (cluster_id * GIET_CLUSTER_INCREMENT));
+    unsigned int timer_period = timer_address[XICU_REG(XICU_PTI_PER, local_id)];
+
+    // we write 0 first because if the timer is currently running, the corresponding timer counter is not reset
+    timer_address[XICU_REG(XICU_PTI_PER, local_id)] = 0;
+    timer_address[XICU_REG(XICU_PTI_PER, local_id)] = timer_period;
+#else
+    // We suppose that the TIMER_MODE register value is 0x3
+    unsigned int * timer_address = (unsigned int *) ((char *) &seg_tim_base + (cluster_id * GIET_CLUSTER_INCREMENT));
+    unsigned int timer_period = timer_address[local_id * TIMER_SPAN + TIMER_PERIOD];
+
+    timer_address[local_id * TIMER_SPAN + TIMER_PERIOD] = timer_period;
+#endif
+
+    return 0;
+}
 
 
@@ -599 +614 @@
     unsigned int buf_xaddr = 0;    // user buffer virtual address in IO space (if IOMMU)
     paddr_t      buf_paddr = 0;    // user buffer physical address (if no IOMMU),
-                               
+
     // check buffer alignment
     if ((unsigned int) user_vaddr & 0x3)
@@ -626 +641 @@
     {
         // get ppn and flags for each vpn
-        unsigned int ko = _v2p_translate( (page_table_t*)user_pt_vbase, 
-                                           vpn, 
-                                           &ppn, 
-                                           &flags);
+        unsigned int ko = _v2p_translate((page_table_t *) user_pt_vbase,
+                                          vpn,
+                                          &ppn,
+                                          &flags);
         // check access rights
-        if (ko)                                 
+        if (ko)
         {
             _get_lock(&_tty_put_lock);
@@ -1254 +1269 @@
 // - length : number of bytes to be transfered.
 //////////////////////////////////////////////////////////////////////////////////
-unsigned int _fb_sync_write( unsigned int   offset, 
-                             const void*    buffer, 
-                             unsigned int   length) 
-{
-    unsigned char* fb_address = (unsigned char *) &seg_fbf_base + offset;
+
+unsigned int _fb_sync_write(unsigned int offset, 
+                            const void * buffer, 
+                            unsigned int length) 
+{
+    unsigned char * fb_address = (unsigned char *) &seg_fbf_base + offset;
     memcpy((void *) fb_address, (void *) buffer, length);
     return 0;