Changeset 322

Timestamp:

Jun 10, 2014, 1:28:14 PM (10 years ago)

Author:

alain

Message:

Various small modifs to comply with the genmap tool.

Location:

soft/giet_vm/giet_kernel

Files:

• ctx_handler.c (modified) (1 diff)
• irq_handler.c (modified) (4 diffs)
• irq_handler.h (modified) (1 diff)
• kernel.ld (modified) (4 diffs)
• kernel_init.c (modified) (5 diffs)
• sys_handler.c (modified) (4 diffs)

soft/giet_vm/giet_kernel/ctx_handler.c

@@ -83 +83 @@
         // the NB_PROCS_MAX timers are system timers (TICK)
 
-#if USE_XICU
+#if USE_XCU
         _xcu_timer_reset_cpt( cluster_xy, lpid );
 #else

soft/giet_vm/giet_kernel/irq_handler.c

@@ -19 +19 @@
 #include <bdv_driver.h>
 #include <dma_driver.h>
+#include <spi_driver.h>
 #include <mapping_info.h>
 #include <utils.h>
 
-#if !defined( USE_XICU )
-# error: You must define USE_XICU in the hard_config.h file
+#if !defined( USE_XCU )
+# error: You must define USE_XCU in the hard_config.h file
 #endif
 
@@ -60 +61 @@
     unsigned int icu_out_index = lpid * IRQ_PER_PROCESSOR;
 
-#if USE_XICU
+#if USE_XCU
     _xcu_get_index( cluster_xy, icu_out_index, &irq_id, &irq_type );
 #else
@@ -118 +119 @@
         else if ( isr_type == ISR_TIMER  ) _timer_isr  ( irq_type, irq_id, channel );
         else if ( isr_type == ISR_MMC    ) _mmc_isr    ( irq_type, irq_id, channel );
+        else if ( isr_type == ISR_DMA    ) _dma_isr    ( irq_type, irq_id, channel );
+        else if ( isr_type == ISR_SPI    ) _spi_isr    ( irq_type, irq_id, channel );
         else
         {
@@ -146 +149 @@
     unsigned int lpid       = gpid % NB_PROCS_MAX;
 
-    // We don't take TTY lock to avoid deadlock
-    _puts("\n[GIET WARNING] IRQ handler called but no active IRQ on processor[");
-    _putd( x );
-    _puts(",");
-    _putd( y );
-    _puts(",");
-    _putd( lpid );
-    _puts("] at cycle ");
-    _putd( _get_proctime() );
-    _puts("\n  ");
+    _printf("\n[GIET WARNING] IRQ handler called but no active IRQ "
+            "on processor[%d,%d,%d] at cycle %d\n",
+            x, y, lpid, _get_proctime() );
 }
 

soft/giet_vm/giet_kernel/irq_handler.h

@@ -32 +32 @@
     ISR_CMA     = 9,
     ISR_MMC     = 10,
+    ISR_DMA     = 11,
+    ISR_SPI     = 12,
 };
 

soft/giet_vm/giet_kernel/kernel.ld

@@ -12 +12 @@
 SECTIONS
 {
-    . = seg_kernel_code_base;
+    . = kernel_code_vbase;
     seg_kernel_code : 
     {
@@ -19 +19 @@
     }
 
-    . = seg_kernel_data_base;
+    . = kernel_data_vbase;
     seg_kernel_data : 
     {
@@ -38 +38 @@
     }
 
-    . = seg_kernel_uncdata_base;
+    . = kernel_uncdata_vbase;
     seg_kernel_uncdata : 
     {
@@ -44 +44 @@
     }
 
-    . = seg_kernel_init_base;
+    . = kernel_init_vbase;
     seg_kernel_init : 
     {

soft/giet_vm/giet_kernel/kernel_init.c

@@ -71 +71 @@
 #include <mips32_registers.h>
 
+#if !defined(X_SIZE) 
+# error: You must define X_SIZE in the hard_config.h file
+#endif
+
+#if !defined(Y_SIZE) 
+# error: You must define Y_SIZE in the hard_config.h file
+#endif
+
+#if !defined(Y_WIDTH) 
+# error: You must define Y_WIDTH in the hard_config.h file
+#endif
+
+#if !defined(Y_WIDTH) 
+# error: You must define Y_WIDTH in the hard_config.h file
+#endif
+
+#if !defined(NB_PROCS_MAX)
+# error: You must define NB_PROCS_MAX in the hard_config.h file
+#endif
+
+#if !defined(NB_TOTAL_PROCS)
+# error: You must define NB_TOTAL_PROCS in the hard_config.h file
+#endif
+
+#if !defined(USE_XCU) 
+# error: You must define USE_XCU in the hard_config.h file
+#endif
+
+#if !defined(IDLE_TASK_INDEX) 
+# error: You must define IDLE_TASK_INDEX in the giet_config.h file
+#endif
+
+#if !defined(GIET_TICK_VALUE) 
+# error: You must define GIET_TICK_VALUE in the giet_config.h file
+#endif
+
+#if !defined(GIET_NB_VSPACE_MAX)
+# error: You must define GIET_NB_VSPACE_MAX in the giet_config.h file
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////////
 // array of pointers on the page tables (virtual addresses)
@@ -110 +150 @@
     unsigned int y          = cluster_xy & ((1<<Y_WIDTH)-1);
     unsigned int lpid       = global_pid % NB_PROCS_MAX;
-    unsigned int nprocs     = TOTAL_PROCS;
     unsigned int pid        = ((( x * Y_SIZE) + y) * NB_PROCS_MAX) + lpid;
 //  unsigned int pid        = _get_id(i n_procs );
@@ -217 +256 @@
     unsigned int channel = lpid * IRQ_PER_PROCESSOR; 
 
-#if USE_XICU
+#if USE_XCU
     _xcu_set_mask( cluster_xy, channel, hwi_mask, IRQ_TYPE_HWI ); 
     _xcu_set_mask( cluster_xy, channel, wti_mask, IRQ_TYPE_WTI );
@@ -238 +277 @@
         // start system timer
 
-#if USE_XICU
+#if USE_XCU
         _xcu_timer_start( cluster_xy, isr_switch_index, GIET_TICK_VALUE ); 
 #else
@@ -296 +335 @@
             x, y, lpid, _get_proctime() );
 
-/*
-    unsigned int*  pcount = &_init_barrier;
-    unsigned int   count;
-
-    // increment barrier counter with atomic LL/SC
-    asm volatile ( "_init_barrier_loop:             \n"
-                   "ll    %0,   0(%1)               \n"
-                   "addi  $3,   %0,   1             \n"
-                   "sc    $3,   0(%1)               \n"
-                   "beqz  $3,   _init_barrier_loop  \n"
-                   "nop                             \n" 
-                   : "=&r"(count)
-                   : "r"(pcount) 
-                   : "$3" );
-   
-    // busy waiting until all processors synchronized
-    while ( *pcount != nprocs ) asm volatile ("nop");
-*/
-
     // increment barrier counter 
     _init_barrier++;
 
     // busy waiting until all processors synchronized
-    while ( _init_barrier != nprocs ) asm volatile ("nop");
-
-/*
-    _printf("\n[GIET] Processor[%d,%d,%d] jumps to user code at cycle %d\n",
-            x, y, lpid, _get_proctime() );
-*/
-        
+    while ( _init_barrier != NB_TOTAL_PROCS ) asm volatile ("nop");
+
     // set registers and jump to user code
     asm volatile ( "move  $29,  %0                  \n"   /* SP <= ctx[CTX_SP_ID] */

soft/giet_vm/giet_kernel/sys_handler.c

@@ -20 +20 @@
 #include <fat32.h>
 #include <utils.h>
+#include <hard_config.h>
 #include <giet_config.h>
 #include <mapping_info.h>
+
+#if !defined(SEG_BOOT_MAPPING_BASE) 
+# error: You must define SEG_BOOT_MAPPING_BASE in the hard_config.h file
+#endif
 
 ////////////////////////////////////////////////////////////////////////////
@@ -139 +144 @@
                            unsigned int* buffer) 
 {
-    mapping_header_t * header  = (mapping_header_t *) &seg_boot_mapping_base;
+    mapping_header_t * header  = (mapping_header_t *)SEG_BOOT_MAPPING_BASE;
     mapping_cluster_t * cluster = _get_cluster_base(header);
 
@@ -186 +191 @@
                mapping_vobj_t**  res_vobj ) 
 {
-    mapping_header_t * header = (mapping_header_t *) &seg_boot_mapping_base;
+    mapping_header_t * header = (mapping_header_t *)SEG_BOOT_MAPPING_BASE;
     mapping_vspace_t * vspace = _get_vspace_base(header);
     mapping_vobj_t * vobj     = _get_vobj_base(header);
@@ -215 +220 @@
 
 /////////////////////////////////////////////////////////////////////////////
-// This function writes in vobj_vaddr the virtual base address of a vobj 
+// This function writes in vobj_vbase the virtual base address of a vobj 
 // identified by the (vspace_name / vobj_name ) couple.
 // returns 0 if success, >0 if not found