Changeset 200 for soft/giet_vm/boot

Timestamp:

Aug 12, 2012, 1:35:34 PM (12 years ago)

Author:

karaoui

Message:

+ removing some bugs from:

• xml_parser.c: check that strcmp == 0 for coproc direction
• mwmr_channel.c: mwmr->ptr to ptr.
• utils.h double definition of memcpy fonction.

+ mapping_info.h : naming the enums
+ boot_init.c: changing the order of initialisation in order

to initialise the coproc with the mwmr channel values( depth, width...).
Note that the vobjs are now physically initialised.

+ mwmr_channel.h: changing the order argument definition to suit vci_mwmr_channel Soclib componnent.
+ hwr_mapping.h: adding the register description of the vci_mwmr_controller .

File:

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

soft/giet_vm/boot/boot_init.c

@@ -1059 +1059 @@
 boot_puts(" ******\n");
 #endif
-        // We must set the PTPR depending on the vspace, because the addresses 
-        // of mwmmr channels, barriers and locks are defined in virtual space.
-        boot_set_mmu_ptpr( (unsigned int)boot_ptabs_paddr[vspace_id] >> 13 );
 
         unsigned int ptab_found = 0;
@@ -1074 +1071 @@
                 case VOBJ_TYPE_MWMR:    // storage capacity is (vobj.length/4 - 5) words
                         {
-                    mwmr_channel_t* mwmr = (mwmr_channel_t*)(vobj[vobj_id].vaddr);
+                    mwmr_channel_t* mwmr = (mwmr_channel_t*)(vobj[vobj_id].paddr);
                     mwmr->ptw   = 0;
                     mwmr->ptr   = 0;
@@ -1116 +1113 @@
                 case VOBJ_TYPE_BARRIER: // init is the number of participants
                 {
-                    giet_barrier_t* barrier = (giet_barrier_t*)(vobj[vobj_id].vaddr);
+                    giet_barrier_t* barrier = (giet_barrier_t*)(vobj[vobj_id].paddr);
                     barrier->count = 0;
                     barrier->init  = vobj[vobj_id].init;
@@ -1130 +1127 @@
                 case VOBJ_TYPE_LOCK:    // init is "not taken"
                 {
-                    unsigned int* lock = (unsigned int*)(vobj[vobj_id].vaddr);
+                    unsigned int* lock = (unsigned int*)(vobj[vobj_id].paddr);
                     *lock = 0;
 #if BOOT_DEBUG_VOBJS
@@ -1181 +1178 @@
     } // end loop on vspaces
 } // end boot_vobjs_init()
+
+void
+mwmr_hw_init( void *coproc, enum mwmrPortDirection way,
+              unsigned int no, const mwmr_channel_t *pmwmr)
+{
+    volatile unsigned int *cbase = (unsigned int*) coproc;
+    
+
+    cbase[MWMR_CONFIG_FIFO_WAY] = way ;
+    cbase[MWMR_CONFIG_FIFO_NO] = no ;
+    cbase[MWMR_CONFIG_STATUS_ADDR] = (unsigned int)pmwmr ;
+    cbase[MWMR_CONFIG_WIDTH] = pmwmr->width ;
+    cbase[MWMR_CONFIG_DEPTH] = pmwmr->depth;
+    cbase[MWMR_CONFIG_BUFFER_ADDR] = (unsigned int)&pmwmr->data;
+    cbase[MWMR_CONFIG_RUNNING] = 1 ;
+}
+
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1194 +1208 @@
     mapping_periph_t*   periph  = boot_get_periph_base( header );
     mapping_pseg_t*     pseg    = boot_get_pseg_base( header );
+    mapping_vobj_t*     vobj    = boot_get_vobj_base( header );
+    mapping_vspace_t*   vspace  = boot_get_vspace_base( header );     
+    mapping_coproc_t*   coproc  = boot_get_coproc_base( header );
+    mapping_cp_port_t*  cp_port = boot_get_cp_port_base( header );
 
     unsigned int        cluster_id;
     unsigned int        periph_id;  
     unsigned int        coproc_id;  
+    unsigned int        cp_port_id;  
     unsigned int        channel_id;
 
@@ -1292 +1311 @@
               coproc_id++ )
         {
-            // TODO
+            unsigned no_fifo_to  = 0;       //FIXME: should it be the map.xml who define the order?
+            unsigned no_fifo_from = 0;
+            unsigned int cpseg = pseg[coproc[coproc_id].psegid].base;
+
+#if BOOT_DEBUG_PERI
+boot_puts("[BOOT] mwmr coproc initialisation of ");
+boot_putw((unsigned int) coproc[coproc_id].name);
+boot_puts(", nb ports");
+boot_putw((unsigned int)coproc[coproc_id].ports);
+boot_puts("\n");
+#endif
+
+            for ( cp_port_id = coproc[coproc_id].port_offset ;
+                  cp_port_id < coproc[coproc_id].port_offset + coproc[coproc_id].ports ;
+                  cp_port_id++ )
+            {
+                //FIXME: should the same for all ports: put it in the coproc
+                unsigned int vspace_id  = cp_port[cp_port_id].vspaceid; 
+                unsigned int vobj_id    = cp_port[cp_port_id].vobjlocid + vspace[vspace_id].vobj_offset;
+
+                mwmr_channel_t *pmwmr = (mwmr_channel_t*)(vobj[vobj_id].paddr);
+
+                if( cp_port[cp_port_id].direction == PORT_TO_COPROC)
+                {
+
+#if BOOT_DEBUG_PERI
+boot_puts("     port direction: PORT_TO_COPROC");
+#endif
+                    mwmr_hw_init((void*)cpseg, PORT_TO_COPROC, no_fifo_to, pmwmr );
+                    no_fifo_to++;
+                }
+                else
+                {
+#if BOOT_DEBUG_PERI
+boot_puts("     port direction: PORT_FROM_COPROC");
+#endif
+                    mwmr_hw_init((void*)cpseg, PORT_FROM_COPROC, no_fifo_from, pmwmr );
+                    no_fifo_from++;
+                }
+#if BOOT_DEBUG_PERI
+boot_puts(", with mwmr: ");
+boot_puts(vobj[vobj_id].name);
+boot_puts(" of vspace: ");
+boot_puts(vspace[vspace_id].name);
+#endif
+            }
         } // end for coprocs
 
@@ -1680 +1744 @@
     boot_puts("\n");
 
+    // page table building
+    boot_pt_init();
+
+    boot_puts("\n[BOOT] Page Tables initialisation completed at cycle ");
+    boot_putw( boot_proctime() );
+    boot_puts("\n");
+
+    // vobjs initialisation
+    boot_vobjs_init();
+
+    boot_puts("\n[BOOT] Vobjs initialisation completed at cycle : ");
+    boot_putw( boot_proctime() );
+    boot_puts("\n");
+
     // peripherals initialisation
     boot_peripherals_init();
@@ -1687 +1765 @@
     boot_puts("\n");
 
-    // page table building
-    boot_pt_init();
-
-    boot_puts("\n[BOOT] Page Tables initialisation completed at cycle ");
-    boot_putw( boot_proctime() );
-    boot_puts("\n");
-
     // mmu activation
     boot_set_mmu_ptpr( (unsigned int)boot_ptabs_paddr[0] >> 13 );
@@ -1699 +1770 @@
 
     boot_puts("\n[BOOT] MMU activation completed at cycle ");
-    boot_putw( boot_proctime() );
-    boot_puts("\n");
-
-    // vobjs initialisation
-    boot_vobjs_init();
-
-    boot_puts("\n[BOOT] Vobjs initialisation completed at cycle : ");
     boot_putw( boot_proctime() );
     boot_puts("\n");