Changeset 240

Timestamp:

Jun 3, 2013, 5:28:47 PM (11 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

Files:

• boot/boot_init.c (modified) (3 diffs)
• boot/reset.S (modified) (1 diff)
• giet_config.h (modified) (1 diff)
• sys/common.c (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

soft/giet_vm/giet_config.h

@@ -15 +15 @@
 /* Debug parameters */
 
-#define BOOT_DEBUG_PERI          1                      /* trace peripherals initialisation */
-#define BOOT_DEBUG_PT                1                  /* trace page tables initialisation */
-#define BOOT_DEBUG_VOBJS             1                  /* trace vobjs initialisation */
-#define BOOT_DEBUG_SCHED             1                  /* trace schedulers initialisation */
+#define BOOT_DEBUG_PERI          0                      /* trace peripherals initialisation */
+#define BOOT_DEBUG_PT                0                  /* trace page tables initialisation */
+#define BOOT_DEBUG_VOBJS             0                  /* trace vobjs initialisation */
+#define BOOT_DEBUG_SCHED             0                  /* trace schedulers initialisation */
 
 #define GIET_DEBUG_INIT              0                  /* trace parallel kernel initialisation */

soft/giet_vm/sys/common.c

@@ -26 +26 @@
 //       _get_sched()
 // Access CP0 and returns a pointer (virtual address) on the calling
-// processor scheduler (taking into account the processor local index).
+// processor scheduler.
 ///////////////////////////////////////////////////////////////////////////////////
 static_scheduler_t* _get_sched() 
 {
-    static_scheduler_t* psched;
-    unsigned int        vaddr;
-    unsigned int        lpid = _procid() % NB_PROCS_MAX;
-
+    unsigned int vaddr;
     asm volatile(
             "mfc0    %0,   $22    \n" 
             : "=r"(vaddr) );
-
-    psched = (static_scheduler_t*)vaddr;
-    return (psched + lpid);
+    return (static_scheduler_t*)vaddr;
 }