Changeset 359

Timestamp:

Jul 23, 2014, 10:09:42 AM (10 years ago)

Author:

alain

Message:

1/ Introduce the boot.S file that is the entry point
in the GIET-VM bootloader: The GIET-VM does not use
the preloader stack anymore, but uses its own stack
2/ Remove the seg_boot_buffer segment for the boot-loader.
The buffer used to load a complete .elf segment is defined
as a global variable in the seg_boot_data segment.
The GIET_ELF_BUFFER_SIZE is defined in the giet_config.h file.

Location:

soft/giet_vm/giet_boot

Files:

• boot.S (added)
• boot.c (modified) (14 diffs)

soft/giet_vm/giet_boot/boot.c

@@ -8 +8 @@
 //
 // This nano-kernel has been written for the MIPS32 processor.
-// The virtual adresses are on 32 bits and use the (unsigned int) type, but the 
+// The virtual adresses are on 32 bits and use the (unsigned int) type. The 
 // physicals addresses can have up to 40 bits, and use the  (unsigned long long) type.
 // It natively supports clusterised shared mmemory multi-processors architectures, 
@@ -14 +14 @@
 // and where there is one physical memory bank per cluster.
 //
-// This code, executed in the boot phase by proc[0,0,0] performs the following tasks:
-// - load into memory the binary files, from a FAT32 file system,
+// This code, executed in the boot phase by proc[0,0,0], performs the following tasks:
+// - load into memory various binary files, from a FAT32 file system,
 // - build the various page tables (one page table per vspace) 
 // - initialize the shedulers (one scheduler per processor)
@@ -95 +95 @@
 
 #if !defined(X_SIZE)
-# error The X_SIZE value must be defined in the 'hard_config.h' file !
+# error: The X_SIZE value must be defined in the 'hard_config.h' file !
 #endif
 
 #if !defined(Y_SIZE)
-# error The Y_SIZE value must be defined in the 'hard_config.h' file !
+# error: The Y_SIZE value must be defined in the 'hard_config.h' file !
 #endif
 
 #if !defined(X_WIDTH)
-# error The X_WIDTH value must be defined in the 'hard_config.h' file !
+# error: The X_WIDTH value must be defined in the 'hard_config.h' file !
 #endif
 
 #if !defined(Y_WIDTH)
-# error The Y_WIDTH value must be defined in the 'hard_config.h' file !
+# error: The Y_WIDTH value must be defined in the 'hard_config.h' file !
 #endif
 
 #if !defined(SEG_BOOT_MAPPING_BASE) 
-# error: You must define SEG_BOOT_MAPPING_BASE in the hard_config.h file
-#endif
-
-#if !defined(SEG_BOOT_BUFFER_BASE) 
-# error: You must define SEG_BOOT_BUFFER_BASE in the hard_config.h file
-#endif
-
-#if !defined(SEG_BOOT_BUFFER_SIZE) 
-# error: You must define SEG_BOOT_BUFFER_SIZE in the hard_config.h file
+# error: The SEG_BOOT_MAPPING_BASE value must be defined in the hard_config.h file !
 #endif
 
 #if !defined(NB_PROCS_MAX)
-# error The NB_PROCS_MAX value must be defined in the 'hard_config.h' file !
+# error: The NB_PROCS_MAX value must be defined in the 'hard_config.h' file !
 #endif
 
 #if !defined(GIET_NB_VSPACE_MAX)
-# error The GIET_NB_VSPACE_MAX value must be defined in the 'giet_config.h' file !
+# error: The GIET_NB_VSPACE_MAX value must be defined in the 'giet_config.h' file !
+#endif
+
+#if !defined(GIET_ELF_BUFFER_SIZE) 
+# error: The GIET_ELF_BUFFER_SIZE value must be defined in the giet_config.h file !
 #endif
 
@@ -134 +130 @@
 // Both the page tables for the various virtual spaces, and the schedulers
 // for the processors are physically distributed on the clusters.
-// These global variables are just arrays of pointers. 
 ////////////////////////////////////////////////////////////////////////////
 
@@ -140 +135 @@
 extern fat32_fs_t fat;
 
-// Page tables base addresses, sizes, and PT2 allocators:
-// For each vspace, it can exist one page table per cluster,
-// but only one virtual base address per vspace
-
+// Page tables virtual base addresses (one per vspace)
 __attribute__((section (".bootdata"))) 
 unsigned int _ptabs_vaddr[GIET_NB_VSPACE_MAX];
 
+// Page tables physical base addresses (one per vspace / one per cluster)
 __attribute__((section (".bootdata"))) 
 paddr_t _ptabs_paddr[GIET_NB_VSPACE_MAX][X_SIZE][Y_SIZE];
 
+// Page table max_pt2 (one per vspace / one per cluster )
 __attribute__((section (".bootdata"))) 
 unsigned int _ptabs_max_pt2[GIET_NB_VSPACE_MAX][X_SIZE][Y_SIZE];
 
+// Page tables pt2 allocators (one per vspace / one per cluster)
 __attribute__((section (".bootdata"))) 
 unsigned int _ptabs_next_pt2[GIET_NB_VSPACE_MAX][X_SIZE][Y_SIZE];
@@ -161 +156 @@
 static_scheduler_t* _schedulers[1<<X_WIDTH][1<<Y_WIDTH][NB_PROCS_MAX];
 
+// Temporaty buffer used to load one complete .elf file  
+__attribute__((section (".bootdata"))) 
+char boot_elf_buffer[GIET_ELF_BUFFER_SIZE] __attribute__((aligned(512)));
 
 /////////////////////////////////////////////////////////////////////
@@ -1916 +1914 @@
 // clusters: same virtual address but different physical addresses.  
 // - It open the file.
-// - It loads the complete file in a dedicated buffer (seg_boot_buffer).
-// - It copies each loadable segments  at the virtual address defined in the .elf
-//   file, making several copies if the target vseg is not local.
+// - It loads the complete file in the dedicated boot_elf_buffer.
+// - It copies each loadable segments  at the virtual address defined in 
+//   the .elf file, making several copies if the target vseg is not local.
 // - It closes the file.
+// This function is supposed to be executed by processor[0,0,0].
 // Note: 
-// - This function is supposed to be executed by processor[0,0,0].
 //   We must use physical addresses to reach the destination buffers that
 //   can be located in remote clusters. We use either a _physical_memcpy(), 
 //   or a _dma_physical_copy() if DMA is available.
-//   The source seg_boot_buffer must be identity mapping.
 //////////////////////////////////////////////////////////////////////////////////////
 void load_one_elf_file( unsigned int is_kernel,     // kernel file if non zero
@@ -1938 +1935 @@
     unsigned int seg_id;
 
-    // get boot buffer address and size
-    char*             boot_buffer      = (char*)SEG_BOOT_BUFFER_BASE;
-    unsigned int      boot_buffer_size = SEG_BOOT_BUFFER_SIZE;
-
 #if BOOT_DEBUG_ELF
 _puts("\n[BOOT DEBUG] Start searching file ");
@@ -1962 +1955 @@
     }
 
-    // check boot_buffer size versus file size
-    if ( fat.fd[fd_id].file_size > boot_buffer_size )
+    // check buffer size versus file size
+    if ( fat.fd[fd_id].file_size > GIET_ELF_BUFFER_SIZE )
     {
         _puts("\n[BOOT ERROR] load_one_elf_file() : ");
         _puts( pathname );
-        _puts(" exceeds the seg_boot_buffer size\n");
+        _puts(" exceeds the GIET_ELF_BUFFERSIZE defined in giet_config.h\n");
         _exit();
     }
@@ -1976 +1969 @@
     if( nbytes & 0x1FF) nsectors++;
 
-    // load file in boot_buffer
+    // load file in elf buffer
     if( _fat_read( IOC_BOOT_MODE, 
                    fd_id, 
-                   boot_buffer,
+                   boot_elf_buffer,
                    nsectors,
                    0 ) != nsectors )
@@ -1990 +1983 @@
 
     // Check ELF Magic Number in ELF header
-    Elf32_Ehdr* elf_header_ptr = (Elf32_Ehdr*)boot_buffer;
+    Elf32_Ehdr* elf_header_ptr = (Elf32_Ehdr*)boot_elf_buffer;
 
     if ( (elf_header_ptr->e_ident[EI_MAG0] != ELFMAG0) ||
@@ -2012 +2005 @@
         _exit();
     }
-    Elf32_Phdr* elf_pht_ptr = (Elf32_Phdr*)(boot_buffer + pht_index);
+    Elf32_Phdr* elf_pht_ptr = (Elf32_Phdr*)(boot_elf_buffer + pht_index);
 
     // get number of segments
@@ -2050 +2043 @@
                 _puts(" in file ");
                 _puts( pathname );
-                _puts(" has a memsz < filesz \n");   
+                _puts(" has memsz < filesz \n");   
                 _exit();
             }
@@ -2058 +2051 @@
             {
                 unsigned int i; 
-                for( i = seg_filesz ; i < seg_memsz ; i++ ) boot_buffer[i+seg_offset] = 0;
+                for( i = seg_filesz ; i < seg_memsz ; i++ ) boot_elf_buffer[i+seg_offset] = 0;
             } 
 
-            unsigned int src_vaddr = (unsigned int)boot_buffer + seg_offset;
+            unsigned int src_vaddr = (unsigned int)boot_elf_buffer + seg_offset;
 
             // search all vsegs matching the virtual address