- Timestamp:
- Apr 3, 2014, 2:02:50 PM (11 years ago)
- Location:
- soft/giet_vm
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
soft/giet_vm/Makefile
r297 r299 11 11 ### partition sectors = 524832 12 12 13 MAP_XML = mappings/4c_1p_ four_leti_ext.xml13 MAP_XML = mappings/4c_1p_sort_iob.xml 14 14 15 15 ### Objects to be linked for kernel.elf … … 52 52 build/drivers/xcu_driver.o \ 53 53 build/drivers/ioc_driver.o \ 54 build/drivers/iob_driver.o \ 54 55 build/drivers/bdv_driver.o \ 55 56 build/drivers/sdc_driver.o \ -
soft/giet_vm/giet_boot/boot.c
r295 r299 79 79 #include <nic_driver.h> 80 80 #include <ioc_driver.h> 81 #include <iob_driver.h> 81 82 #include <pic_driver.h> 82 83 #include <mwr_driver.h> … … 1963 1964 { 1964 1965 // initialize all channels except channel 0 because it has been 1965 // initialize during mapping_info loading1966 // initialized by the preloader. 1966 1967 for (channel_id = 1; channel_id < channels; channel_id++) 1967 1968 { … … 1975 1976 break; 1976 1977 } 1977 case PERIPH_TYPE_DMA: // vci_multi_dma component1978 {1979 for (channel_id = 0; channel_id < channels; channel_id++)1980 {1981 _dma_init( cluster_xy, channel_id );1982 }1983 #if BOOT_DEBUG_PERI1984 _puts("- DMA / channels = ");1985 _putd(channels);1986 _puts("\n");1987 #endif1988 break;1989 }1990 case PERIPH_TYPE_FBF: // vci_block_device component1991 {1992 // nothing to do1993 #if BOOT_DEBUG_PERI1994 _puts("- FBF / channels = ");1995 _putd(channels);1996 _puts("\n");1997 #endif1998 break;1999 }2000 1978 case PERIPH_TYPE_CMA: // vci_chbuf_dma component 2001 1979 { … … 2024 2002 break; 2025 2003 } 2026 case PERIPH_TYPE_XCU: // vci_xicu component2027 {2028 // nothing to do2029 #if BOOT_DEBUG_PERI2030 _puts("- XCU / channels = ");2031 _putd(channels);2032 _puts("\n");2033 #endif2034 break;2035 }2036 case PERIPH_TYPE_MMC: // vci_memcache config2037 {2038 // nothing to do2039 #if BOOT_DEBUG_PERI2040 _puts("- MMC / channels = ");2041 _putd(channels);2042 _puts("\n");2043 #endif2044 break;2045 }2046 2004 case PERIPH_TYPE_TTY: // vci_multi_tty component 2047 2005 { … … 2056 2014 case PERIPH_TYPE_IOB: // vci_io_bridge component 2057 2015 { 2058 if (USE_IOB) 2016 // initialize r_xicu_base & r_xicu_size registers 2017 unsigned int base = (unsigned int)&seg_xcu_base; 2018 2019 #if BOOT_DEBUG_PERI 2020 _puts("- IOB / channels = "); 2021 _putd(channels); 2022 _puts(" / XICU_BASE = "); 2023 _putx( base ); 2024 _puts(" / XICU_SIZE = "); 2025 _putx( 0x1000 ); 2026 _puts("\n"); 2027 #endif 2028 _iob_set_xicu_base( cluster_xy, base ); 2029 _iob_set_xicu_size( cluster_xy, 0x1000 ); 2030 2031 if (GIET_USE_IOMMU) 2059 2032 { 2060 2033 // TODO … … 2066 2039 // pseg_base[IOB_IOMMU_ACTIVE] = 1; 2067 2040 } 2068 #if BOOT_DEBUG_PERI2069 _puts("- IOB / channels = ");2070 _putd(channels);2071 _puts("\n");2072 #endif2073 2041 break; 2074 2042 } … … 2222 2190 _set_sched( (unsigned int)_schedulers[0] ); 2223 2191 2224 // Initializing peripherals2192 // Initializing non replicated peripherals 2225 2193 boot_peripherals_init(); 2226 2194 -
soft/giet_vm/giet_config.h
r295 r299 40 40 #define GIET_OPEN_FILES_MAX 16 /* max simultaneously open files */ 41 41 #define GIET_NB_VSPACE_MAX 64 /* max number of virtual spaces */ 42 #define GIET_TICK_VALUE 0x 8000/* context switch period (number of cycles) */42 #define GIET_TICK_VALUE 0xFFFFFFFF /* context switch period (number of cycles) */ 43 43 #define GIET_USE_IOMMU 0 /* IOMMU activated when non zero */ 44 44 #define GIET_NO_HARD_CC 0 /* No hard cache coherence when non zero */ -
soft/giet_vm/giet_kernel/kernel_init.c
r294 r299 157 157 158 158 #if GIET_DEBUG_INIT 159 _printf("\n[GIET DEBUG INIT] Processor[%d,%d,%d] cont ibutes to PTABS arrays\n"159 _printf("\n[GIET DEBUG INIT] Processor[%d,%d,%d] contributes to PTABS arrays\n" 160 160 " - ptabs_vaddr[%d] = %x / ptpr_paddr[%d] = %l\n", 161 161 x, y, lpid, … … 176 176 177 177 #if GIET_DEBUG_INIT 178 _printf("\n[GIET DEBUG INIT] Processor[%d,%d,%d] set schedulerfor task %d\n"178 _printf("\n[GIET DEBUG INIT] Processor[%d,%d,%d] update context for task %d\n" 179 179 " - ctx_epc = %x\n" 180 180 " - ctx_ra = %x\n", … … 307 307 308 308 unsigned int* pcount = &_init_barrier; 309 unsigned int nprocs = X_SIZE*(Y_SIZE-1)*NB_PROCS_MAX;309 unsigned int nprocs = TOTAL_PROCS; 310 310 unsigned int count; 311 311 -
soft/giet_vm/giet_xml/xml_parser.c
r296 r299 108 108 //////////////////////////////////////////////////////////////////////// 109 109 110 unsigned int total_procs = 0; // total number of processors 110 111 unsigned int nb_procs_max = 0; // max number of processors per cluster 111 112 unsigned int nb_tasks_max = 0; // max number of tasks (in all vspaces) … … 1932 1933 proc_loc_index++; 1933 1934 proc_index++; 1935 total_procs++; 1934 1936 } // end procNode() 1935 1937 … … 2684 2686 file_write(fdout, "\n"); 2685 2687 2688 def_int_write(fdout, "TOTAL_PROCS ", total_procs); 2686 2689 def_int_write(fdout, "NB_PROCS_MAX ", nb_procs_max); 2687 2690 def_int_write(fdout, "NB_TASKS_MAX ", nb_tasks_max);
Note: See TracChangeset
for help on using the changeset viewer.