Changeset 440 for trunk/kernel/devices

Timestamp:

May 3, 2018, 5:51:22 PM (6 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..

Location:

trunk/kernel/devices

Files:

• dev_fbf.c (modified) (3 diffs)
• dev_ioc.c (modified) (1 diff)
• dev_mmc.c (modified) (6 diffs)
• dev_mmc.h (modified) (1 diff)

trunk/kernel/devices/dev_fbf.c

@@ -119 +119 @@
 //////////////////////////////////////////////////////////////////////////////////
 // This static function is called by dev_fbf_read() & dev_fbf_write() functions.
-// It builds and registers the command in the calling thread descriptor, after
-// translation of buffer virtual address to physical address. 
-// Then, it registers the calling thead in the relevant DMA chdev waiting queue.
+// It builds and registers the command in the calling thread descriptor. 
+// Then, it registers the calling thread in the relevant DMA chdev waiting queue.
 // Finally it blocks on the THREAD_BLOCKED_DEV condition and deschedule.
 ////////////////////////////////////i/////////////////////////////////////////////
@@ -129 +128 @@
                                uint32_t  offset )
 {
-    error_t     error;
-    paddr_t     buf_paddr;
-
-    thread_t * this = CURRENT_THREAD;              // pointer on client thread
-
-    // Get buffer physical address
-    error = vmm_v2p_translate( CONFIG_KERNEL_IDENTITY_MAP , buffer , &buf_paddr );
- 
-    // check buffer is mapped
-    assert( (error == 0) , __FUNCTION__ ,
-    "cannot translate vaddr = %p in process %x\n", buffer, this->process->pid ); 
 
     // get extended pointer on FBF chdev descriptor
@@ -160 +148 @@
 
     // compute extended pointers on frame buffer and memory buffer
-    xptr_t  mem_buf_xp = XPTR( local_cxy , (void *)(intptr_t)buf_paddr );
+    xptr_t  mem_buf_xp = XPTR( local_cxy , buffer );
     xptr_t  fbf_buf_xp = base + offset;
 

trunk/kernel/devices/dev_ioc.c

@@ -91 +91 @@
 // This static function is called by dev_ioc_read() & dev_ioc_write() functions.
 // It builds and registers the command in the calling thread descriptor.
-// Then, it registers the calling thead in chdev waiting queue.
+// Then, it registers the calling thead in IOCchdev waiting queue.
 // Finally it blocks on the THREAD_BLOCKED_IO condition and deschedule.
 ////////////////////////////////////i/////////////////////////////////////////////

trunk/kernel/devices/dev_mmc.c

@@ -57 +57 @@
 
 /////////////////////////////////////////////////////////////////////////////
-// This static function is called by all MMC device functions.
+// This static function is called by all MMC device access functions.
 // It makes some checking, takes the lock granting exclusive
 // access to MMC peripheral, call the driver to execute the command
@@ -71 +71 @@
     // get MMC device cluster identifier & 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 driver command function pointer from MMC device descriptor
@@ -97 +97 @@
 
     // get calling thread local pointer
-    thread_t * this = CURRENT_THREAD;
+    thread_t  * this    = CURRENT_THREAD;
 
 #if DEBUG_DEV_MMC
@@ -113 +113 @@
              "buffer not aligned on cache line" );
 
-    // get buffer physical address
-    paddr_t  buf_paddr;
-    error = vmm_v2p_translate( CONFIG_KERNEL_IDENTITY_MAP , buf_ptr , &buf_paddr ); 
-
-    assert( (error == 0) , __FUNCTION__ , "cannot get buffer paddr" );
-
     // 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_paddr = buf_paddr;
+    this->mmc_cmd.buf_ptr   = buf_ptr;
     this->mmc_cmd.buf_size  = buf_size;
 
@@ -144 +138 @@
     error_t error;
 
-    // get calling thread local pointer
-    thread_t * this = CURRENT_THREAD;
+    thread_t  * this    = CURRENT_THREAD;
 
 #if DEBUG_DEV_MMC
@@ -161 +154 @@
              "buffer not aligned on cache line" );
 
-    // get  buffer physical address
-    paddr_t  buf_paddr;
-    error = vmm_v2p_translate( CONFIG_KERNEL_IDENTITY_MAP , buf_ptr , &buf_paddr ); 
-
-    assert( (error == 0) , __FUNCTION__ , "cannot get buffer paddr" );
-
     // 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_paddr = buf_paddr;
+    this->mmc_cmd.buf_ptr   = buf_ptr;
     this->mmc_cmd.buf_size  = buf_size;
 

trunk/kernel/devices/dev_mmc.h

@@ -83 +83 @@
     xptr_t      dev_xp;     /*! extended pointer on target MMC device descriptor        */
     uint32_t    type;       /*! CC_INVAL / CC_SYNC / GET_ERROR / SET_ERROR / GET_INSTRU */
-    paddr_t     buf_paddr;  /*! physical address of memory buffer (used by INVAL/SYNC)  */
-    uint32_t    buf_size;   /*! buffer size in bytes              (used by INVAL/SYNC)  */
+    void      * buf_ptr;    /*! local pointer on memory buffer    (used by INVAL/SYNC)  */
+    uint32_t    buf_size;   /*! memory buffer size (bytes)        (used by INVAL/SYNC)  */
     uint32_t    reg_index;  /*! register index in MMC peripheral  (used by SET/GET)     */
     uint32_t  * reg_ptr;    /*! local pointer on src/dst buffer   (used by SET/GET)     */