Changeset 825 for trunk/platforms

Timestamp:

Oct 1, 2014, 11:30:41 AM (10 years ago)

Author:

cfuguet

Message:

tsar_generic_leti: bugfixes in the GIET-VM part of the arch.py

• Flags in the kernel_data segment must be the same than kernel_code and kernel_init because they share the same big page.

• Remove unused soclib.conf file

Location:

trunk/platforms/tsar_generic_leti

Files:

• arch.py (modified) (5 diffs)
• soclib.conf (deleted)

trunk/platforms/tsar_generic_leti/arch.py

@@ -158 +158 @@
     kernel_data_size     = 0x00100000      # 1 Mbytes in cluster[0][0]
 
-    kernel_ptab_vbase    = 0xB0000000
+    kernel_uncdata_vbase = 0x80200000
+    kernel_uncdata_size  = 0x00001000      # 4 Kbytes
+
+    kernel_sched_vbase   = 0x80400000            # distributed in all clusters
+    kernel_sched_size    = 0x00002000 * nb_procs # 8 kbytes per processor
+
+    kernel_ptab_vbase    = 0xC0000000
     kernel_ptab_size     = 0x00200000      # 2 Mbytes per cluster
-
-    kernel_uncdata_vbase = 0x90000000
-    kernel_uncdata_size  = 0x00001000      # 4 Kbytes
-
-    kernel_sched_vbase   = 0xA0000000            # distributed in all clusters
-    kernel_sched_size    = 0x00002000 * nb_procs # 8 kbytes per processor
 
     ### create mapping
@@ -267 +267 @@
     for x in xrange( x_size ):
         for y in xrange( y_size ):
-            cluster_xy = (x << y_width) + y;
-
             mapping.addGlobal( 'seg_kernel_code', kernel_code_vbase, kernel_code_size,
                                'CXW_', vtype = 'ELF', x = x, y = y, pseg = 'RAM',
@@ -282 +280 @@
     ### Only mapped in cluster[0][0]
     mapping.addGlobal( 'seg_kernel_data', kernel_data_vbase, kernel_data_size,
-                       'C_W_', vtype = 'ELF', x = 0, y = 0, pseg = 'RAM',
-                       binpath = 'build/kernel/kernel.elf', local = False )
+                       'CXW_', vtype = 'ELF', x = 0, y = 0, pseg = 'RAM',
+                       binpath = 'build/kernel/kernel.elf',
+                       local = False, big = True )
 
     ### global vseg kernel_uncdata: non local / small page
@@ -289 +288 @@
     mapping.addGlobal( 'seg_kernel_uncdata', kernel_uncdata_vbase, kernel_uncdata_size,
                        '__W_', vtype = 'ELF', x = 0, y = 0, pseg = 'RAM',
-                       binpath = 'build/kernel/kernel.elf', local = False )
+                       binpath = 'build/kernel/kernel.elf',
+                       local = False, big = False )
 
     for x in xrange( x_size ):
@@ -307 +307 @@
             ### as vbase address is incremented by (cluster_xy * vseg_increment)
             offset = cluster_xy * sched_increment
-            mapping.addGlobal( 'seg_kernel_sched_%d_%d' %(x,y), kernel_sched_vbase + offset , kernel_sched_size,
+            mapping.addGlobal( 'seg_kernel_sched_%d_%d' %(x,y), kernel_sched_vbase + offset, kernel_sched_size,
                                'C_W_', vtype = 'SCHED', x = x, y = y, pseg = 'RAM',
                                local = False, big = False )