Changeset 557 for soft

Timestamp:

Apr 13, 2015, 5:28:46 PM (10 years ago)

Author:

alain

Message:

Update the GIET-VM bootloader to use distributed MWR_CPY coprocessor
that replace the MULTI_DMA in the tsar_generic_iob platform.

File:

• soft/giet_vm/giet_boot/boot.c (modified) (7 diffs)

soft/giet_vm/giet_boot/boot.c

@@ -1413 +1413 @@
 
 
+///////////////////////////////////////////////////
+void boot_dma_copy( unsigned int        cluster_xy,      
+                    unsigned long long  dst_paddr,
+                    unsigned long long  src_paddr, 
+                    unsigned int        size )   
+{
+    // size must be multiple of 64 bytes
+    if ( size & 0x3F ) size = (size & (~0x3F)) + 0x40;
+
+    unsigned int mode = MODE_DMA_NO_IRQ;
+
+    unsigned int src     = 0;
+    unsigned int src_lsb = (unsigned int)src_paddr;
+    unsigned int src_msb = (unsigned int)(src_paddr>>32);
+    
+    unsigned int dst     = 1;
+    unsigned int dst_lsb = (unsigned int)dst_paddr;
+    unsigned int dst_msb = (unsigned int)(dst_paddr>>32);
+
+    // initializes src channel
+    _mwr_set_channel_register( cluster_xy , src , MWR_CHANNEL_MODE       , mode );
+    _mwr_set_channel_register( cluster_xy , src , MWR_CHANNEL_SIZE       , size );
+    _mwr_set_channel_register( cluster_xy , src , MWR_CHANNEL_BUFFER_LSB , src_lsb );
+    _mwr_set_channel_register( cluster_xy , src , MWR_CHANNEL_BUFFER_MSB , src_msb );
+    _mwr_set_channel_register( cluster_xy , src , MWR_CHANNEL_RUNNING    , 1 );
+
+    // initializes dst channel
+    _mwr_set_channel_register( cluster_xy , dst , MWR_CHANNEL_MODE       , mode );
+    _mwr_set_channel_register( cluster_xy , dst , MWR_CHANNEL_SIZE       , size );
+    _mwr_set_channel_register( cluster_xy , dst , MWR_CHANNEL_BUFFER_LSB , dst_lsb );
+    _mwr_set_channel_register( cluster_xy , dst , MWR_CHANNEL_BUFFER_MSB , dst_msb );
+    _mwr_set_channel_register( cluster_xy , dst , MWR_CHANNEL_RUNNING    , 1 );
+
+    // start CPY coprocessor (write non-zero value into config register)
+    _mwr_set_coproc_register( cluster_xy, 0 , 1 );
+
+    // poll dst channel status register to detect completion
+    unsigned int status;
+    do
+    {
+        status = _mwr_get_channel_register( cluster_xy , dst , MWR_CHANNEL_STATUS );
+    } while ( status == MWR_CHANNEL_BUSY );
+
+    if ( status )
+    {
+        _printf("\n[BOOT ERROR] in boot_dma_copy()\n");
+        _exit();
+    }  
+  
+    // stop CPY coprocessor and DMA channels
+    _mwr_set_channel_register( cluster_xy , src , MWR_CHANNEL_RUNNING    , 0 );
+    _mwr_set_channel_register( cluster_xy , dst , MWR_CHANNEL_RUNNING    , 0 );
+    _mwr_set_coproc_register ( cluster_xy , 0 , 0 );
+
+}  // end boot_dma_copy()
+
 //////////////////////////////////////////////////////////////////////////////////
 // This function load all loadable segments contained in the .elf file identified 
@@ -1443 +1499 @@
 
 #if BOOT_DEBUG_ELF
-_printf("\n[DEBUG BOOT_ELF] P[%d,%d,%d] enters load_one_elf_file() : %s\n",
+_printf("\n[DEBUG BOOT_ELF] load_one_elf_file() : P[%d,%d,%d] enters for %s\n",
         x , y , p , pathname );
 #endif
@@ -1498 +1554 @@
              (ptr->e_ident[EI_MAG3] != ELFMAG3) )
         {
-            _printf("\n[BOOT ERROR] load_elf() : file %s does not use ELF format\n",
+            _printf("\n[BOOT ERROR] load_one_elf_file() : %s not ELF format\n",
                     pathname );
             _exit();
@@ -1504 +1560 @@
 
 #if BOOT_DEBUG_ELF
-_printf("\n[DEBUG BOOT_ELF] P[%d,%d,%d] load file %s\n", 
-        x , y , p , pathname );
+_printf("\n[DEBUG BOOT_ELF] load_one_elf_file() : P[%d,%d,%d] load %s at cycle %d\n", 
+        x , y , p , pathname , _get_proctime() );
 #endif
 
@@ -1580 +1636 @@
                     paddr_t      seg_paddr  = vseg[vseg_id].pbase;
                     unsigned int seg_size   = vseg[vseg_id].length;
-                    unsigned int extend     = (unsigned int)(seg_paddr>>32);
-                    unsigned int cx         = extend >> Y_WIDTH;
-                    unsigned int cy         = extend & ((1<<Y_WIDTH)-1);
+                    unsigned int cluster_xy = (unsigned int)(seg_paddr>>32);
+                    unsigned int cx         = cluster_xy >> Y_WIDTH;
+                    unsigned int cy         = cluster_xy & ((1<<Y_WIDTH)-1);
 
                     // check vseg size
@@ -1594 +1650 @@
 
                     // P[x,y,0] copy the segment from boot buffer in cluster[0,0] 
-                    // to destination buffer in cluster[x,y], 
+                    // to destination buffer in cluster[x,y], using DMA if available
                     if ( (cx == x) && (cy == y) )
                     {
-                        if( NB_DMA_CHANNELS > 0 )
+                        if( USE_MWR_CPY )
                         {
-                            _dma_physical_copy( extend,    // DMA in cluster[x,y]       
-                                                0,         // DMA channel 0
-                                                seg_paddr,
-                                                (paddr_t)src_vaddr, 
-                                                seg_filesz );   
+                            boot_dma_copy( cluster_xy,  // DMA in cluster[x,y]       
+                                           seg_paddr,
+                                           (paddr_t)src_vaddr, 
+                                           seg_filesz );   
+#if BOOT_DEBUG_ELF
+_printf("\n[DEBUG BOOT_ELF] load_one_elf_file() : DMA[%d,%d] copy segment %d :\n"
+        "  vaddr = %x / size = %x / paddr = %l\n",
+        x , y , seg_id , seg_vaddr , seg_memsz , seg_paddr );
+#endif
                         }
                         else
@@ -1610 +1670 @@
                                               (paddr_t)src_vaddr,   // source paddr
                                               seg_filesz );         // size
-                        }
 #if BOOT_DEBUG_ELF
-_printf("\n[DEBUG BOOT_ELF] P[%d,%d,%d] copy segment %d :\n"
+_printf("\n[DEBUG BOOT_ELF] load_one_elf_file() : P[%d,%d,%d] copy segment %d :\n"
         "  vaddr = %x / size = %x / paddr = %l\n",
         x , y , p , seg_id , seg_vaddr , seg_memsz , seg_paddr );
 #endif
+                        }
                     }
                 }