Changeset 570 for trunk/hal/tsar_mips32/drivers/soclib_hba.c

Timestamp:

Oct 5, 2018, 12:08:35 AM (6 years ago)

Author:

alain

Message:

Introduction of the soclib_mty driver for the TSAR-LETI architecture.

File:

• trunk/hal/tsar_mips32/drivers/soclib_hba.c (modified) (13 diffs)

trunk/hal/tsar_mips32/drivers/soclib_hba.c

@@ -27 +27 @@
 #include <dev_ioc.h>
 #include <soclib_hba.h>
-#include <spinlock.h>
 #include <thread.h>
 
@@ -51 +50 @@
 
 // spinlock protecting the command slot allocator
-__attribute__((section(".kdata")))
-spinlock_t         hba_lock;
+// __attribute__((section(".kdata")))
+// busylock_t         hba_lock;
 
 ///////////////////////////////////////
@@ -69 +68 @@
 
     // get block_size and block_count  
-        uint32_t block_size  = hal_remote_lw( XPTR( hba_cxy , hba_ptr + HBA_BLOCK_SIZE_REG ) );
-        uint32_t block_count = hal_remote_lw( XPTR( hba_cxy , hba_ptr + HBA_BLOCK_COUNT_REG ) );
+        uint32_t block_size  = hal_remote_l32( XPTR( hba_cxy , hba_ptr + HBA_BLOCK_SIZE_REG ) );
+        uint32_t block_count = hal_remote_l32( XPTR( hba_cxy , hba_ptr + HBA_BLOCK_COUNT_REG ) );
 
     // set device descriptor extension
@@ -77 +76 @@
 
     // activate HBA interrupts 
-    hal_remote_sw( XPTR( hba_cxy , hba_ptr + HBA_PXIE_REG ) , 0x1 );
+    hal_remote_s32( XPTR( hba_cxy , hba_ptr + HBA_PXIE_REG ) , 0x1 );
 
         // reset SOCLIB_HBA driver global variable
@@ -107 +106 @@
 
     // get command arguments and extended pointer on IOC device
-    cmd_type  =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->ioc_cmd.type   ) );
-    lba       =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->ioc_cmd.lba    ) );
-    count     =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->ioc_cmd.count  ) );
-    buf_xp    = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->ioc_cmd.buf_xp ) );
-    dev_xp    = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->ioc_cmd.dev_xp ) );
+    cmd_type  =         hal_remote_l32 ( XPTR( th_cxy , &th_ptr->ioc_cmd.type   ) );
+    lba       =         hal_remote_l32 ( XPTR( th_cxy , &th_ptr->ioc_cmd.lba    ) );
+    count     =         hal_remote_l32 ( XPTR( th_cxy , &th_ptr->ioc_cmd.count  ) );
+    buf_xp    = (xptr_t)hal_remote_l64( XPTR( th_cxy , &th_ptr->ioc_cmd.buf_xp ) );
+    dev_xp    = (xptr_t)hal_remote_l64( XPTR( th_cxy , &th_ptr->ioc_cmd.dev_xp ) );
 
     // get IOC device cluster and local pointer
@@ -118 +117 @@
 
     // get cluster and pointers for SOCLIB-HBA peripheral segment base
-    xptr_t     hba_xp  = (xptr_t)hal_remote_lwd( XPTR( dev_cxy , &dev_ptr->base ) );
+    xptr_t     hba_xp  = (xptr_t)hal_remote_l64( XPTR( dev_cxy , &dev_ptr->base ) );
     cxy_t      hba_cxy = GET_CXY( hba_xp );
     uint32_t * hba_ptr = GET_PTR( hba_xp );
@@ -181 +180 @@
  
             // set HBA_PXCI_REG to start transfer
-            hal_remote_sw( XPTR( hba_cxy , hba_ptr + HBA_PXCI_REG ) , 1<<cmd_id );
+            hal_remote_s32( XPTR( hba_cxy , hba_ptr + HBA_PXCI_REG ) , 1<<cmd_id );
 
             // exit the while 
@@ -204 +203 @@
         while(1)
         {
-            pxis     = hal_remote_lw( XPTR( hba_cxy , hba_ptr + HBA_PXIS_REG ) );
-            pxci     = hal_remote_lw( XPTR( hba_cxy , hba_ptr + HBA_PXCI_REG ) );
+            pxis     = hal_remote_l32( XPTR( hba_cxy , hba_ptr + HBA_PXIS_REG ) );
+            pxci     = hal_remote_l32( XPTR( hba_cxy , hba_ptr + HBA_PXCI_REG ) );
             error    = (pxis & 0x40000000) >> 30;
             fault_id = (pxis & 0x1F000000) >> 24;
@@ -217 +216 @@
                 if( error && (fault_id == cmd_id) ) 
                 {
-                    hal_remote_sw( XPTR( th_cxy , &th_ptr->ioc_cmd.error ) , 1 );
+                    hal_remote_s32( XPTR( th_cxy , &th_ptr->ioc_cmd.error ) , 1 );
                 }
                 else
                 {
-                    hal_remote_sw( XPTR( th_cxy , &th_ptr->ioc_cmd.error ) , 0 );
+                    hal_remote_s32( XPTR( th_cxy , &th_ptr->ioc_cmd.error ) , 0 );
                 }
 
@@ -243 +242 @@
     // get extended pointer on client thread
     xptr_t root      = XPTR( local_cxy , &chdev->wait_root );
-    xptr_t client_xp = XLIST_FIRST_ELEMENT( root , thread_t , wait_list );
+    xptr_t client_xp = XLIST_FIRST( root , thread_t , wait_list );
 
     // get client thread cluster and local pointer
@@ -254 +253 @@
 
     // get HBA_PXIS_REG and HBA_PXCI_REG current values
-    uint32_t current_pxis = hal_remote_lw( XPTR( hba_cxy , hba_ptr + HBA_PXIS_REG ) );
-    uint32_t current_pxci = hal_remote_lw( XPTR( hba_cxy , hba_ptr + HBA_PXCI_REG ) );
+    uint32_t current_pxis = hal_remote_l32( XPTR( hba_cxy , hba_ptr + HBA_PXIS_REG ) );
+    uint32_t current_pxci = hal_remote_l32( XPTR( hba_cxy , hba_ptr + HBA_PXCI_REG ) );
 
     uint32_t  error    = (current_pxis & 0x40000000) >> 30;
@@ -273 +272 @@
             if( error && (iter == fault_id ) ) 
             {
-                hal_remote_sw( XPTR( client_cxy , &client_ptr->ioc_cmd.error ) , 1 );
+                hal_remote_s32( XPTR( client_cxy , &client_ptr->ioc_cmd.error ) , 1 );
             }
             else
             {
-                hal_remote_sw( XPTR( client_cxy , &client_ptr->ioc_cmd.error ) , 0 );
+                hal_remote_s32( XPTR( client_cxy , &client_ptr->ioc_cmd.error ) , 0 );
             }
 
@@ -286 +285 @@
 
     // reset HBA_PXIS_REG
-    hal_remote_sw( XPTR( hba_cxy , hba_ptr + HBA_PXIS_REG ) , 0 );
+    hal_remote_s32( XPTR( hba_cxy , hba_ptr + HBA_PXIS_REG ) , 0 );
 
 } // end soclib_hba_isr()