Changeset 50 for trunk/kernel/kern/cluster.c

Timestamp:

Jun 26, 2017, 3:15:11 PM (7 years ago)

Author:

alain

Message:

bloup

File:

• trunk/kernel/kern/cluster.c (modified) (7 diffs)

trunk/kernel/kern/cluster.c

@@ -28 +28 @@
 #include <hal_atomic.h>
 #include <hal_special.h>
+#include <hal_ppm.h>
 #include <printk.h>
 #include <errno.h>
@@ -43 +44 @@
 #include <dqdt.h>
 
-// TODO #include <sysfs.h>
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 // Extern global variables
@@ -62 +61 @@
 error_t cluster_init( struct boot_info_s * info )
 {
+    error_t     error;
     lpid_t      lpid;     // local process_index
     lid_t       lid;      // local core index
@@ -82 +82 @@
         spinlock_init( &cluster->kcm_lock );
 
+    cluster_dmsg("\n[INFO] %s for cluster %x enters\n",
+                 __FUNCTION__ , local_cxy );
+
     // initialises DQDT
     cluster->dqdt_root_level = dqdt_init( info->x_size,
@@ -90 +93 @@
 
     // initialises embedded PPM
-        ppm_init( &cluster->ppm,
-              info->pages_nr,
-              info->pages_offset );
+        error = hal_ppm_init( info );
+
+    if( error )
+    {
+        printk("\n[ERROR] in %s : cannot initialize PPM in cluster %x\n",
+               __FUNCTION__ , local_cxy );
+        return ENOMEM;
+    }
+
+    cluster_dmsg("\n[INFO] %s : PPM initialized in cluster %x at cycle %d\n",
+                 __FUNCTION__ , local_cxy , hal_time_stamp() );
 
     // initialises embedded KHM
         khm_init( &cluster->khm );
 
+    cluster_dmsg("\n[INFO] %s : KHM initialized in cluster %x at cycle %d\n",
+                 __FUNCTION__ , local_cxy , hal_time_stamp() );
+
     // initialises embedded KCM
         kcm_init( &cluster->kcm , KMEM_KCM );
+
+    cluster_dmsg("\n[INFO] %s : KCM initialized in cluster %x at cycle %d\n",
+                 __FUNCTION__ , local_cxy , hal_time_stamp() );
 
     // initialises all cores descriptors
@@ -108 +125 @@
         }
 
+    cluster_dmsg("\n[INFO] %s : cores initialized in cluster %x at cycle %d\n",
+                 __FUNCTION__ , local_cxy , hal_time_stamp() );
+
     // initialises RPC fifo
         rpc_fifo_init( &cluster->rpc_fifo );
+
+    cluster_dmsg("\n[INFO] %s : RPC fifo inialized in cluster %x at cycle %d\n",
+                 __FUNCTION__ , local_cxy , hal_time_stamp() );
 
     // initialise pref_tbl[] in process manager
@@ -132 +155 @@
         xlist_root_init( XPTR( local_cxy , &cluster->pmgr.copies_root[lpid] ) );
     }
+
+    cluster_dmsg("\n[INFO] %s Process Manager initialized in cluster %x at cycle %d\n",
+                 __FUNCTION__ , local_cxy , hal_time_stamp() );
 
     hal_wbflush();