Changeset 437 for soft/giet_vm/giet_drivers/nic_driver.h

Timestamp:

Nov 3, 2014, 10:53:00 AM (10 years ago)

Author:

alain

Message:

Introducing dynamic allocation of peripheral channel(TTY, NIC, TIM, CMA)
Removint the ICU driver : ICU component not supported anymore.
Removing the FBF driver.

File:

• soft/giet_vm/giet_drivers/nic_driver.h (modified) (4 diffs)

soft/giet_vm/giet_drivers/nic_driver.h

@@ -5 +5 @@
 // Copyright (c) UPMC-LIP6
 ///////////////////////////////////////////////////////////////////////////////////
+// The nic_driver.c and nic_driver.h files are part ot the GIET-VM nano-kernel.
+// This driver supports the vci_multi_nic component.
+// 
+// It can exist only one network controller in the architecture, but this
+// component supports several channels.
+//
+// It can be accessed directly by software with memcpy(),
+// or it can be accessed through the vci_chbuf_dma component:
+//  
+// The '_nic_sync_write' and '_nic_sync_read' functions use a memcpy strategy to
+// implement the transfer between a data buffer (user space) and the NIC
+// buffer (kernel space). They are blocking until completion of the transfer.
+//
+// The _nic_cma_start() and _nic_cma_stop() functions use the VciChbufDma component 
+// to transfer a flow of packets from the NIC RX hard chbuf (two containers) 
+// to an user RX chbuf (two containers), and to transfer another flow of packets
+// from an user TX chbuf (two containers) to the NIC TX chbuf (two containers).
+// One NIC channel and two CMA channels must be allocated to the task 
+// in the mapping_info data structure.
+//
+// All these access functions return -1 in case of error.
+//
+// The SEG_NIC_BASE address must be defined in the hard_config.h file.
+//////////////////////////////////////////////////////////////////////////////////
 
 #ifndef _GIET_NIC_DRIVERS_H_
 #define _GIET_NIC_DRIVERS_H_
 
+#include <giet_config.h>
+
 ///////////////////////////////////////////////////////////////////////////////////
-// NIC Registers  (vci_multi_nic)
+//           Global Addressable Registers
 ///////////////////////////////////////////////////////////////////////////////////
 
@@ -50 +76 @@
 };
 
-/////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////
+//            Channel Addressable Registers
 // A container descriptor has the following form: 
-// LOW WORD : Container LSB base address     
-// HIGH WORD: Container status (leftmost bit), '1' means full 
-//            Base address MSB extension, if needed (right aligned)
-//////////////////////////////////////////////////////////////////////
+// LOW WORD  : 32 LSB bits of the container physical base address     
+// HIGH WORD : 16 MSB bits of the container physical base address + status (bit 31)  
+/////////////////////////////////////////////////////////////////////////////////////
 enum SoclibMultiNicChannelRegisters 
 {
@@ -72 +98 @@
 };
 
+
+////////////////////////////////////////////////////////////////////////////////////
+//              Chained Buffer Descriptor Structure
+////////////////////////////////////////////////////////////////////////////////////
+typedef struct nic_chbuf_s
+{
+    unsigned long long buf[GIET_CHBUF_NBUFS]; // array of buffer descriptors 
+    unsigned int       buf_length;            // buffer length (bytes)
+    unsigned int       nb_buffers;            // actual number of buffers
+} nic_chbuf_t;
+
 ///////////////////////////////////////////////////////////////////////////////////
-// NIC device access functions  (vci_multi_nic)
+//              Initialization functions
 ///////////////////////////////////////////////////////////////////////////////////
 
-extern unsigned int _nic_sync_write( const void*  buffer, 
-                                     unsigned int length );
+extern int _nic_global_init( unsigned int channels,
+                             unsigned int vis,
+                             unsigned int bc_enable,
+                             unsigned int bypass_enable );
 
-extern unsigned int _nic_sync_read(  const void*  buffer, 
-                                     unsigned int length );
+extern int _nic_channel_init( unsigned int index,
+                              unsigned int mac4,
+                              unsigned int mac2 );
 
-extern unsigned int _nic_cma_start();
+///////////////////////////////////////////////////////////////////////////////////
+//              Blocking functions using a physical_memcpy()
+///////////////////////////////////////////////////////////////////////////////////
 
-extern unsigned int _nic_cma_stop();
+extern int _nic_sync_receive( unsigned int       channel, 
+                              unsigned long long user_paddr );
+
+extern int _nic_sync_send( unsigned int       channel,
+                           unsigned long long user_paddr );
+
+///////////////////////////////////////////////////////////////////////////////////
+//              Non blocking functions using the chained buffer DMA
+///////////////////////////////////////////////////////////////////////////////////
+
+extern int _nic_cma_receive( unsigned int  nic_channel,
+                             unsigned int  cma_channel,
+                             nic_chbuf_t*  kernel_chbuf );
+
+extern int _nic_cma_send( unsigned int  nic_channel,
+                          unsigned int  cma_channel,
+                          nic_chbuf_t*  kernel_chbuf );
+
+///////////////////////////////////////////////////////////////////////////////////
+//              Interrupt Service Routines
+///////////////////////////////////////////////////////////////////////////////////
 
 extern void _nic_rx_isr( unsigned int irq_type,
@@ -94 +156 @@
                          unsigned int channel );
 
-///////////////////////////////////////////////////////////////////////////////////