Changeset 215 for soft/giet_vm/boot

Timestamp:

Sep 17, 2012, 10:47:46 AM (12 years ago)

Author:

karaoui

Message:

New components are now mandotory in the XML description:

• Timer/Icu? or Xicu
• Dma

The files giet_vsegs.ld and hard_config.h are now autogenerated by the xml2bin tool.

File:

• soft/giet_vm/boot/boot_init.c (modified) (9 diffs)

soft/giet_vm/boot/boot_init.c

@@ -187 +187 @@
                    : "$26" );
 }
+
+//////////////////////////////////////////////////////////////////////////////
+// boot_scheduler_get_itvector()
+// This function get an interrupt vector slot in a scheduler, after a temporary
+// desactivation of the DTLB (because we use the scheduler physical address).
+// - gpid   : global processor/scheduler index
+// - slotid : context slot index
+// - return the content of the slot 
+//////////////////////////////////////////////////////////////////////////////
+unsigned int boot_scheduler_get_itvector( unsigned int gpid, 
+                                         unsigned int slotid)
+{
+    unsigned int value;
+
+    // get scheduler physical address
+    static_scheduler_t*     psched = boot_schedulers_paddr[gpid];
+    
+    // get slot physical address
+    unsigned int*           pslot  = &(psched->interrupt_vector[slotid]);
+
+    asm volatile ( "li      $26,    0xB     \n"
+                   "mtc2    $26,    $1      \n"     /* desactivate DTLB */
+                   "lw      %0,     0(%1)   \n"     /* *pslot <= value  */
+                   "li      $26,    0xF     \n" 
+                   "mtc2    $26,    $1      \n"     /* activate DTLB    */
+                   : "=r"(value) 
+                   : "r"(pslot) 
+                   : "$26" );
+    return value;
+}
+
 //////////////////////////////////////////////////////////////////////////////
 // boot_scheduler_get_tasks()
@@ -286 +317 @@
 void boot_puts(const char *buffer) 
 {
-    unsigned int* tty_address = (unsigned int*)( (char*)&seg_tty_base +
-                                (CLUSTER_IO_ID * (unsigned)CLUSTER_SIZE) );
+    unsigned int* tty_address = (unsigned int*) &seg_tty_base;
     unsigned int n;
 
@@ -915 +945 @@
             if ( periph[periph_id].type == PERIPH_TYPE_TIM ) 
             {
-                if ( periph[periph_id].channels != (NB_PROCS_MAX + NB_TIMERS_MAX) )
+                if ( periph[periph_id].channels > NB_TIMERS_MAX )
                 {
                     boot_puts("\n[BOOT ERROR] Too much user timers in cluster ");
@@ -1312 +1342 @@
 
             //////// vci_io_bridge component
-            else if ( (type == PERIPH_TYPE_IOB) && GIET_IOMMU_ACTIVE )
+            else if ( (type == PERIPH_TYPE_IOB) && IOMMU_ACTIVE )
             {
                 // get the iommu page table physical address
@@ -1435 +1465 @@
     {
         alloc_fbdma_channel[cluster_id] = 0;
-        alloc_timer_channel[cluster_id] = NB_PROCS_MAX;
+        alloc_timer_channel[cluster_id] = 0;
     }
                 
@@ -1560 +1590 @@
             unsigned int ctx_ptpr = (unsigned int)boot_ptabs_paddr[vspace_id] >> 13;
 
+            // compute gpid = global processor index
+            unsigned int gpid = task[task_id].clusterid*NB_PROCS_MAX + 
+                                task[task_id].proclocid;
+
             // ctx_ptab : page_table virtual base address
             unsigned int ctx_ptab = (unsigned int)boot_ptabs_vaddr[vspace_id];
@@ -1602 +1636 @@
             {
                 unsigned int cluster_id = task[task_id].clusterid;
-                if ( alloc_timer_channel[cluster_id] >= NB_TIMERS_MAX )
+                unsigned int allocated = alloc_timer_channel[cluster_id];
+
+                if ( allocated >= NB_TIMERS_MAX )
                 {
                     boot_puts("\n[BOOT ERROR] local TIMER index too large for task ");
@@ -1611 +1647 @@
                     boot_exit();
                 }
-                ctx_timer = cluster_id*NB_TIMERS_MAX + alloc_timer_channel[cluster_id];
-                alloc_timer_channel[cluster_id]++;
+                
+                //assert(allocated >= 0);
+                char found = 0;
+                for( irq_id = 0; irq_id < 32; irq_id++)//look at the isr_timer isr channel
+                {
+                    unsigned int isr = boot_scheduler_get_itvector(gpid, irq_id) && 0x000000FF;
+                    if(isr == ISR_TIMER)
+                    {
+                        if(allocated == 0)
+                        {
+                            found = 1;
+                            alloc_timer_channel[cluster_id]++;
+                            ctx_timer = cluster_id*NB_TIMERS_MAX + alloc_timer_channel[cluster_id];
+                            break;
+                        }else
+                            allocated--;
+                    }
+                }
+
+                if(!found)
+                {
+                    boot_puts("\n[BOOT ERROR] No user timer available for task ");
+                    boot_puts( task[task_id].name );
+                    boot_puts(" in vspace ");
+                    boot_puts( vspace[vspace_id].name );
+                    boot_puts("\n");
+                    boot_exit();
+                }
+
             }
 
@@ -1642 +1705 @@
             unsigned int vobj_id = task[task_id].vobjlocid + vspace[vspace_id].vobj_offset;
             unsigned int ctx_sp = vobj[vobj_id].vaddr + vobj[vobj_id].length;
-
-            // compute gpid = global processor index
-            unsigned int gpid = task[task_id].clusterid*NB_PROCS_MAX + 
-                                task[task_id].proclocid;
 
             // In the code below, we access the scheduler with specific access