Changeset 459 for soft/giet_vm/giet_kernel/sys_handler.h

Timestamp:

Dec 5, 2014, 3:51:22 PM (10 years ago)

Author:

alain

Message:

Removing the kernel_utils.c/kernel_utils.h file.
Introducing new functions in sys_handler.c/sys_handler.h to handle NIC related system calls.

File:

• soft/giet_vm/giet_kernel/sys_handler.h (modified) (4 diffs)

soft/giet_vm/giet_kernel/sys_handler.h

@@ -13 +13 @@
 #define _SYS_HANDLER_H
 
-#include <mapping_info.h>
-#include <giet_config.h>
+#include "giet_config.h"
+#include "locks.h"
+
+#if !defined ( GIET_NIC_NBUFS )
+# error: You must define GIET_NIC_NBUFS in the giet_config.h file
+#endif
+
+#if !defined ( GIET_NIC_NFAKE )
+# error: You must define GIET_NIC_NFAKE in the giet_config.h file
+#endif
+
+#if !defined ( GIET_NIC_BUFSIZE )
+# error: You must define GIET_NIC_BUFSIZE in the giet_config.h file
+#endif
+
+#if !defined ( GIET_NIC_TIMEOUT )
+# error: You must define GIET_NIC_TIMEOUT in the giet_config.h file
+#endif
+
+#if !defined ( GIET_NIC_MAC4 )
+# error: You must define GIET_NIC_MAC4 in the giet_config.h file
+#endif
+
+#if !defined ( GIET_NIC_MAC2 )
+# error: You must define GIET_NIC_MAC2 in the giet_config.h file
+#endif
+
+#if ( (GIET_NIC_NBUFS + GIET_NIC_NFAKE) % 8 )
+#error: GIET_NIC_NBUFS + GIET_NIC_NFAKE must be multiple of 8 for alignment
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////////
@@ -23 +51 @@
 
 ///////////////////////////////////////////////////////////////////////////////////
-// This structure is used by the vci_chbuf_dma component to transfer a stream 
+// This structure is used by the CMA component to move a stream 
 // of images from two buffers in user space to the frame buffer in kernel space.
-// It contains two chbuf descriptors
+// it must be 64 bytes aligned.
+// It contains two chbuf arrays:
 // - The SRC chbuf contains two buffers (buf0 & buf1), that can be in user space.
 // - The DST cbuf contains one single buffer (fbf), that is the frame buffer.
+// - The length field define the buffer size (bytes)
 ///////////////////////////////////////////////////////////////////////////////////
 
 typedef struct fbf_chbuf_s
 {
-    unsigned long long  buf0;     // physical address + status for user buffer 0 
-    unsigned long long  buf1;     // physical address + status for user buffer 1
-    unsigned long long  fbf;      // physical address + status for user buffer 0 
-    unsigned int        length;   // buffer length (bytes)
-    unsigned int        padding;  // 8 bytes alignment
+    unsigned long long  buf0;        // physical address + status for user buffer 0 
+    unsigned long long  buf1;        // physical address + status for user buffer 1
+    unsigned long long  fbf;         // physical address + status for user buffer 0 
+    unsigned int        length;      // buffer length (bytes)
+    unsigned int        padding[9];  // 64 bytes alignment
 } fbf_chbuf_t;   
 
 //////////////////////////////////////////////////////////////////////////////////
-// This structure define the generic chained buffer used by the vci_chbuf_dma
-// component to move a stream of containers to or from the vci_multi_nic component.
+// This structure is used by the CMA component to move a stream
+// of packet containers between the NIC component an a chbuf containing
+// a variable number of buffers in kernel space.
 // The same structure is used for both TX or RX transfers.
+// It must be 64 bytes aligned.
 // The single buffer size and the number of buffers must be defined by the 
-// GIET_NIC_CHBUF_SIZE and GIET_NIC_CHBUF_NBUFS parameters in giet_config.h.
-// - The buffer array is the chbuf descriptor, shared by the vci_chbuf_dma,
-//   and by the kernel.
-// - The index field is only used by the kernel. It define the currently pointed 
+// GIET_NIC_BUFSIZE and GIET_NIC_NBUFS parameters in giet_config.h.
+// - The buffer array implements the chbuf, and is concurently accessed 
+//   by the CMA component and by the kernel code.
+// - The lock must be taken by the kernel code, because several user tasks
+//   can concurently try to consume buffers in the chbuf.
+// - The index is only used by the kernel, and define the currently pointed 
 //   buffer for read (RX transfer) or write (TX transfer).
 //////////////////////////////////////////////////////////////////////////////////
@@ -53 +87 @@
 typedef struct nic_chbuf_s
 {
-    unsigned long long  buffer[GIET_NIC_CHBUF_NBUFS];      // chbuf descriptor 
-    unsigned int        index;                             // current buffer index
-    unsigned int        padding;                           // 8 bytes alignment
+    unsigned long long  buffer[GIET_NIC_NBUFS];  // Kernel CHBUF
+    unsigned long long  unused[GIET_NIC_NFAKE];  // padding for 64 bytes alignment
+    unsigned int        index;                   // current buffer index
+    unsigned int        padding[15];             // padding for 64 bytes alignment
 } nic_chbuf_t;
 
@@ -95 +130 @@
 int _sys_nic_alloc( unsigned int is_rx );
 
-int _sys_nic_start( unsigned int is_rx,
-                    unsigned int mac4,
-                    unsigned int mac2 );
+int _sys_nic_start( unsigned int is_rx );
 
 int _sys_nic_move( unsigned int is_rx,
+                   unsigned int nic_channel,
                    void*        buffer );
 
 int _sys_nic_stop( unsigned int is_rx );
+
+int _sys_nic_clear( unsigned int is_rx );
+
+int _sys_nic_stats( unsigned int is_rx );
 
 //////////////////////////////////////////////////////////////////////////////