Changeset 279 for trunk/kernel/devices/dev_ioc.c

Timestamp:

Jul 27, 2017, 12:23:29 AM (6 years ago)

Author:

alain

Message:

1) Introduce independant command fields for the various devices in the thread descriptor.
2) Introduce a new dev_pic_enable_ipi() function in the generic PIC device
3) Fix two bugs identified by Maxime in the scheduler initialisation, and in the sched_select().
4) fix several bugs in the TSAR hal_kentry.S.
5) Introduce a third kgiet segment (besides kdata and kcode) in the TSAR bootloader.

File:

• trunk/kernel/devices/dev_ioc.c (modified) (4 diffs)

trunk/kernel/devices/dev_ioc.c

@@ -116 +116 @@
 
     // register command in calling thread descriptor
-    this->command.ioc.dev_xp    = dev_xp;
-    this->command.ioc.type      = cmd_type;
-    this->command.ioc.buf_xp    = XPTR( local_cxy , buffer );
-    this->command.ioc.lba       = lba;
-    this->command.ioc.count     = count;
+    this->ioc_cmd.dev_xp    = dev_xp;
+    this->ioc_cmd.type      = cmd_type;
+    this->ioc_cmd.buf_xp    = XPTR( local_cxy , buffer );
+    this->ioc_cmd.lba       = lba;
+    this->ioc_cmd.count     = count;
 
     // register client thread in IOC chdev waiting queue, activate server thread,
@@ -130 +130 @@
              " completes / error = %d / at cycle %d\n",
              __FUNCTION__ , this->trdid , this->process->pid ,
-             this->command.ioc.error , hal_get_cycles() );
+             this->ioc_cmd.error , hal_get_cycles() );
 
     // return I/O operation status
-    return this->command.ioc.error;
+    return this->ioc_cmd.error;
 
 }  // end dev_ioc_access()
@@ -158 +158 @@
                            uint32_t   count )
 {
+    ioc_dmsg("\n[INFO] %s : enter in cluster %x\n",
+             __FUNCTION__ , local_cxy );
+
     // get pointer on calling thread
     thread_t * this = CURRENT_THREAD;
@@ -165 +168 @@
 
     // get extended pointer on IOC[0] chdev
-    xptr_t  dev_xp = chdev_dir.ioc[0];
-
-    assert( (dev_xp != XPTR_NULL) , __FUNCTION__ , "undefined IOC chdev descriptor" );
+    xptr_t  ioc_xp = chdev_dir.ioc[0];
+
+    assert( (ioc_xp != XPTR_NULL) , __FUNCTION__ , "undefined IOC chdev descriptor" );
 
     // register command in calling thread descriptor
-    this->command.ioc.dev_xp    = dev_xp;
-    this->command.ioc.type      = IOC_SYNC_READ;
-    this->command.ioc.buf_xp    = XPTR( local_cxy , buffer );
-    this->command.ioc.lba       = lba;
-    this->command.ioc.count     = count;
+    this->ioc_cmd.dev_xp    = ioc_xp;
+    this->ioc_cmd.type      = IOC_SYNC_READ;
+    this->ioc_cmd.buf_xp    = XPTR( local_cxy , buffer );
+    this->ioc_cmd.lba       = lba;
+    this->ioc_cmd.count     = count;
 
     // get driver command function
-    cxy_t       dev_cxy = GET_CXY( dev_xp );
-    chdev_t   * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
-    dev_cmd_t * cmd = (dev_cmd_t *)hal_remote_lpt( XPTR( dev_cxy , &dev_ptr->cmd ) );
+    cxy_t       ioc_cxy = GET_CXY( ioc_xp );
+    chdev_t   * ioc_ptr = (chdev_t *)GET_PTR( ioc_xp );
+    dev_cmd_t * cmd = (dev_cmd_t *)hal_remote_lpt( XPTR( ioc_cxy , &ioc_ptr->cmd ) );
+
+    // get core local index for the 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_lw( XPTR( ioc_cxy , &core->lid ) );
 
     // mask the IRQ
-    thread_t * server = (thread_t *)hal_remote_lpt( XPTR( dev_cxy , &dev_ptr->server ) );
-    core_t   * core = (core_t *)hal_remote_lpt( XPTR( dev_cxy , &server->core ) );
-    lid_t      lid = (lid_t)hal_remote_lw( XPTR( dev_cxy , &core->lid ) );
-    dev_pic_disable_irq( lid , dev_xp );
-
-    // call directly driver command
+    dev_pic_disable_irq( lid , ioc_xp );
+
+    ioc_dmsg("\n[INFO] %s : coucou 3\n",
+             __FUNCTION__ );
+
+    // call driver function
     cmd( XPTR( local_cxy , this ) );
 
     // unmask the IRQ
-    dev_pic_enable_irq( lid , dev_xp );
+    dev_pic_enable_irq( lid , ioc_xp );
+
+    ioc_dmsg("\n[INFO] %s : exit in cluster %x\n",
+             __FUNCTION__ , local_cxy );
 
     // return I/O operation status from calling thread descriptor
-    return this->command.ioc.error;
-}
-
+    return this->ioc_cmd.error;
+
+}  // end ioc_sync_read()
+