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

Timestamp:

Feb 4, 2014, 2:16:37 AM (11 years ago)

Author:

cfuguet

Message:

Modifications on GIET-VM IOC driver:

• Introducing new layer on the IOC driver. Every call to ioc_read, ioc_write, ioc_get_block_size or ioc_init

functions will call the specific driver of the used IOC
controller. Supported IOC controllers are (for now) :

1. BDV (Soclib Block Device)
2. HBA
3. SPI (SDCARD - SPI controller)

• All functions of IOC controllers drivers respect the same interface.

• To specify the used IOC controller of the platform, a subtype field has been introduced on the map.xml file. This subtype field must be declared on the IOC periph instantiation. Available subtypes (for now) : BDV, HBA or SPI.

File:

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

soft/giet_vm/giet_kernel/kernel_init.c

@@ -64 +64 @@
 
 ////////////////////////////////////////////////////////////////////////////////////
-// staks for the "idle" tasks (256 bytes for each processor)
+// staks for the "idle" tasks (512 bytes for each processor)
 ////////////////////////////////////////////////////////////////////////////////////
 
 __attribute__((section (".kdata"))) 
-unsigned int _idle_stack[X_SIZE*Y_SIZE * NB_PROCS_MAX * 128]; 
+unsigned int _idle_stack[X_SIZE * Y_SIZE * NB_PROCS_MAX * 128 ]; 
 
 ////////////////////////////////////////////////////////////////////////////////////
@@ -343 +343 @@
     // step 5 : each processor updates the idle_task context:
     //          (only CTX_SP, CTX_RA, CTX_EPC).
-    //          The stack size is 256 bytes, reserved in seg_kdata.
+    //          The stack size is 512 bytes, reserved in seg_kdata.
     //          The PTPR register, the CTX_PTPR and CTX_PTAB slots 
     //          have been initialised in boot code.
 
-    unsigned int stack = (unsigned int)_idle_stack + ((global_pid + 1)<<9);
+    unsigned int x = cluster_xy >> Y_WIDTH;
+    unsigned int y = cluster_xy & ((1<<Y_WIDTH)-1);
+    unsigned int p = ((x * Y_SIZE) + y) * NB_PROCS_MAX + local_pid; 
+
+    unsigned int stack = (unsigned int)_idle_stack + ((p + 1)<<9);
 
     _set_task_slot( global_pid, IDLE_TASK_INDEX, CTX_SP_ID,  stack);