Changeset 495 for soft/giet_vm/giet_common/tty0.c

Timestamp:

Feb 8, 2015, 12:55:35 PM (9 years ago)

Author:

alain

Message:

Introduce quad tree for distributed locks and barriers.

File:

• soft/giet_vm/giet_common/tty0.c (modified) (5 diffs)

soft/giet_vm/giet_common/tty0.c

@@ -13 +13 @@
 #include <tty_driver.h>
 #include <utils.h>
-#include <locks.h>
+#include <kernel_locks.h>
+
+/////////////////////////////////////////////////////////////////////////////
+// The global variable tty0_boot_mode define the type of lock used,
+// and must be defined in both kernel_init.c and boot.c files.
+// - the boot code must use a spin_lock because the kernel heap is not set.
+// - the kernel code can use a sqt_lock when the kernel heap is set. 
+/////////////////////////////////////////////////////////////////////////////
+
+extern unsigned int  _tty0_boot_mode;
+
+__attribute__((section(".kdata")))
+sqt_lock_t           _tty0_sqt_lock  __attribute__((aligned(64)));  
+
+__attribute__((section(".kdata")))
+spin_lock_t          _tty0_spin_lock  __attribute__((aligned(64)));
 
 //////////////////////////////////////////////
@@ -20 +35 @@
 {
     unsigned int n;
+    unsigned int k;
 
     for ( n = 0 ; n < nbytes ; n++ ) 
     {
-        // return error if TTY_TX buffer full 
-        if ( (_tty_get_register( 0, TTY_STATUS ) & 0x2) ) return 1;
+        // test TTY_TX buffer full 
+        if ( (_tty_get_register( 0, TTY_STATUS ) & 0x2) ) // buffer full
+        {
+            // retry if full 
+            for( k = 0 ; k < 10000 ; k++ )
+            {
+                if ( (_tty_get_register( 0, TTY_STATUS ) & 0x2) == 0) break;
+            }
+            // return error if full after 10000 retry
+            return 1;
+        }
 
         // write one byte
@@ -240 +265 @@
         unsigned int lpid       = procid & ((1<<P_WIDTH)-1);
         _puts("\n\n[GIET ERROR] in _printf() for processor[");
-        _putd( x );
+        _putd( x );  
         _puts(",");
         _putd( y );
@@ -268 +293 @@
     // get TTY0 lock
     _it_disable( &save_sr );
-    _sbt_lock_acquire( &_tty_tx_lock[0] );
+    if ( _tty0_boot_mode ) _spin_lock_acquire( &_tty0_spin_lock );
+    else                   _sqt_lock_acquire( &_tty0_sqt_lock );
 
     va_start( args , format );
@@ -275 +301 @@
 
     // release TTY0 lock
-    _sbt_lock_release( &_tty_tx_lock[0] );
+    if ( _tty0_boot_mode ) _spin_lock_release( &_tty0_spin_lock );
+    else                   _sqt_lock_release( &_tty0_sqt_lock );
     _it_restore( &save_sr );
 }