Changeset 557 for trunk/kernel

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/kernel

Files:

• Makefile (modified) (1 diff)
• kern/cluster.c (modified) (1 diff)
• kern/cluster.h (modified) (1 diff)
• kern/cluster_info.c (added)
• kern/cluster_info.h (added)
• kernel_config.h (modified) (1 diff)

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