Changeset 437 for trunk/hal

Timestamp:

Mar 28, 2018, 2:40:29 PM (7 years ago)

Author:

alain

Message:

Fix various bugs

Location:

trunk/hal/tsar_mips32

Files:

• core/hal_exception.c (modified) (7 diffs)
• drivers/soclib_bdv.c (modified) (6 diffs)
• drivers/soclib_bdv.h (modified) (1 diff)
• drivers/soclib_hba.c (modified) (2 diffs)
• drivers/soclib_hba.h (modified) (1 diff)

trunk/hal/tsar_mips32/core/hal_exception.c

@@ -154 +154 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// This function is called when an MMU exception has been detected. 
+// This function is called when an MMU exception has been detected (IBE / DBE). 
 // It get the relevant exception arguments from the MMU.
 // It signal a fatal error in case of illegal access. In case of page unmapped
@@ -167 +167 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 error_t hal_mmu_exception( thread_t * this,
+                           uint32_t   excPC,
                            bool_t     is_ins ) 
 {
@@ -294 +295 @@
         default:                             // this is a kernel error => panic    
         {
-            assert( false , __FUNCTION__ , "thread %x / excp_code = %x / vaddr = %x\n",
-            this->trdid , excp_code , bad_vaddr );
+            assert( false , __FUNCTION__ , "thread %x / epc %x / %s / vaddr = %x\n",
+            this, excPC, hal_mmu_exception_str(excp_code) , bad_vaddr );
 
             return EXCP_KERNEL_PANIC;
@@ -379 +380 @@
         error_t      error;
         uint32_t     excCode;                  // 4 bits XCODE from CP0_CR
+        uint32_t     excPC;                    // fauty instruction address
 
     // get pointer on faulty thread uzone
@@ -384 +386 @@
     uzone = (uint32_t *)CURRENT_THREAD->uzone_current;
 
-    // get 4 bits XCODE from CP0_CR register
+    // get XCODE and EPC from UZONE
         excCode        = (uzone[UZ_CR] >> 2) & 0xF;
+    excPC          = uzone[UZ_EPC];
 
 #if CONFIG_DEBUG_HAL_EXCEPTIONS
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( CONFIG_DEBUG_HAL_EXCEPTIONS < cycle )
-printk("\n[DBG] %s : thread %x on core[%x,%d] enter / process %x / xcode %x / cycle %d\n",
-__FUNCTION__, this, local_cxy, this->core->lid, this->process->pid, excCode, cycle );
+printk("\n[DBG] %s : thread %x enter / core[%x,%d] / pid %x / epc %x / xcode %x / cycle %d\n",
+__FUNCTION__, this, local_cxy, this->core->lid, this->process->pid, excPC, excCode, cycle );
 #endif
 
@@ -398 +401 @@
         case XCODE_DBE:     // can be non fatal
         {
-                    error = hal_mmu_exception( this , false );  // data MMU exception
+                    error = hal_mmu_exception( this , excPC , false );  // data MMU exception
             break;
         }
             case XCODE_IBE:     // can be non fatal
         {
-                    error = hal_mmu_exception( this , true );   // ins MMU exception
+                    error = hal_mmu_exception( this , excPC , true );   // ins MMU exception
                     break;
         }
@@ -450 +453 @@
 cycle = (uint32_t)hal_get_cycles();
 if( CONFIG_DEBUG_HAL_EXCEPTIONS < cycle )
-printk("\n[DBG] %s : thread %x on core[%x,%d] exit / process %x / xcode %x / cycle %d\n",
-__FUNCTION__, this, local_cxy, this->core->lid, this->process->pid, excCode, cycle );
+printk("\n[DBG] %s : thread %x exit / core[%x,%d] / pid %x / epc %x / xcode %x / cycle %d\n",
+__FUNCTION__, this, local_cxy, this->core->lid, this->process->pid, excPC, excCode, cycle );
 #endif
 

trunk/hal/tsar_mips32/drivers/soclib_bdv.c

@@ -2 +2 @@
  * soclib_bdv.c - soclib simple block device driver implementation.
  *
- * Author     Alain Greiner (2016)
+ * Author     Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -74 +74 @@
     buf_xp   = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->ioc_cmd.buf_xp ) );
     ioc_xp   = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->ioc_cmd.dev_xp ) );
+
+#if CONFIG_DEBUG_HAL_IOC_RX
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( (CONFIG_DEBUG_HAL_IOC_RX < cycle) && (cmd_type != IOC_WRITE ) )
+printk("\n[DBG] %s : thread %x enter for RX / cycle %d\n",
+__FUNCTION__ , CURRENT_THREAD , cycle );
+#endif
+
+#if CONFIG_DEBUG_HAL_IOC_TX
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( (CONFIG_DEBUG_HAL_IOC_TX < cycle) && (cmd_type == IOC_WRITE) )
+printk("\n[DBG] %s : thread %x enter for TX / cycle %d\n",
+__FUNCTION__ , CURRENT_THREAD , cycle );
+#endif
 
     // get IOC device cluster and local pointer
@@ -138 +152 @@
     }
     
+#if CONFIG_DEBUG_HAL_IOC_RX
+cycle = (uint32_t)hal_get_cycles();
+if( (CONFIG_DEBUG_HAL_IOC_RX < cycle) && (cmd_type != TXT_WRITE) )
+printk("\n[DBG] %s : thread %x exit after RX / cycle %d\n",
+__FUNCTION__ , CURRENT_THREAD , cycle );
+#endif
+
+#if CONFIG_DEBUG_HAL_IOC_TX
+cycle = (uint32_t)hal_get_cycles();
+if( (CONFIG_DEBUG_HAL_IOC_TX < cycle) && (cmd_type == TXT_WRITE) )
+printk("\n[DBG] %s : thread %x exit after TX / cycle %d\n",
+__FUNCTION__ , CURRENT_THREAD , cycle );
+#endif
+
 } // end soclib_bdv_cmd()
 
@@ -144 +172 @@
 void __attribute__ ((noinline)) soclib_bdv_isr( chdev_t * chdev )
 {
+    error_t  error = 0;
+
     // get extended pointer on client thread
     xptr_t root = XPTR( local_cxy , &chdev->wait_root );
@@ -155 +185 @@
     thread_t * client_ptr = (thread_t *)GET_PTR( client_xp );
 
+    // get command type
+    uint32_t   cmd_type = hal_remote_lw( XPTR( client_cxy , &client_ptr->ioc_cmd.type ) );
+    
     // get SOCLIB_BDV device cluster and local pointer
     cxy_t      bdv_cxy  = GET_CXY( chdev->base );
@@ -162 +195 @@
         uint32_t status = hal_remote_lw( XPTR( bdv_cxy , bdv_ptr + BDV_STATUS_REG ) );   
 
+    if( cmd_type == IOC_READ )
+    {
+            error = (status != BDV_READ_SUCCESS);
+
+#if CONFIG_DEBUG_HAL_IOC_RX
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_HAL_IOC_RX < cycle )
+printk("\n[DBG] %s : IOC_IRQ / RX transfer / client %x / server %x / cycle %d\n",
+__FUNCTION__, client_ptr , chdev->server , cycle );
+#endif
+
+    }
+        else if( cmd_type == IOC_WRITE )
+    {
+            error = (status != BDV_WRITE_SUCCESS);
+
+#if CONFIG_DEBUG_HAL_IOC_TX
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_HAL_IOC_TX < cycle )
+printk("\n[DBG] %s : IOC_IRQ / RX transfer / client %x / server %x / cycle %d\n",
+__FUNCTION__, client_ptr , chdev->server , cycle );
+#endif
+
+    }
+    else
+    {
+        assert( false , __FUNCTION__ , "IOC_SYNC_READ should not use IRQ" );
+    } 
+
     // set operation status in command
-        if((status != BDV_READ_SUCCESS) && (status != BDV_WRITE_SUCCESS)) 
-    {
-        hal_remote_sw( XPTR( client_cxy , &client_ptr->ioc_cmd.error ) , 1 );
-    }
-        else
-    {
-        hal_remote_sw( XPTR( client_cxy , &client_ptr->ioc_cmd.error ) , 0 );
-    }
+    hal_remote_sw( XPTR( client_cxy , &client_ptr->ioc_cmd.error ) , error );
 
     // unblock server thread 
     thread_unblock( server_xp , THREAD_BLOCKED_ISR );
 
-    // unblock client thread
-    thread_unblock( client_xp , THREAD_BLOCKED_IO );
-
 } // end soclib_bdv_isr()
 

trunk/hal/tsar_mips32/drivers/soclib_bdv.h

@@ -2 +2 @@
  * soclib_bdv.h - SOCLIB_BDV (simple block device) driver definition.
  *
- * Author    Alain Greiner
+ * Author    Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites

trunk/hal/tsar_mips32/drivers/soclib_hba.c

@@ -2 +2 @@
  * soclib_hba.c - soclib AHCI block device driver implementation.
  *
- * Author     Alain Greiner (2016)
+ * Author     Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -290 +290 @@
             // unblock client thread
             thread_unblock( client_xp , THREAD_BLOCKED_IO );
- 
-            ioc_dmsg("INFO in %s : thread %x at cycle %d\n",
-            __FUNCTION__ , hal_remote_lw( XPTR( client_cxy , &client_ptr->trdid ) ) ,
-            hal_get_cycles() );
         }
     }

trunk/hal/tsar_mips32/drivers/soclib_hba.h

@@ -2 +2 @@
  * soclib_hba.h - soclib AHCI block device driver definition.
  *
- * Author        Alain Greiner (2016)
+ * Author        Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites