Changeset 299 for soft/giet_vm/giet_boot/boot.c

Timestamp:

Apr 3, 2014, 2:02:50 PM (11 years ago)

Author:

alain

Message:

ntroducing the TOTAL_PROCS variable in the hard_config.h file
(used by the synchronisation barrier in kernel_init.c)

File:

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

soft/giet_vm/giet_boot/boot.c

@@ -79 +79 @@
 #include <nic_driver.h>
 #include <ioc_driver.h>
+#include <iob_driver.h>
 #include <pic_driver.h>
 #include <mwr_driver.h>
@@ -1963 +1964 @@
                 {
                     // initialize all channels except channel 0 because it has been
-                    // initialize during mapping_info loading
+                    // initialized by the preloader.
                     for (channel_id = 1; channel_id < channels; channel_id++) 
                     {
@@ -1975 +1976 @@
                     break;
                 }
-                case PERIPH_TYPE_DMA:    // vci_multi_dma component
-                {
-                    for (channel_id = 0; channel_id < channels; channel_id++) 
-                    {
-                        _dma_init( cluster_xy, channel_id );
-                    }
-#if BOOT_DEBUG_PERI
-_puts("- DMA / channels = ");
-_putd(channels);
-_puts("\n");
-#endif
-                    break;
-                }
-                case PERIPH_TYPE_FBF:    // vci_block_device component
-                {
-                    // nothing to do
-#if BOOT_DEBUG_PERI
-_puts("- FBF / channels = ");
-_putd(channels);
-_puts("\n");
-#endif
-                    break;
-                }
                 case PERIPH_TYPE_CMA:    // vci_chbuf_dma component
                 {
@@ -2024 +2002 @@
                     break;
                 }
-                case PERIPH_TYPE_XCU:    // vci_xicu component
-                {
-                    // nothing to do 
-#if BOOT_DEBUG_PERI
-_puts("- XCU / channels = ");
-_putd(channels);
-_puts("\n");
-#endif
-                    break;
-                }
-                case PERIPH_TYPE_MMC:    // vci_memcache config
-                {
-                    // nothing to do
-#if BOOT_DEBUG_PERI
-_puts("- MMC / channels = ");
-_putd(channels);
-_puts("\n");
-#endif
-                    break;
-                }
                 case PERIPH_TYPE_TTY:    // vci_multi_tty component
                 {
@@ -2056 +2014 @@
                 case PERIPH_TYPE_IOB:    // vci_io_bridge component
                 {
-                    if (USE_IOB) 
+                    // initialize r_xicu_base & r_xicu_size registers
+                    unsigned int base = (unsigned int)&seg_xcu_base;
+
+#if BOOT_DEBUG_PERI
+_puts("- IOB / channels = ");
+_putd(channels);
+_puts(" / XICU_BASE = ");
+_putx( base );
+_puts(" / XICU_SIZE = ");
+_putx( 0x1000 );
+_puts("\n");
+#endif
+                    _iob_set_xicu_base( cluster_xy, base );
+                    _iob_set_xicu_size( cluster_xy, 0x1000 );
+
+                    if (GIET_USE_IOMMU) 
                     {
                         // TODO
@@ -2066 +2039 @@
                         // pseg_base[IOB_IOMMU_ACTIVE] = 1;        
                     }
-#if BOOT_DEBUG_PERI
-_puts("- IOB / channels = ");
-_putd(channels);
-_puts("\n");
-#endif
                     break;
                 }
@@ -2222 +2190 @@
         _set_sched( (unsigned int)_schedulers[0] );
 
-        // Initializing peripherals
+        // Initializing non replicated peripherals
         boot_peripherals_init();