Changeset 657 for trunk/kernel/devices/dev_dma.c

Timestamp:

Mar 18, 2020, 11:16:59 PM (4 years ago)

Author:

alain

Message:

Introduce remote_buf.c/.h & socket.c/.h files.
Update dev_nic.c/.h files.

File:

• trunk/kernel/devices/dev_dma.c (modified) (5 diffs)

trunk/kernel/devices/dev_dma.c

@@ -2 +2 @@
  * dev_dma.c - DMA (Interrupt Controler Unit) generic device API implementation.
  *
- * Authors   Alain Greiner  (2016,2017,2018,2019)
+ * Authors   Alain Greiner  (2016,2017,2018,2019,2020)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -84 +84 @@
 
 ////////////////////////////////////////////////
-error_t dev_dma_remote_memcpy( xptr_t    dst_xp,
-                               xptr_t    src_xp,
-                               uint32_t  size )
+error_t dev_dma_async_memcpy( xptr_t    dst_xp,
+                              xptr_t    src_xp,
+                              uint32_t  size )
 {
     thread_t * this = CURRENT_THREAD;
 
-#if CONGIG_DEBUG_DEV_DMA
+#if DEBUG_DEV_DMA
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( CONGIG_DEBUG_DEV_DMA < cycle )
@@ -107 +107 @@
 
     // register command in calling thread descriptor
+    this->dma_cmd.sync    = false;
     this->dma_cmd.dev_xp  = dev_xp;
     this->dma_cmd.dst_xp  = dst_xp;
@@ -112 +113 @@
     this->dma_cmd.size    = size;
 
-    // register client thread in waiting queue, activate server thread
-    // block client thread on THREAD_BLOCKED_IO and deschedule.
-    // it is re-activated by the ISR signaling IO operation completion.
+    // register the client thread in waiting queue, activate the server thread,
+    // block the client thread on THREAD_BLOCKED_IO, and deschedule.
+    // it is re-activated by the server thread  when the transfer is completed.
     chdev_register_command( dev_xp );
 
-#if CONGIG_DEBUG_DEV_DMA
+#if DEBUG_DEV_DMA
 cycle = (uint32_t)hal_get_cycles();
 if( CONGIG_DEBUG_DEV_DMA < cycle )
@@ -127 +128 @@
     return this->dma_cmd.error;  
 
-}  // dev_dma_remote_memcpy()
+}  // dev_dma_async_memcpy()
 
+//////////////////////////////////////////////
+error_t dev_dma_sync_memcpy( xptr_t    dst_xp,
+                             xptr_t    src_xp,
+                             uint32_t  size )
+{
+    thread_t * this = CURRENT_THREAD;
+
+#if DEBUG_DEV_DMA
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( CONGIG_DEBUG_DEV_DMA < cycle )
+printk("\n[DBG] %s : thread %x enters / dst %l / src %l / size = %x\n",
+__FUNCTION__ , this, dst_xp, src_xp, size );
+#endif
+
+    // select DMA channel corresponding to core lid
+    uint32_t channel = this->core->lid;
+
+    // get extended pointer on selected DMA chdev descriptor
+    xptr_t  dev_xp = chdev_dir.dma[channel];
+
+// check DMA chdev definition
+assert( (dev_xp != XPTR_NULL) , "undefined DMA chdev descriptor" );
+
+    // register command in calling thread descriptor
+    this->dma_cmd.sync    = true;
+    this->dma_cmd.dev_xp  = dev_xp;
+    this->dma_cmd.dst_xp  = dst_xp;
+    this->dma_cmd.src_xp  = src_xp;
+    this->dma_cmd.size    = size;
+
+    // get driver command function
+    cxy_t       dev_cxy = GET_CXY( dev_xp );
+    chdev_t   * dev_ptr = GET_PTR( dev_xp );
+    dev_cmd_t * cmd = (dev_cmd_t *)hal_remote_lpt( XPTR( dev_cxy , &dev_ptr->cmd ) );
+
+    // call directly the blocking driver function
+    cmd( XPTR( local_cxy , this ) );
+
+#if DEBUG_DEV_DMA
+cycle = (uint32_t)hal_get_cycles();
+if( CONGIG_DEBUG_DEV_DMA < cycle )
+printk("\n[DBG] %s : thread %x exit / dst %l / src %l / size = %x\n",
+__FUNCTION__ , this, dst_xp, src_xp, size );
+#endif
+
+    // return I/O operation status from calling thread descriptor
+    return this->dma_cmd.error;  
+
+}  // dev_dma_sync_memcpy()
+