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

Timestamp:

Jul 15, 2015, 6:15:52 PM (9 years ago)

Author:

bellefin

Message:

Change the syscalls related to the NIC and the CMA
1) In a CHBUF, every buffer is linked to a variable called “status” which is equal to 1 if the buffer is full or 0 if it is empty. The status occupies 64 bytes to simplify cache coherence
2) The CHBUF descriptor now contains the physical addresses of the buffer and its status. It only occupies 64 bits.

File:

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

soft/giet_vm/giet_kernel/sys_handler.h

@@ -24 +24 @@
 
 ///////////////////////////////////////////////////////////////////////////////
-// This structure is used by the nic_chbuf_t and fbf_chbuf_t structures.
-// It describes a single buffer descriptor. The useful information is 
-// contained in one single 64 bits word (desc field): 
-// - the 48 LSB bits contain the buffer physical address
-// - the MSB bit 63 indicates the buffer state (empty if 0)
-// This descriptor must be aligned on a cache line (64 bytes) to simplify 
+// This structure is used by the CMA component to store the status of the
+// frame buffer (full or empty). The useful information is contained in the
+// "status" integer (1 for full and 0 for empty).
+// This structure must be aligned on a cache line (64 bytes) to simplify 
 // the software L2/L3 cache coherence when the IO bridge is used. 
 ///////////////////////////////////////////////////////////////////////////////
 
-typedef struct buffer_descriptor_s
+typedef struct buffer_status_s
 {
-    unsigned long long  desc;
-    unsigned int        padding[14];
-} buffer_descriptor_t;
- 
+    unsigned int status;
+    unsigned int padding[15];
+} buffer_status_t;
+
 ///////////////////////////////////////////////////////////////////////////////
 // This structure is used by the CMA component to move a stream 
@@ -45 +43 @@
 // - The SRC chbuf contains two buffers (buf0 & buf1), in user space.
 // - The DST cbuf contains one single buffer (fbf), that is the frame buffer.
-// - The length field define the buffer size (bytes)
+// Each buffer is described with a 64 bits buffer descriptor:
+// - the 26 LSB bits contain bits[6:31] of the buffer physical address
+// - the 26 following bits contain bits[6:31] of the physical address where the
+//   buffer status is located
+// - the 12 MSB bits contain the common address extension of the buffer and its
+//   status
+// The length field define the buffer size (bytes)
 // This structure must be 64 bytes aligned.
 ///////////////////////////////////////////////////////////////////////////////
@@ -51 +55 @@
 typedef struct fbf_chbuf_s
 {
-    buffer_descriptor_t  buf0;         // first user buffer descriptor 
-    buffer_descriptor_t  buf1;         // second user buffer descriptor
-    buffer_descriptor_t  fbf;          // frame buffer descriptor 
-    unsigned int         length;       // buffer length (bytes)
-    unsigned int         padding[15];  // padding for 64 bytes alignment
+    unsigned long long  buf0_desc;     // first user buffer descriptor 
+    unsigned long long  buf1_desc;     // second user buffer descriptor
+    unsigned long long  fbf_desc;      // frame buffer descriptor 
+    unsigned int        length;        // buffer length (bytes)
+    unsigned int        padding[9];    // padding for 64 bytes alignment
 } fbf_chbuf_t;   
 
@@ -65 +69 @@
 // The number of distributed containers can be smaller than (X_SIZE * YSIZE).
 // The actual number of buffers used in the chbuf is defined by (xmax * ymax).
+// Each buffer is described with a 64 bits buffer descriptor:
+// - the 26 LSB bits contain bits[6:31] of the buffer physical address
+// - the 26 following bits contain bits[6:31] of the physical address where the
+//   buffer status is located
+// - the 12 MSB bits contain the common address extension of the buffer and its
+//   status
 // This structure must be 64 bytes aligned.
 ///////////////////////////////////////////////////////////////////////////////
 
-typedef struct nic_chbuf_s
+typedef struct ker_chbuf_s
 {
-    buffer_descriptor_t  buffer[X_SIZE*Y_SIZE];  // kernel chbuf
-    unsigned int         xmax;                   // nb clusters in a row
-    unsigned int         ymax;                   // nb clusters in a column
-} nic_chbuf_t;
+    unsigned long long   buf_desc[X_SIZE*Y_SIZE]; // kernel chbuf descriptor
+    unsigned int         xmax;                        // nb clusters in a row
+    unsigned int         ymax;                        // nb clusters in a column
+} ker_chbuf_t;
 
 
@@ -171 +181 @@
 int _sys_fbf_cma_alloc();
 
-int _sys_fbf_cma_start( void*        vbase0, 
-                        void*        vbase1,  
-                        unsigned int length );
+int _sys_fbf_cma_init_buf(void*        buf0_vbase, 
+                          void*        buf1_vbase, 
+                          void*        sts0_vaddr,
+                          void*        sts1_vaddr );
+
+int _sys_fbf_cma_start( unsigned int length );
 
 int _sys_fbf_cma_display( unsigned int buffer_index );