Changeset 557

Timestamp:

Sep 21, 2018, 10:26:00 PM (6 years ago)

Author:

nicolas.van.phan@…

Message:

Add cluster_info[][] array in cluster descriptor

Location:

trunk

Files:

• boot/tsar_mips32/Makefile (modified) (1 diff)
• boot/tsar_mips32/boot.c (modified) (4 diffs)
• kernel/Makefile (modified) (1 diff)
• kernel/kern/cluster.c (modified) (1 diff)
• kernel/kern/cluster.h (modified) (1 diff)
• kernel/kern/cluster_info.c (added)
• kernel/kern/cluster_info.h (added)
• kernel/kernel_config.h (modified) (1 diff)
• tools/arch_info/boot_info.h (modified) (1 diff)

trunk/boot/tsar_mips32/Makefile

@@ -39 +39 @@
                 -I$(HAL_ARCH)/core   \
                 -I../.. \
-                -I$(KERNEL)
+                -I$(KERNEL) \
+                -I$(KERNEL)/kern
 
 # Rule to generate boot.elf, kernel.elf, ksh.elf, sort.elf and update virtual disk.

trunk/boot/tsar_mips32/boot.c

@@ -78 +78 @@
 #include <boot_info.h>
 
+#include <cluster_info.h>
+
 #include <boot_utils.h>
 #include <boot_fat32.h>
@@ -140 +142 @@
         case DEV_TYPE_TIM_SCL: return "TIM_SCL";
         case DEV_TYPE_TXT_TTY: return "TXT_TTY";
+        case DEV_TYPE_TXT_MTY: return "TXT_MTY";
         case DEV_TYPE_ICU_XCU: return "ICU_XCU";
         case DEV_TYPE_PIC_TSR: return "PIC_TSR";
@@ -415 +418 @@
     boot_info->kentry_size = seg_kentry_size;
 
+    /* Initialize all clusters as empty for now */
+    int x, y;
+    for ( x = 0; x < CONFIG_MAX_CLUSTERS_X; x++)
+    {
+        for ( x = 0; x < CONFIG_MAX_CLUSTERS_X; x++)
+        {
+            boot_info->cluster_info[x][y] = 0x0;
+        }
+    }
+
     // loop on arch_info clusters to get relevant pointers
     for (cluster =  cluster_base;
@@ -420 +433 @@
          cluster++)
     {
+        int x = cluster->cxy >> Y_WIDTH;
+        int y = cluster->cxy & ((1 << Y_WIDTH) - 1);
+
         if( cluster->cxy  == cxy )            my_cluster = cluster;
-        if( cluster->cxy  == header->io_cxy ) io_cluster = cluster;
+        if( cluster->cxy  == header->io_cxy ) {
+            io_cluster = cluster;
+            boot_info->cluster_info[x][y] |= CINFO_IS_IO;
+        }
+        if ( cluster->cores > 0 ) {
+            boot_info->cluster_info[x][y] |= CINFO_ACTIVE;
+        }
     }
 

trunk/kernel/Makefile

@@ -89 +89 @@
               build/kern/dqdt.o            \
               build/kern/do_syscall.o      \
-              build/kern/rpc.o 
+              build/kern/rpc.o             \
+              build/kern/cluster_info.o
 
 DEV_OBJS    = build/devices/dev_txt.o      \

trunk/kernel/kern/cluster.c

@@ -75 +75 @@
         cluster->io_cxy          = info->io_cxy;
 
+    // initialize the cluster_info[][] array
+    int x;
+    int y;
+    for (x = 0; x < CONFIG_MAX_CLUSTERS_X; x++) {
+        for (y = 0; y < CONFIG_MAX_CLUSTERS_Y;y++) {
+            cluster->cluster_info[x][y] = info->cluster_info[x][y];
+        }
+    }
     // initialize external peripherals channels
     for( i = 0 ; i < info->ext_dev_nr ; i++ )

trunk/kernel/kern/cluster.h

@@ -107 +107 @@
     uint32_t        x_max;             // [FIXME]
     uint32_t        y_max;             // [FIXME]
+    uint32_t        cluster_info[CONFIG_MAX_CLUSTERS_X][CONFIG_MAX_CLUSTERS_Y];
         cxy_t           io_cxy;            /*! io cluster identifier                          */
     uint32_t        dqdt_root_level;   /*! index of root node in dqdt_tbl[]               */

trunk/kernel/kernel_config.h

@@ -192 +192 @@
 
 #define CONFIG_KERNEL_IDENTITY_MAP          true       // True for 32 bits cores             
-#define CONFIG_MAX_CLUSTERS                 256        // max number of clusters
+#define CONFIG_MAX_CLUSTERS_X               16         // max number of cluster columns
+#define CONFIG_MAX_CLUSTERS_Y               16         // max number of cluster rows
+#define CONFIG_MAX_CLUSTERS                 (CONFIG_MAX_CLUSTERS_X * CONFIG_MAX_CLUSTERS_Y)
 #define CONFIG_MAX_LOCAL_CORES              4          // max number of cores per cluster
 #define CONFIG_MAX_INT_DEV                  4          // max number of internal peripherals

trunk/tools/arch_info/boot_info.h

@@ -114 +114 @@
     uint32_t      x_max;                         /*! [FIXME] Nb of non-empty cluster in row */
     uint32_t      y_max;                         /*! [FIXME] Nb of non_empty cluster in col */
+    uint32_t      cluster_info[CONFIG_MAX_CLUSTERS_X][CONFIG_MAX_CLUSTERS_Y];
+                                                 /*! An array of infos about all clusters   */
         uint32_t      io_cxy;                        /*! IO cluster identifier                  */