Changeset 653 for trunk/boot/tsar_mips32/boot.c

Timestamp:

Nov 14, 2019, 4:00:51 PM (5 years ago)

Author:

alain

Message:

Remove the hard_config.h file include.

File:

• trunk/boot/tsar_mips32/boot.c (modified) (10 diffs)

trunk/boot/tsar_mips32/boot.c

@@ -30 +30 @@
  *                                                                          *
  * The 'boot.elf' file (containing the boot-loader binary code) is stored   *
- * on disk (not in the FAT file system), and must be loaded into memory by  *
- * the preloader running on the core[0][0] (cxy = 0 / lid = 0).             *
+ * on disk (not in the FAT file system), and must be loaded into memory     *
+ * by the generic (OS undependant) preloader.                               *
  *                                                                          *
  * The main task of the boot-loader is to load in the first physical page   *
@@ -37 +37 @@
  * and to build - in each cluster - a cluster specific description of the   *
  * hardware archtecture, stored in the "kdata" segment as the boot_info_t   *
- * structure. The "kernel.elf" and "arch_info.bin" files are supposed to be *
- * stored on disk in a FAT32 file system.                                   *
+ * structure. These "kernel.elf" and "arch_info.bin" files are supposed     *
+ * to be stored on disk in a FAT32 file system.                             *
  *                                                                          *
  * All cores contribute to the boot procedure, but all cores are not        *
@@ -49 +49 @@
  * actual kernel initialisation.                                            *
  *                                                                          *
- * Implementation note:                                                     *                      *                                                                          *
+ * Implementation note:                                                     *
+ *                                                                          *
  * To allows each core to use the local copy of both the boot code and the  *
  * kernel code, the boot-loader builds a minimal and temporary BPT (Boot    *
@@ -768 +769 @@
     {
         /************************************i**********************
-         * PHASE Sequencial : only core[0][0] executes it 
+         * PHASE Sequencial : only core[0,0] executes it 
          **********************************************************/
         if (cxy == 0)
         {
-            boot_printf("\n[BOOT] core[%x,%d] active at cycle %d\n",
-            cxy, lid, boot_get_proctime() );
-
             // Initialize IOC driver 
             if      (USE_IOC_BDV) boot_bdv_init();
@@ -830 +828 @@
             boot_activate_ins_mmu( 0 );
 
-            // Activate other core[cxy][0] / get number of activated cores
+            // Activate other core[cxy,0] / set number of activated cores
             active_cores_nr = boot_wake_all_cp0s() + 1;
 
-            // Wait until all clusters (i.e all CP0s) ready to enter kernel.
+            // Wait until all clusters (i.e all core[cxy,0]) ready to enter kernel.
             boot_remote_barrier( XPTR( BOOT_CORE_CXY , &global_barrier ) ,
                                  active_cores_nr );
@@ -845 +843 @@
         }
         /**************************************************************************
-         * PHASE partially parallel : all core[cxy][0] with (cxy != 0) execute it
+         * PHASE partially parallel : all core[cxy,0] with (cxy != 0) execute it
          **************************************************************************/
         else
         {
             // at this point, the DATA extension registers point
-            // already on the local cluster cxy to use the local stack, 
+            // on the local cluster cxy to use the local stack, 
             // but all cores must access the code stored in cluster 0 
 
-#if DEBUG_BOOT_MULTI
-boot_printf("\n[BOOT] core[%x,%d] active at cycle %d\n",
-cxy, lid, boot_get_proctime() );
-#endif
-            // Each core[cxy][0] copies the boot code (data and instructions)
+            // Each core[cxy,0] copies the boot code (data and instructions)
             // from the cluster 0 to the local cluster.
             boot_remote_memcpy( XPTR( cxy           , BOOT_BASE ),
@@ -864 +858 @@
 
             // from now, it is safe to refer to the boot global variables 
-            boot_printf("\n[BOOT] core[%x,%d] replicated boot code at cycle %d\n",
-            cxy , lid , boot_get_proctime() );
-
+
+#if DEBUG_BOOT_MULTI
+boot_printf("\n[BOOT] core[%x,%d] replicated boot code at cycle %d\n",
+cxy , lid , boot_get_proctime() );
+#endif
             // identity maps two big pages for the boot and kernel code,
             boot_page_table_init( cxy );
@@ -873 +869 @@
             boot_activate_ins_mmu( cxy );
 
-            // Each CP0 copies the arch_info.bin into the local memory.
+            // Each core[cxy,0] copies the arch_info.bin into the local memory.
             boot_remote_memcpy(XPTR(cxy,           ARCHINFO_BASE),
                                XPTR(BOOT_CORE_CXY, ARCHINFO_BASE),
                                ARCHINFO_MAX_SIZE );
-
-            boot_printf("\n[BOOT] core[%x,%d] replicated arch_info at cycle %d\n",
-            cxy , lid , boot_get_proctime() );
-
+#if DEBUG_BOOT_MULTI
+boot_printf("\n[BOOT] core[%x,%d] replicated arch_info at cycle %d\n",
+cxy , lid , boot_get_proctime() );
+#endif
             // copy the kcode segment into local memory 
             boot_remote_memcpy( XPTR( cxy           , seg_kcode_base ),
@@ -886 +882 @@
                                 seg_kcode_size );
 
-            // Each CP0 copies the kdata segment into local memory
+            // Each core[cxy,0] copies the kdata segment into local memory
             boot_remote_memcpy( XPTR( cxy           , seg_kdata_base ),
                                 XPTR( BOOT_CORE_CXY , seg_kdata_base ),
                                 seg_kdata_size );
-
-            boot_printf("\n[BOOT] core[%x,%d] replicated kernel code at cycle %d\n",
-            cxy , lid , boot_get_proctime() );
-
-            // Each CP0 get local boot_info_t structure base address.
+#if DEBUG_BOOT_MULTI
+boot_printf("\n[BOOT] core[%x,%d] replicated kernel code at cycle %d\n",
+cxy , lid , boot_get_proctime() );
+#endif
+            // Each core[cxy,0] get local boot_info_t structure base address.
             boot_info = (boot_info_t*)seg_kdata_base;
 
-            // Each CP0 initializes local boot_info_t structure.
+            // Each core[cxy,0] initializes local boot_info_t structure.
             boot_info_init( boot_info , cxy );
 
-            boot_printf("\n[BOOT] core[%x,%d] initialised boot_info at cycle %d\n",
-            cxy , lid , boot_get_proctime() );
-
-            // Each CP0 checks core information.
+#if DEBUG_BOOT_MULTI
+boot_printf("\n[BOOT] core[%x,%d] initialised boot_info at cycle %d\n",
+cxy , lid , boot_get_proctime() );
+#endif
+            // Each core[cxy,0] checks core information.
             boot_check_core( boot_info , lid );
 
-            // Each CP0 get number of active clusters from BOOT_CORE cluster
+            // Each core[cxy,0] get number of active clusters from BOOT_CORE cluster
             uint32_t count = boot_remote_lw( XPTR( 0 , &active_cores_nr ) );
 
@@ -923 +920 @@
     {
         /***********************************************************************
-         * PHASE fully parallel : all cores[cxy][lid] with (lid! = 0) execute it
+         * PHASE fully parallel : all cores[cxy,lid] with (lid! = 0) execute it
          **********************************************************************/
 
-#if DEBUG_BOOT_MULTI
-boot_printf("\n[BOOT] core[%x,%d] active at cycle %d\n",
-cxy, lid, boot_get_proctime() );
-#endif
         // activate the instruction MMU to use the local copy of the boot code
         boot_activate_ins_mmu( cxy );