Changeset 279 for trunk/tools

Timestamp:

Jul 27, 2017, 12:23:29 AM (7 years ago)

Author:

alain

Message:

1) Introduce independant command fields for the various devices in the thread descriptor.
2) Introduce a new dev_pic_enable_ipi() function in the generic PIC device
3) Fix two bugs identified by Maxime in the scheduler initialisation, and in the sched_select().
4) fix several bugs in the TSAR hal_kentry.S.
5) Introduce a third kgiet segment (besides kdata and kcode) in the TSAR bootloader.

Location:

trunk/tools

Files:

• arch_info/genarch.py (modified) (4 diffs)
• bootloader_tsar/boot.c (modified) (9 diffs)

trunk/tools/arch_info/genarch.py

@@ -25 +25 @@
 #  --fbf_size=int    : frame buffer width & heigth
 #  --ioc_type=string : can be IOC_BDV , IOC_HBA , IOC_SDC , IOC_SPI
-#  --io_cxy=int      : IO cluster identifier
-#  --boot_cxy=int    : boot cluster identifier
-#  --cache_line=int  : number of bytes in a cache line
 #
 # The following parameters can be used to generate the optional "hard_config.h" file,
@@ -82 +79 @@
                    help = 'define type of IOC: BDV / HBA / SDC / RDK / SPI' )
 
-parser.add_option( '--io_cxy', type = 'int', dest = 'io_cxy',
-                   default = 0,
-                   help = 'define IO cluster identifier' )
-
-parser.add_option( '--boot_cxy', type = 'int', dest = 'boot_cxy',
-                   default = 0,
-                   help = 'define boot cluster identifier' )
-
-parser.add_option( '--cache_line', type = 'int', dest = 'cache_line',
-                   default = 64,
-                   help = 'define number of bytes in a cache line' )
-
 parser.add_option( '--hard', type = 'string', dest = 'hard_path',
                    help = 'define pathname to directory for the hard_config.h file ' )
@@ -120 +105 @@
 nb_nics        = options.nb_nics     # number of NIC channels           
 ioc_type       = options.ioc_type    # ioc controller type
-io_cxy         = options.io_cxy      # IO cluster identifier 
-boot_cxy       = options.boot_cxy    # boot cluster identifier 
-cache_line     = options.cache_line  # number of bytes in a cache line
 
 hard_path      = options.hard_path   # path for hard_config.h file
@@ -152 +134 @@
                         nb_nics, 
                         fbf_size, 
-                        ioc_type, 
-                        io_cxy,
-                        boot_cxy,
-                        cache_line )
+                        ioc_type )
 
 print '[genarch] archinfo build for %s' % archinfo.name 

trunk/tools/bootloader_tsar/boot.c

@@ -109 +109 @@
 uint32_t                        seg_kdata_base;  // kdata segment base address
 uint32_t                        seg_kdata_size;  // kdata segment size (bytes) 
+uint32_t                        seg_kgiet_base;  // kcode segment base address
+uint32_t                        seg_kgiet_size;  // kcode segment size (bytes) 
+
 uint32_t                        kernel_entry;    // kernel entry point
 
@@ -172 +175 @@
 /**************************************************************************************
  * This function loads the 'kernel.elf' file into the boot cluster memory buffer,
- * analyzes it, and places the the two seg_kcode & seg_kdata segments at their final
- * physical adresses (just after the preloader zone).        
+ * analyzes it, and places the three kcode, kgiet, kdata segments at their final
+ * physical adresses (defined the .elf file).        
  * It set the global variables defining the kernel layout.
  *************************************************************************************/
@@ -189 +192 @@
     bool_t       kcode_found;     // kcode segment found.
     bool_t       kdata_found;     // kdata segment found.
+    bool_t       kgiet_found;     // kgiet segment found.
     uint32_t     seg_id;          // iterator for segments loop.
 
@@ -229 +233 @@
     kcode_found = false;
     kdata_found = false;
+    kgiet_found = false;
     for (seg_id = 0; seg_id < segments_nb; seg_id++) 
     {
@@ -259 +264 @@
             }
 
-            // Note: we suppose that the 'kernel.elf' file contains only 2 
-            // loadable segments ktext & kdata and that the main 
-            // difference between these two is the WRITE permission: ktext 
-            // contains read-only instructions and read_only data,
-            // while kdata contains writable data.
-
-            if ((program_header[seg_id].p_flags & PF_W) == 0)  // kcode segment
+            // Note: we suppose that the 'kernel.elf' file contains exactly
+            // three loadable segments ktext, kgiet, & kdata:
+            // - the kcode segment is read-only and base < 0x80000000
+            // - the kgiet segment is read-only and base >= 0x8000000
+
+            if( ((program_header[seg_id].p_flags & PF_W) == 0) &&
+                 (program_header[seg_id].p_paddr < 0x80000000) )     // kcode segment
             {
                 if( kcode_found )
                 {
                     boot_printf("\n[BOOT_ERROR] in %s for file %s :\n"
-                                "   two loadable kcode segments found\n",
+                                "   two kcode segments found\n",
                                 __FUNCTION__ , KERNEL_PATHNAME );
                     boot_exit();
@@ -279 +284 @@
                 seg_kcode_size = seg_memsz;
             }
-            else                                               // kdata segment
+            else if( program_header[seg_id].p_paddr >= 0x80000000 ) // kgiet segment
+            {
+                if( kgiet_found )
+                {
+                    boot_printf("\n[BOOT_ERROR] in %s for file %s :\n"
+                                "   two kgiet segments found\n",
+                                __FUNCTION__ , KERNEL_PATHNAME );
+                    boot_exit();
+                } 
+
+                kgiet_found     = true;
+                seg_kgiet_base = seg_paddr;
+                seg_kgiet_size = seg_memsz;
+            }
+            else                                                    // kdata segment
             {
                 if( kdata_found )
@@ -299 +318 @@
     if( kcode_found == false )
     {
-        boot_printf("\n[BOOT_ERROR] in %s for file %s :\n"
-                    "   kcode segment not found\n",
+        boot_printf("\n[BOOT_ERROR] in %s for file %s : seg_kcode not found\n",
                     __FUNCTION__ , KERNEL_PATHNAME );
         boot_exit();
     }
-    if( kdata_found == false )
-    {
-        boot_printf("\n[BOOT_ERROR] in %s for file %s :\n"
-                    "   kdata segment not found\n",
+    if( kgiet_found == false )
+    {
+        boot_printf("\n[BOOT_ERROR] in %s for file %s : seg_kgiet not found\n",
                     __FUNCTION__ , KERNEL_PATHNAME );
         boot_exit();
     }
+    if( kdata_found == false )
+    {
+        boot_printf("\n[BOOT_ERROR] in %s for file %s : seg_kdata not found\n",
+                    __FUNCTION__ , KERNEL_PATHNAME );
+        boot_exit();
+    }
 
     // set entry point 
@@ -316 +339 @@
 
 #if DEBUG_BOOT_ELF 
-boot_printf("\n[BOOT INFO] %s successfully completed for file %s at cycle %d\n",
+boot_printf("\n[BOOT INFO] %s completed for file %s at cycle %d\n",
             __FUNCTION__ , KERNEL_PATHNAME , boot_get_proctime() );
 #endif
@@ -584 +607 @@
           boot_info->kernel_code_end : boot_info->kernel_data_end;
 
-    // Set number of pages occupied by the kernel code 
+    // compute number of physical pages occupied by the kernel code 
     boot_info->pages_offset = ( (end & CONFIG_PPM_PAGE_MASK) == 0 ) ?
                  (end >> CONFIG_PPM_PAGE_SHIFT) : (end >> CONFIG_PPM_PAGE_SHIFT) + 1;
 
-    // No "reserved zones" for the TSAR architecture
-    boot_info->rsvd_nr = 0;
+    // set one reserved zone for giet code
+    uint32_t first_page = seg_kgiet_base >> CONFIG_PPM_PAGE_SHIFT;
+    uint32_t last_page  = (seg_kgiet_base + seg_kgiet_size - 1) >> CONFIG_PPM_PAGE_SHIFT;
+
+    boot_info->rsvd_nr = 1;
+    boot_info->rsvd[0].first_page = first_page;
+    boot_info->rsvd[0].npages     = last_page - first_page + 1;
 
     // set boot_info signature