Changeset 23 for trunk/kernel/devices/dev_ioc.c

Timestamp:

Jun 18, 2017, 10:06:41 PM (7 years ago)

Author:

alain

Message:

Introduce syscalls.

File:

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

trunk/kernel/devices/dev_ioc.c

@@ -55 +55 @@
     uint32_t  channel = chdev->channel;
 
+    // set chdev name
+    strcpy( chdev->name , "ioc" );
+
     // set driver specific fields in chdev descriptor and call driver init function
     if( impl == IMPL_IOC_BDV )
@@ -64 +67 @@
     else if( impl == IMPL_IOC_HBA )
     {
-        chdev->cmd = &soclib_hba_command;
+        chdev->cmd = &soclib_hba_cmd;
         chdev->isr = &soclib_hba_isr;
         soclib_hba_init( chdev );
@@ -109 +112 @@
 //////////////////////////////////////////////////////////////////////////////////
 // This static function is called by dev_ioc_read() & dev_ioc_write() functions.
-// It builds and registers the command in the calling thread descriptor, after
-// translation of buffer virtual address to physical address. 
+// It builds and registers the command in the calling thread descriptor.
 // Then, it registers the calling thead in chdev waiting queue.
 // Finally it blocks on the THREAD_BLOCKED_DEV condition and deschedule.
 ////////////////////////////////////i/////////////////////////////////////////////
-static error_t dev_ioc_access( bool_t    to_mem,
-                               char    * buffer,
-                               uint32_t  lba,
-                               uint32_t  count )
+static error_t dev_ioc_access( uint32_t   cmd_type,
+                               uint8_t  * buffer,
+                               uint32_t   lba,
+                               uint32_t   count )
 {
     thread_t * this = CURRENT_THREAD;              // pointer on client thread
 
-    error_t     error;
-    paddr_t     buf_paddr;
-
-    // Get buffer physical address
-    error = vmm_v2p_translate( CONFIG_KERNEL_IDENTITY , buffer , &buf_paddr );
- 
-    if( error )  return EINVAL;
-
     ioc_dmsg("\n[INFO] in %s : thread %x in process %x"
-             " for lba = %x / vaddr = %x / paddr = %l / at cycle %d\n", 
+             " for lba = %x / buffer = %x / at cycle %d\n", 
              __FUNCTION__ , this->trdid , this->process->pid , 
-             lba , (uint32_t)buffer , buf_paddr , hal_time_stamp() );
+             lba , (intptr_t)buffer , hal_time_stamp() );
 
 #if USE_IOB    // software L2/L3 cache coherence for memory buffer 
 
-    if ( to_mem )  dev_mmc_inval( buf_paddr, count<<9 );
-    else           dev_mmc_sync( buf_paddr, count<<9 );
+    if ( type == IOC_READ )  dev_mmc_inval( XPTR( local_cxy , buffer ) , count<<9 );
+    else                     dev_mmc_sync ( XPTR( local_cxy , buffer ) , count<<9 );
 
 #endif     // end software L2/L3 cache coherence
@@ -148 +142 @@
     // register command in calling thread descriptor
     this->command.ioc.dev_xp    = dev_xp;
-    this->command.ioc.to_mem    = to_mem;
+    this->command.ioc.type      = cmd_type;
     this->command.ioc.buf_xp    = XPTR( local_cxy , buffer );
     this->command.ioc.lba       = lba;
@@ -169 +163 @@
 
 ////////////////////////////////////////////
-error_t dev_ioc_read( char         * buffer,
+error_t dev_ioc_read( uint8_t      * buffer,
                       uint32_t       lba,
                       uint32_t       count )
 {
-    return dev_ioc_access( true , buffer , lba , count ); 
+    return dev_ioc_access( IOC_READ , buffer , lba , count ); 
 }  
 
 ////////////////////////////////////////////
-error_t dev_ioc_write( char         * buffer,
-                       uint32_t       lba,
-                       uint32_t       count )
-{
-    return dev_ioc_access( false , buffer , lba , count ); 
+error_t dev_ioc_write( uint8_t     * buffer,
+                       uint32_t      lba,
+                       uint32_t      count )
+{
+    return dev_ioc_access( IOC_WRITE , buffer , lba , count ); 
 }
+
+/////////////////////////////////////////////
+error_t dev_ioc_sync_read( uint8_t  * buffer,
+                           uint32_t   lba,
+                           uint32_t   count )
+{
+    // get pointer on calling thread 
+    thread_t * this = CURRENT_THREAD;
+
+#if USE_IOB    // software L2/L3 cache coherence for memory buffer 
+
+    dev_mmc_inval( XPTR( local_cxy , buffer ) , count<<9 );
+
+#endif         // end software L2/L3 cache coherence
+
+    // get extended pointer on IOC[0] chdev 
+    xptr_t  dev_xp = chdev_dir.ioc[0];
+
+    assert( (dev_xp != XPTR_NULL) , __FUNCTION__ , "undefined IOC chdev descriptor" );
+
+    // register command in calling thread descriptor
+    this->command.ioc.dev_xp    = dev_xp;
+    this->command.ioc.type      = IOC_SYNC_READ;
+    this->command.ioc.buf_xp    = XPTR( local_cxy , buffer );
+    this->command.ioc.lba       = lba;
+    this->command.ioc.count     = count;
+
+    // get driver command function 
+    cxy_t       dev_cxy = GET_CXY( dev_xp );
+    chdev_t   * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
+    dev_cmd_t * cmd = (dev_cmd_t *)hal_remote_lpt( XPTR( dev_cxy , &dev_ptr->cmd ) );
+
+    // call directly driver command 
+    cmd( XPTR( local_cxy , this ) );
+
+    // return I/O operation status from calling thread descriptor
+    return this->command.ioc.error;
+}
+