Changeset 240 for soft/giet_vm/boot

Timestamp:

Jun 3, 2013, 5:28:47 PM (12 years ago)

Author:

joannou

Message:

Bug fix for scheduler handling :

• In boot_init.c, changed left shifts of 10 to left shifts of 12 to support 4K schedulers instead of 1K schedulers
• In common.c, updated _get_sched() function to return the content of CP0_SCHED register

Location:

soft/giet_vm/boot

Files:

• boot_init.c (modified) (3 diffs)
• reset.S (modified) (1 diff)

soft/giet_vm/boot/boot_init.c

@@ -1521 +1521 @@
         boot_get_sched_vaddr( cluster_id, &sched_vbase, &sched_length );
 
-        // each processor scheduler requires 1 Kbytes
-        if ( sched_length < (nprocs<<10) ) 
+        // each processor scheduler requires 4 Kbytes
+        if ( sched_length < (nprocs<<12) ) 
         {
             boot_puts("\n[BOOT ERROR] Schedulers segment too small in cluster ");
@@ -1536 +1536 @@
             // set the schedulers pointers array
             boot_schedulers[cluster_id * NB_PROCS_MAX + lpid] =
-               (static_scheduler_t*)( sched_vbase + (lpid<<10) );
+               (static_scheduler_t*)( sched_vbase + (lpid<<12) );
 
 #if BOOT_DEBUG_SCHED
@@ -1542 +1542 @@
 boot_putd(lpid);
 boot_puts(" : scheduler virtual base address = ");
-boot_putx( sched_vbase + (lpid<<10) );
+boot_putx( sched_vbase + (lpid<<12) );
 boot_puts("\n");
 #endif
             // current processor scheduler pointer : psched
-            static_scheduler_t* psched = (static_scheduler_t*)(sched_vbase+(lpid<<10));
+            static_scheduler_t* psched = (static_scheduler_t*)(sched_vbase+(lpid<<12));
 
             // initialise the "tasks" variable

soft/giet_vm/boot/reset.S

@@ -183 +183 @@
 
     # all processors initialise the CP0 SCHED register
-    # SCHED contains the schedulers array virtual base address
+    # SCHED contains the scheduler virtual base address
     mfc0        k0, CP0_PROCID
     andi    k0, k0, 0xFFF