Changeset 647 for trunk/hal/tsar_mips32/drivers/soclib_bdv.c

Timestamp:

Oct 22, 2019, 1:48:51 PM (5 years ago)

Author:

alain

Message:

...miscelaneous...

File:

• trunk/hal/tsar_mips32/drivers/soclib_bdv.c (modified) (7 diffs)

trunk/hal/tsar_mips32/drivers/soclib_bdv.c

@@ -33 +33 @@
 void soclib_bdv_init( chdev_t * chdev )
 {
-    // get extended pointer on SOCLIB_BDV peripheral base 
-        xptr_t  bdv_xp = chdev->base;
-
-    // set driver specific fields
+    // set driver specific fields in IOC chdev
     chdev->cmd = &soclib_bdv_cmd;
     chdev->isr = &soclib_bdv_isr;
 
+    // get extended pointer on SOCLIB_BDV peripheral base 
+        xptr_t  base_xp = chdev->base;
+
     // get hardware device cluster and local pointer
-    cxy_t      bdv_cxy  = GET_CXY( bdv_xp );
-    uint32_t * bdv_ptr  = (uint32_t *)GET_PTR( bdv_xp );
+    cxy_t      base_cxy  = GET_CXY( base_xp );
+    uint32_t * base_ptr  = GET_PTR( base_xp );
 
     // get block_size and block_count  
-        uint32_t block_size = hal_remote_l32( XPTR( bdv_cxy , bdv_ptr + BDV_BLOCK_SIZE_REG ) );
-        uint32_t block_count = hal_remote_l32( XPTR( bdv_cxy , bdv_ptr + BDV_SIZE_REG ) );
-
-    // set IOC device descriptor extension
+        uint32_t block_size  = hal_remote_l32( XPTR( base_cxy , base_ptr + BDV_BLOCK_SIZE_REG ) );
+        uint32_t block_count = hal_remote_l32( XPTR( base_cxy , base_ptr + BDV_SIZE_REG ) );
+
+    // set IOC chdev extension fields
     chdev->ext.ioc.size  = block_size;
     chdev->ext.ioc.count = block_count;
@@ -91 +91 @@
     else     assert( false , "illegal command" );
 
-    // get IOC device cluster and local pointer
+    // get cluster and local pointer on IOC chdev
     cxy_t      ioc_cxy = GET_CXY( ioc_xp );
     chdev_t  * ioc_ptr = GET_PTR( ioc_xp );
@@ -131 +131 @@
     // waiting policy  depends on the command type
     // - for IOC_READ / IOC_WRITE commands, this function is called by the server thread
-    //   that blocks and deschedules after launching the I/O transfer.
-    //   The I/O operation status is reported in the command by the ISR.
-    // - for IOC_SYNC_READ / IOC_SYNC_WRITE command, this function is called by the client
-    //   thread that polls the BDV status register until I/O transfer completion.
+    //   => block and deschedule after launching the I/O transfer. 
+    //   The I/O operation status is reported in the command by the ISR, and the
+    //   server thread is re-activated by the ISR.
+    // - for IOC_SYNC_READ / IOC_SYNC_WRITE, this function is called by the client thread
+    //   => mask the IOC IRQ and poll the BDV status register until I/O transfer completion,
+    //   and report status in the command.
 
     if( (cmd_type == IOC_SYNC_READ) || (cmd_type == IOC_SYNC_WRITE) )  // polling policy
     {
+        // get core handling the IOC IRQ
+        thread_t * server = (thread_t *)hal_remote_lpt( XPTR( ioc_cxy , &ioc_ptr->server ) );
+        core_t   * core   = (core_t *)hal_remote_lpt( XPTR( ioc_cxy , &server->core ) );
+        lid_t      lid    = (lid_t)hal_remote_l32( XPTR( ioc_cxy , &core->lid ) );
+
+        // mask the IOC IRQ
+        dev_pic_disable_irq( lid , ioc_xp );
+
         // launch I/O operation on BDV device
         hal_remote_s32( XPTR( seg_cxy , seg_ptr + BDV_OP_REG ) , op );
@@ -149 +159 @@
                 (status == BDV_WRITE_SUCCESS) ) // successfully completed
             {
+                // unmask IOC IRQ
+                dev_pic_enable_irq( lid , ioc_xp );
+
+                // report success in command
                 hal_remote_s32( XPTR( th_cxy , &th_ptr->ioc_cmd.error ) , 0 );
 
@@ -154 +168 @@
 cycle = (uint32_t)hal_get_cycles();
 if( (DEBUG_HAL_IOC_RX < cycle) && (cmd_type == IOC_SYNC_READ) )
-printk("\n[%s] thread[%x,%x] exit after SYNC_READ for client thread[%x,%x] / cycle %d\n",
+printk("\n[%s] thread[%x,%x] SYNC_READ success for client thread[%x,%x] / cycle %d\n",
 __FUNCTION__, this->process->pid, this->trdid, client_pid, client_trdid, cycle );
 #endif
@@ -161 +175 @@
 cycle = (uint32_t)hal_get_cycles();
 if( (DEBUG_HAL_IOC_TX < cycle) && (cmd_type == IOC_SYNC_WRITE) )
-printk("\n[%s] thread[%x,%x] exit after SYNC_WRITE for client thread[%x,%x] / cycle %d\n",
+printk("\n[%s] thread[%x,%x] SYNC_WRITE success for client thread[%x,%x] / cycle %d\n",
 __FUNCTION__, this->process->pid, this->trdid, client_pid, client_trdid, cycle );
 #endif
@@ -172 +186 @@
             else                               // error reported
             {
+                // unmask IOC IRQ
+                dev_pic_enable_irq( lid , ioc_xp );
+
+                // report failure in command
                 hal_remote_s32( XPTR( th_cxy , &th_ptr->ioc_cmd.error ) , 1 );
+
+#if DEBUG_HAL_IOC_RX
+cycle = (uint32_t)hal_get_cycles();
+if( (DEBUG_HAL_IOC_RX < cycle) && (cmd_type == IOC_SYNC_READ) )
+printk("\n[%s] thread[%x,%x] SYNC_READ failure for client thread[%x,%x] / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, client_pid, client_trdid, cycle );
+#endif
+
+#if DEBUG_HAL_IOC_TX
+cycle = (uint32_t)hal_get_cycles();
+if( (DEBUG_HAL_IOC_TX < cycle) && (cmd_type == IOC_SYNC_WRITE) )
+printk("\n[%s] thread[%x,%x] SYNC_WRITE failure for client thread[%x,%x] / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, client_pid, client_trdid, cycle );
+#endif
                 break;
             }