Changeset 440 for trunk/hal/tsar_mips32/drivers/soclib_mmc.c

Timestamp:

May 3, 2018, 5:51:22 PM (7 years ago)

Author:

alain

Message:

1/ Fix a bug in the Multithreaded "sort" applicationr:
The pthread_create() arguments must be declared as global variables.
2/ The exit syscall can be called by any thread of a process..

File:

• trunk/hal/tsar_mips32/drivers/soclib_mmc.c (modified) (4 diffs)

trunk/hal/tsar_mips32/drivers/soclib_mmc.c

@@ -52 +52 @@
     xptr_t     dev_xp;       // extended pointer on MMC device
     uint32_t   type;         // MMC command : type
-    uint64_t   buf_paddr;    // MMC command : buffer physical address
+    void     * buf_ptr;      // MMC command : buffer pointer 
     uint32_t   buf_size;     // MMC command : buffer size
     uint32_t   reg_index;    // MMC command : register index in MMC peripheral
@@ -59 +59 @@
     // get client thread cluster and local pointer
     cxy_t      th_cxy = GET_CXY( th_xp );
-    thread_t * th_ptr = (thread_t *)GET_PTR( th_xp );
+    thread_t * th_ptr = GET_PTR( th_xp );
 
     // get command type and extended pointer on MMC device
@@ -67 +67 @@
     // get MMC device cluster and local pointer
     cxy_t     dev_cxy = GET_CXY( dev_xp );
-    chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
+    chdev_t * dev_ptr = GET_PTR( dev_xp );
 
-    // get extended pointer on SOCLIB-MMC peripheral
-    xptr_t     mmc_xp = hal_remote_lw( XPTR( dev_cxy , &dev_ptr->base ) );
-
-    // get SOCLIB_MMC peripheral cluster and local pointer
-    cxy_t      mmc_cxy = GET_CXY( mmc_xp );
-    uint32_t * mmc_ptr = (uint32_t *)GET_PTR( mmc_xp );
+    // get cluster and pointers for SOCLIB_MMC peripheral segment base
+    xptr_t     seg_xp = (xptr_t)hal_remote_lwd( XPTR( dev_cxy , &dev_ptr->base ) );
+    cxy_t      seg_cxy = GET_CXY( seg_xp );
+    uint32_t * seg_ptr = GET_PTR( seg_xp );
 
     if( (type == MMC_CC_INVAL) || (type == MMC_CC_SYNC) )
     {
-        // get buffer paddr
-        buf_paddr = hal_remote_lwd( XPTR( th_cxy , &th_ptr->mmc_cmd.buf_paddr ) );
+        // get buffer pointer and size
+        buf_ptr  = hal_remote_lpt( XPTR( th_cxy , &th_ptr->mmc_cmd.buf_ptr ) );
+        buf_size = hal_remote_lw ( XPTR( th_cxy , &th_ptr->mmc_cmd.buf_size ) );
 
-        // split buffer paddr in two 32 bits words
-        uint32_t   buf_lo = (uint32_t)( buf_paddr );
-        uint32_t   buf_hi = (uint32_t)( buf_paddr>>32 );
-
-        // get buffer size
-        buf_size   = hal_remote_lw( XPTR( th_cxy , &th_ptr->mmc_cmd.buf_size ) );
-
-        // get command type
-        uint32_t cc_cmd;
+        // set command type
+        uint32_t   cc_cmd;
         if( type == MMC_CC_INVAL )  cc_cmd = SOCLIB_MMC_CC_INVAL;
         else                        cc_cmd = SOCLIB_MMC_CC_SYNC; 
 
         // set SOCLIB_MMC registers to start INVAL/SYNC operation
-        hal_remote_sw( XPTR( mmc_cxy , mmc_ptr + SOCLIB_MMC_ADDR_LO    ) , buf_lo );
-        hal_remote_sw( XPTR( mmc_cxy , mmc_ptr + SOCLIB_MMC_ADDR_HI    ) , buf_hi );
-        hal_remote_sw( XPTR( mmc_cxy , mmc_ptr + SOCLIB_MMC_BUF_LENGTH ) , buf_size ); 
-        hal_remote_sw( XPTR( mmc_cxy , mmc_ptr + SOCLIB_MMC_CMD_TYPE   ) , cc_cmd ); 
+        hal_remote_sw( XPTR( seg_cxy , seg_ptr + SOCLIB_MMC_ADDR_LO    ) , (uint32_t)buf_ptr );
+        hal_remote_sw( XPTR( seg_cxy , seg_ptr + SOCLIB_MMC_ADDR_HI    ) , (uint32_t)dev_cxy );
+        hal_remote_sw( XPTR( seg_cxy , seg_ptr + SOCLIB_MMC_BUF_LENGTH ) , buf_size ); 
+        hal_remote_sw( XPTR( seg_cxy , seg_ptr + SOCLIB_MMC_CMD_TYPE   ) , cc_cmd ); 
     }
     else  // (type == MMC_GET_ERROR) or (type == MMC_GET_ERROR) pr (type == MMC_GET_INSTRU )
@@ -108 +100 @@
         if( (type == MMC_GET_ERROR) || (type == MMC_GET_INSTRU) )
         {
-            *reg_ptr =  hal_remote_lw( XPTR( mmc_cxy , mmc_ptr + reg_index ) );
+            *reg_ptr =  hal_remote_lw( XPTR( seg_cxy , seg_ptr + reg_index ) );
         }
         else  // type == MMC_SET_ERROR
         {
-            hal_remote_sw( XPTR( mmc_cxy , mmc_ptr + reg_index ) , *reg_ptr );
+            hal_remote_sw( XPTR( seg_cxy , seg_ptr + reg_index ) , *reg_ptr );
         }
     }