Changeset 626 for trunk/hal/tsar_mips32/drivers

Timestamp:

Apr 29, 2019, 7:25:09 PM (5 years ago)

Author:

alain

Message:

This version has been tested on the sort multithreaded application
for TSAR_IOB architectures ranging from 1 to 8 clusters.
It fixes three bigs bugs:
1) the dev_ioc device API has been modified: the dev_ioc_sync_read()
and dev_ioc_sync_write() function use now extended pointers on the
kernel buffer to access a mapper stored in any cluster.
2) the hal_uspace API has been modified: the hal_copy_to_uspace()
and hal_copy_from_uspace() functions use now a (cxy,ptr) couple
to identify the target buffer (equivalent to an extended pointer.
3) an implementation bug has been fixed in the assembly code contained
in the hal_copy_to_uspace() and hal_copy_from_uspace() functions.

Location:

trunk/hal/tsar_mips32/drivers

Files:

• soclib_bdv.c (modified) (9 diffs)
• soclib_mmc.c (modified) (2 diffs)
• soclib_mmc.h (modified) (1 diff)

trunk/hal/tsar_mips32/drivers/soclib_bdv.c

@@ -58 +58 @@
 void __attribute__ ((noinline)) soclib_bdv_cmd( xptr_t th_xp )
 {
-    uint32_t   cmd_type;    // IOC_READ / IOC_WRITE / IOC_SYNC_READ
+    uint32_t   cmd_type;    // IOC_READ / IOC_WRITE / IOC_SYNC_READ / IOC_SYNC_WRITE 
     uint32_t   lba;
     uint32_t   count;
@@ -86 +86 @@
     ioc_xp   = (xptr_t)hal_remote_l64( XPTR( th_cxy , &th_ptr->ioc_cmd.dev_xp ) );
 
-#if DEBUG_HAL_IOC_RX
-if( (DEBUG_HAL_IOC_RX < cycle) && (cmd_type != IOC_WRITE ) )
-printk("\n[%s] thread[%x,%x] enters for client thread[%x,%x] / RX / cycle %d\n",
-__FUNCTION__ , this->process->pid, this->trdid, client_pid, client_trdid, cycle );
-#endif
-
-#if DEBUG_HAL_IOC_TX
-if( (DEBUG_HAL_IOC_TX < cycle) && (cmd_type == IOC_WRITE) )
-printk("\n[%s] thread[%x,%x] enters for client thread[%x,%x] / TX / cycle %d\n",
-__FUNCTION__ , this->process->pid, this->trdid, client_pid, client_trdid, cycle );
-#endif
+    // decode command
+    if     ( (cmd_type == IOC_READ)  || (cmd_type == IOC_SYNC_READ)  ) op = BDV_OP_READ;
+    else if( (cmd_type == IOC_WRITE) || (cmd_type == IOC_SYNC_WRITE) ) op = BDV_OP_WRITE;
+    else     assert( false , "illegal command" );
 
     // get IOC device cluster and local pointer
@@ -110 +103 @@
     uint32_t   buf_lsb = (uint32_t)(buf_xp);
     uint32_t   buf_msb = (uint32_t)(buf_xp>>32);
+
+#if DEBUG_HAL_IOC_RX 
+if( DEBUG_HAL_IOC_RX < cycle )
+printk("\n[%s] thread[%x,%x] enters / client[%x,%x] / cmd %d / lba %x / buf(%x,%x) / cycle %d\n",
+__FUNCTION__ , this->process->pid, this->trdid, client_pid, client_trdid,
+cmd_type, lba, buf_msb, buf_lsb, cycle );
+#endif
+
+#if DEBUG_HAL_IOC_TX
+if( DEBUG_HAL_IOC_TX < cycle )
+printk("\n[%s] thread[%x,%x] enters / client[%x,%x] / cmd %d / lba %x / buf(%x,%x) / cycle %d\n",
+__FUNCTION__ , this->process->pid, this->trdid, client_pid, client_trdid,
+cmd_type, lba, buf_msb, buf_lsb, cycle );
+#endif
 
     // select operation
@@ -143 +150 @@
             {
                 hal_remote_s32( XPTR( th_cxy , &th_ptr->ioc_cmd.error ) , 0 );
+
+#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] exit after SYNC_READ 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] exit after SYNC_WRITE for client thread[%x,%x] / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, client_pid, client_trdid, cycle );
+#endif
                 break;
             }
-            else if( status == BDV_BUSY )   // non completed
+            else if( status == BDV_BUSY )      // non completed
             {
                 continue;
             }
-            else                            // error reported
+            else                               // error reported
             {
                 hal_remote_s32( XPTR( th_cxy , &th_ptr->ioc_cmd.error ) , 1 );
@@ -170 +191 @@
 #if DEBUG_HAL_IOC_RX 
 if( (DEBUG_HAL_IOC_RX < cycle) && (cmd_type != IOC_WRITE ) )
-printk("\n[%s] thread[%x,%x] blocks & deschedules after lauching RX transfer\n",
+printk("\n[%s] thread[%x,%x] blocks & deschedules after lauching READ transfer\n",
 __FUNCTION__ , this->process->pid, this->trdid );
 #endif
@@ -176 +197 @@
 #if DEBUG_HAL_IOC_TX
 if( (DEBUG_HAL_IOC_TX < cycle) && (cmd_type == IOC_WRITE) )
-printk("\n[%s] thread[%x,%x] blocks & deschedules after lauching TX transfer\n",
+printk("\n[%s] thread[%x,%x] blocks & deschedules after lauching WRITE transfer\n",
 __FUNCTION__ , this->process->pid, this->trdid );
 #endif
@@ -184 +205 @@
         // exit critical section
         hal_restore_irq( save_sr );
-    }
     
 #if DEBUG_HAL_IOC_RX
 cycle = (uint32_t)hal_get_cycles();
 if( (DEBUG_HAL_IOC_RX < cycle) && (cmd_type != IOC_WRITE) )
-printk("\n[%s] thread[%x,%x] exit after RX for client thread[%x,%x] / cycle %d\n",
+printk("\n[%s] thread[%x,%x] exit after READ for client thread[%x,%x] / cycle %d\n",
 __FUNCTION__, this->process->pid, this->trdid, client_pid, client_trdid, cycle );
 #endif
@@ -196 +216 @@
 cycle = (uint32_t)hal_get_cycles();
 if( (DEBUG_HAL_IOC_TX < cycle) && (cmd_type == IOC_WRITE) )
-printk("\n[%s] thread[%x,%x] exit after TX for client thread[%x,%x] / cycle %d\n",
-__FUNCTION__, this->process->pid, this->trdid, client_pid, client_trdid, cycle );
-#endif
+printk("\n[%s] thread[%x,%x] exit after WRITE for client thread[%x,%x] / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, client_pid, client_trdid, cycle );
+#endif
+
+    }
 
 } // end soclib_bdv_cmd()
@@ -263 +285 @@
     else
     {
-        assert( false , "IOC_SYNC_READ should not use IRQ" );
+        assert( false , "illegal command %d", cmd_type );
     } 
 

trunk/hal/tsar_mips32/drivers/soclib_mmc.c

@@ -1 +1 @@
 /*
- * soclib_mmc.c - soclib L2 cache controller driver implementation.
+ * soclib_mmc.c - soclib L2 cache driver implementation.
  *
- * Author     Alain Greiner (2016)
+ * Author     Alain Greiner (2016,2017,2018,2019)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -61 +61 @@
 
     // get command type and extended pointer on MMC device
-    type   =         hal_remote_l32 ( XPTR( th_cxy , &th_ptr->mmc_cmd.type   ) );
+    type   =         hal_remote_l32( XPTR( th_cxy , &th_ptr->mmc_cmd.type   ) );
     dev_xp = (xptr_t)hal_remote_l64( XPTR( th_cxy , &th_ptr->mmc_cmd.dev_xp ) );
 

trunk/hal/tsar_mips32/drivers/soclib_mmc.h

@@ -1 +1 @@
 /*
- * soclib_mmc.h - SOCLIB_MMC (TSAR L2 cache) driver definition.
+ * soclib_mmc.h - TSAR L2 cache driver definition.
  *
- * Author    Alain Greiner
+ * Author    Alain Greiner (2016,2017,2018,2019)
  *
  * Copyright (c) UPMC Sorbonne Universites