Changeset 626 for trunk/kernel/devices/dev_mmc.c

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.

File:

• trunk/kernel/devices/dev_mmc.c (modified) (2 diffs)

trunk/kernel/devices/dev_mmc.c

@@ -108 +108 @@
 
     // get buffer cluster and local pointer
-    cxy_t  buf_cxy = GET_CXY( buf_xp );
-    void * buf_ptr = GET_PTR( buf_xp );
+    cxy_t     buf_cxy = GET_CXY( buf_xp );
+    uint8_t * buf_ptr = GET_PTR( buf_xp );
     
-    assert( (((intptr_t)buf_ptr & (CONFIG_CACHE_LINE_SIZE -1)) == 0) ,
-             "buffer not aligned on cache line" );
+    // force buffer align
+    uint32_t  delta = (uint32_t)buf_ptr & (CONFIG_CACHE_LINE_SIZE - 1); 
+    uint8_t * base  = buf_ptr - delta;
+    uint32_t  size  = buf_size + delta;
 
     // store command arguments in thread descriptor
     this->mmc_cmd.dev_xp    = chdev_dir.mmc[buf_cxy];
     this->mmc_cmd.type      = MMC_CC_INVAL;
-    this->mmc_cmd.buf_ptr   = buf_ptr;
-    this->mmc_cmd.buf_size  = buf_size;
+    this->mmc_cmd.buf_ptr   = base;
+    this->mmc_cmd.buf_size  = size;
 
     // call MMC driver
@@ -152 +154 @@
     void * buf_ptr = GET_PTR( buf_xp );
     
-    assert( (((intptr_t)buf_ptr & (CONFIG_CACHE_LINE_SIZE -1)) == 0) ,
-             "buffer not aligned on cache line" );
+    // force buffer align
+    uint32_t  delta = (uint32_t)buf_ptr & (CONFIG_CACHE_LINE_SIZE - 1); 
+    uint8_t * base  = buf_ptr - delta;
+    uint32_t  size  = buf_size + delta;
 
     // store command arguments in thread descriptor
     this->mmc_cmd.dev_xp    = chdev_dir.mmc[buf_cxy];
     this->mmc_cmd.type      = MMC_CC_SYNC;
-    this->mmc_cmd.buf_ptr   = buf_ptr;
-    this->mmc_cmd.buf_size  = buf_size;
+    this->mmc_cmd.buf_ptr   = base;
+    this->mmc_cmd.buf_size  = size;
 
     // call MMC driver