Changeset 489

Timestamp:

Jan 8, 2015, 12:00:41 PM (9 years ago)

Author:

alain

Message:

Introducing an explicit (channel) argument in all kernel access functions to NIC.

Location:

soft/giet_vm/giet_kernel

Files:

• sys_handler.c (modified) (9 diffs)
• sys_handler.h (modified) (1 diff)

soft/giet_vm/giet_kernel/sys_handler.c

@@ -386 +386 @@
 
 ////////////////////////////////////////
-int _sys_nic_start( unsigned int is_rx )
+int _sys_nic_start( unsigned int is_rx,
+                    unsigned int channel )
 {
 
@@ -416 +417 @@
 #endif
 
-    if ( nic_channel >= NB_NIC_CHANNELS )
-    {
-        _printf("\n[GIET_ERROR] in _sys_nic_start(): NIC channel not allocated\n");
+    if ( nic_channel != channel )
+    {
+        _printf("\n[GIET_ERROR] in _sys_nic_start(): illegal NIC channel\n");
         return -1;
     }
     if ( cma_channel >= NB_CMA_CHANNELS )
     {
-        _printf("\n[GIET_ERROR] in _sys_nic_start(): CMA channel not allocated\n");
+        _printf("\n[GIET_ERROR] in _sys_nic_start(): illegal CMA channel\n");
         return -1;
     }
@@ -474 +475 @@
     unsigned int offset;
     if ( is_rx ) offset = 0x4000;
-    else         offset = 0x4010;
+    else         offset = 0x4080;
     nic_chbuf_pbase = (((unsigned long long)((X_IO << Y_WIDTH) + Y_IO))<<32) |
                       (SEG_NIC_BASE + (nic_channel<<15) + offset);
@@ -683 +684 @@
 
 ////////////////////////////////////////
-int _sys_nic_stop( unsigned int is_rx )
+int _sys_nic_stop( unsigned int is_rx,
+                   unsigned int channel )
 {
     unsigned int nic_channel;
@@ -700 +702 @@
     }
 
-    if ( nic_channel >= NB_NIC_CHANNELS )
-    {
-        _printf("\n[GIET_ERROR] in _sys_nic_start(): NIC channel not allocated\n");
+    if ( nic_channel != channel )
+    {
+        _printf("\n[GIET_ERROR] in _sys_nic_stop(): illegal NIC channel\n"
+                "  allocated channel = %d / requested channel = %d\n",
+                   nic_channel , channel );
         return -1;
     }
     if ( cma_channel >= NB_CMA_CHANNELS )
     {
-        _printf("\n[GIET_ERROR] in _sys_nic_start(): CMA channel not allocated\n");
+        _printf("\n[GIET_ERROR] in _sys_nic_stop(): illegal CMA channel\n");
         return -1;
     }
@@ -721 +725 @@
 
 ////////////////////////////////////////
-int _sys_nic_clear( unsigned int is_rx )
+int _sys_nic_clear( unsigned int is_rx,
+                    unsigned int channel )
 {
     unsigned int nic_channel;
@@ -729 +734 @@
     else          nic_channel = _get_context_slot( CTX_NIC_TX_ID );
 
-    if ( nic_channel >= NB_NIC_CHANNELS )
-    {
-        _printf("\n[GIET_ERROR] in _sys_nic_start(): NIC channel not allocated\n");
+    if ( nic_channel != channel )
+    {
+        _printf("\n[GIET_ERROR] in _sys_nic_clear(): illegal NIC channel\n");
         return -1;
     }
@@ -761 +766 @@
 
 ////////////////////////////////////////
-int _sys_nic_stats( unsigned int is_rx )
+int _sys_nic_stats( unsigned int is_rx,
+                    unsigned int channel )
 {
     unsigned int nic_channel;
@@ -769 +775 @@
     else          nic_channel = _get_context_slot( CTX_NIC_TX_ID );
 
-    if ( nic_channel >= NB_NIC_CHANNELS )
-    {
-        _printf("\n[GIET_ERROR] in _sys_nic_start(): NIC channel not allocated\n");
+    if ( nic_channel != channel )
+    {
+        _printf("\n[GIET_ERROR] in _sys_nic_stats(): illegal NIC channel\n");
         return -1;
     }

soft/giet_vm/giet_kernel/sys_handler.h

@@ -106 +106 @@
 int _sys_nic_alloc( unsigned int is_rx );
 
-int _sys_nic_start( unsigned int is_rx );
+int _sys_nic_start( unsigned int is_rx,
+                    unsigned int channel );
 
 int _sys_nic_move( unsigned int is_rx,
-                   unsigned int nic_channel,
+                   unsigned int channel,
                    void*        buffer );
 
-int _sys_nic_stop( unsigned int is_rx );
+int _sys_nic_stop( unsigned int is_rx,
+                   unsigned int channel );
 
-int _sys_nic_clear( unsigned int is_rx );
+int _sys_nic_clear( unsigned int is_rx,
+                    unsigned int channel );
 
-int _sys_nic_stats( unsigned int is_rx );
+int _sys_nic_stats( unsigned int is_rx,
+                    unsigned int channel );
 
 //////////////////////////////////////////////////////////////////////////////