Changeset 760 for soft/giet_vm/giet_kernel/kernel_init.c

Timestamp:

Jan 19, 2016, 11:23:02 AM (9 years ago)

Author:

alain

Message:

 

File:

• soft/giet_vm/giet_kernel/kernel_init.c (modified) (6 diffs)

soft/giet_vm/giet_kernel/kernel_init.c

@@ -95 +95 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-// array of page tables virtual addresses
-__attribute__((section(".kdata")))
-volatile unsigned int _ptabs_vaddr[GIET_NB_VSPACE_MAX][X_SIZE][Y_SIZE]; 
-
-// array of page tables PTPR values (physical addresses >> 13)
-__attribute__((section(".kdata")))
-volatile unsigned int _ptabs_ptprs[GIET_NB_VSPACE_MAX][X_SIZE][Y_SIZE]; 
+// Array of page tables virtual addresses (one per vspace and per cluster)
+__attribute__((section(".kdata")))
+unsigned int        _ptabs_vaddr[GIET_NB_VSPACE_MAX][X_SIZE][Y_SIZE]; 
+
+// Array of page tables physical addresses (one per vspace and per cluster)
+__attribute__((section(".kdata")))
+unsigned long long  _ptabs_paddr[GIET_NB_VSPACE_MAX][X_SIZE][Y_SIZE]; 
+
+// Array of pt2 allocators (one per vspace and per cluster)
+__attribute__((section(".kdata")))
+unsigned int        _ptabs_next_pt2[GIET_NB_VSPACE_MAX][X_SIZE][Y_SIZE];
+
+// Page tables max_pt2  (same value for all page tables)
+__attribute__((section(".kdata")))
+unsigned int        _ptabs_max_pt2;
 
 // Array of pointers on the schedulers
@@ -122 +130 @@
 __attribute__((section(".kdata")))
 sqt_barrier_t  _all_procs_barrier  __attribute__((aligned(64)));
+
+// required for concurrent PTAB building 
+__attribute__((section(".kdata")))
+spin_lock_t    _ptabs_spin_lock[GIET_NB_VSPACE_MAX][X_SIZE][Y_SIZE];
+
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -191 +204 @@
 #endif
 
+        ////// get max_pt2 value stored in mapping header
+        mapping_header_t*  header = (mapping_header_t*)SEG_BOOT_MAPPING_BASE;
+        _ptabs_max_pt2 = header->max_pt2;
+
         //////  TTY fifos initialisation
         unsigned int tty_id;
@@ -277 +294 @@
     // step 2 : each processor that is allocated at least one thread loops 
     //          on its allocated threads: 
-    //          - contributes to _ptabs_vaddr & _ptabs_ptprs arrays
+    //          - contributes to _ptabs_vaddr & _ptabs_paddr arrays
     //            initialisation, from values stored in the threads contexts.
     //          - set CTX_RA slot  with the kernel _ctx_eret() virtual address.
@@ -292 +309 @@
         unsigned int ptab = _get_thread_slot( x, y, p, ltid , CTX_PTAB_ID ); 
         unsigned int ptpr = _get_thread_slot( x, y, p, ltid , CTX_PTPR_ID ); 
+        unsigned int npt2 = _get_thread_slot( x, y, p, ltid , CTX_NPT2_ID ); 
 
         // initialize PTABS arrays
-        _ptabs_vaddr[vsid][x][y] = ptab;
-        _ptabs_ptprs[vsid][x][y] = ptpr;
+        _ptabs_vaddr[vsid][x][y]    = ptab;
+        _ptabs_paddr[vsid][x][y]    = ((unsigned long long)ptpr) << 13;
+        _ptabs_next_pt2[vsid][x][y] = npt2;
 
         // set the PTPR to use the local page table
@@ -319 +338 @@
         " - ctx_ra               = %x\n",
         x , y , p , ltid ,  
-        vsid , x , y , ptab ,
-        vsid , x , y , ((unsigned long long)ptpr)<<13 ,
+        vsid , x , y , _ptabs_vaddr[vsid][x][y] ,
+        vsid , x , y , _ptabs_paddr[vsid][x][y] ,
         ctx_entry, ctx_ra );
 #endif