Changeset 313

Timestamp:

Apr 21, 2014, 5:46:38 AM (11 years ago)

Author:

alain

Message:

The main modif is in TTY driver: The hard lock implemented in the
vci_multi_tty component is not used anymore, because this (non cacheable)
lock was not scalable... It has been replaced by a software (cacheable) lock
that has a better scalability in case of hardware cache coherence.
(see the _tty_get_lock() and _tty_release_lock() functions)

Location:

soft/giet_vm/giet_drivers

Files:

• bdv_driver.c (modified) (3 diffs)
• dma_driver.c (modified) (3 diffs)
• ioc_driver.c (modified) (1 diff)
• pic_driver.c (modified) (1 diff)
• rdk_driver.c (modified) (2 diffs)
• tty_driver.c (modified) (4 diffs)

soft/giet_vm/giet_drivers/bdv_driver.c

@@ -109 +109 @@
 {
 
-#if GIET_DEBUG_BDV_DRIVER
+#if GIET_DEBUG_IOC_DRIVER
 unsigned int procid  = _get_procid();
 unsigned int cxy     = procid / NB_PROCS_MAX;
@@ -148 +148 @@
             status = _bdv_get_register( BLOCK_DEVICE_STATUS );
 
-#if GIET_DEBUG_BDV_DRIVER
+#if GIET_DEBUG_IOC_DRIVER
 _printf("\n[BDV DEBUG] _bdv_access() : ... waiting on BDV_STATUS register ...\n");
 #endif
@@ -208 +208 @@
     }
 
-#if GIET_DEBUG_BDV_DRIVER
+#if GIET_DEBUG_IOC_DRIVER
 _printf("\n[BDV DEBUG] Processor[%d,%d,%d] exit _bdv_access() at cycle %d\n",
         x, y, lpid, _get_proctime() );

soft/giet_vm/giet_drivers/dma_driver.c

@@ -195 +195 @@
 #if NB_DMA_CHANNELS > 0
 
-    unsigned int procid    = _get_procid();
+    unsigned int procid     = _get_procid();
     unsigned int cluster_xy = procid/NB_PROCS_MAX;
     unsigned int channel_id = procid%NB_PROCS_MAX;
@@ -208 +208 @@
 
 _printf("\n[DMA DEBUG] Processor[%d,%d,%d] enters _dma_copy() at cycle %d\n"
-        " - vspace_id  = %d\n"
-        " - cluster_xy = %x\n"
-        " - channel_id = %d\n"
-        " - dest       = %x\n"
-        " - source     = %x\n"
-        " - bytes      = %x\n",
-        x, y, channel_id, _get_proctime(), vspace_id, cluster_xy,
-        (unsigned int)dest, (unsigned int)source, size );
+        " - vspace_id   = %d\n"
+        " - src_vaddr   = %x\n"
+        " - dst_vaddr   = %x\n"
+        " - bytes       = %x\n",
+        x, y, channel_id, _get_proctime(), vspace_id, 
+        (unsigned int)source, (unsigned int)dest, size );
 #endif
 
@@ -257 +255 @@
 
 #if GIET_DEBUG_DMA_DRIVER
-_printf(" - src_paddr  = %llx\n"
-        " - dst_paddr  = %llx\n",
+_printf(" - src_paddr   = %l\n"
+        " - dst_paddr   = %l\n",
         src_paddr, dst_paddr );
 #endif

soft/giet_vm/giet_drivers/ioc_driver.c

@@ -164 +164 @@
         " - channel  = %d\n"
         " - mode     = %d\n"
-        " - vaddr    = %d\n"
+        " - vaddr    = %x\n"
         " - sectors  = %d\n"
-        " - lba      = %d\n",
+        " - lba      = %x\n",
         x, y, lpid, _get_proctime(), channel, mode, buf_vaddr, count, lba );
 #endif

soft/giet_vm/giet_drivers/pic_driver.c

@@ -42 +42 @@
 
 /////////////////////////////////////////////////////////////////////////////////
-// This function initializes the XICU target physical address corresponding
-// to a given HWI channel.
+// This function initializes the XICU target physical address (vaddr + extend)
+// corresponding to a given HWI channel.
 /////////////////////////////////////////////////////////////////////////////////
 void _pic_init( unsigned int channel,      // source PIC HWI channel

soft/giet_vm/giet_drivers/rdk_driver.c

@@ -47 +47 @@
 
 #if GIET_DEBUG_IOC_DRIVER
-_tty_get_lock( 0 );
-_puts("\n[IOC DEBUG] Enter _rdk_read() at cycle ");
-_putd( _get_proctime() );
-_puts(" for processor ");
-_putd( _get_procid() );
-_puts("\n - vaddr   = ");
-_putx( buffer );
-_puts("\n - sectors = ");
-_putd( count );
-_puts("\n - lba     = ");
-_putx( lba );
-_puts("\n");
-_tty_release_lock( 0 );
+_printf("\n[IOC DEBUG] Enter _rdk_read() at cycle %d"
+        "\n - vaddr   = %x"
+        "\n - sectors = %d"
+        "\n - lba     = %x",
+        _get_proctime(), buffer, count, lba );
 #endif
 
@@ -84 +76 @@
 
 #if GIET_DEBUG_IOC_DRIVER
-_tty_get_lock( 0 );
-_puts("\n[IOC DEBUG] Enter _rdk_write() at cycle ");
-_putd( _get_proctime() );
-_puts(" for processor ");
-_putd( _get_procid() );
-_puts("\n - vaddr   = ");
-_putx( buffer );
-_puts("\n - sectors = ");
-_putd( count );
-_puts("\n - lba     = ");
-_putx( lba );
-_puts("\n");
-_tty_release_lock( 0 );
+_printf("\n[IOC DEBUG] Enter _rdk_write() at cycle %d"
+        "\n - vaddr   = %x"
+        "\n - sectors = %d"
+        "\n - lba     = %x",
+        _get_proctime(), buffer, count, lba );
 #endif
 

soft/giet_vm/giet_drivers/tty_driver.c

@@ -40 +40 @@
 
 #define in_unckdata __attribute__((section (".unckdata")))
+#define in_kdata    __attribute__((section (".kdata")))
 
 //////////////////////////////////////////////////////////////////////////////
@@ -46 +47 @@
 
 in_unckdata volatile unsigned int _tty_rx_buf[NB_TTY_CHANNELS];
+
 in_unckdata volatile unsigned int _tty_rx_full[NB_TTY_CHANNELS] 
                                      = { [0 ... NB_TTY_CHANNELS - 1] = 0 };
+
+in_kdata unsigned int _tty_lock[NB_TTY_CHANNELS] 
+                        = { [0 ... NB_TTY_CHANNELS - 1] = 0 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -150 +155 @@
 {
     if( channel >= NB_TTY_CHANNELS ) _exit();
+
     _it_disable( save_sr_ptr );
-    while ( _tty_get_register( channel, TTY_CONFIG ) ); // busy waiting
+
+//    while ( _tty_get_register( channel, TTY_CONFIG ) ); // busy waiting
+
+    _get_lock( &_tty_lock[channel] );
 }
 
@@ -165 +174 @@
     if( channel >= NB_TTY_CHANNELS ) _exit();
 
-    _tty_set_register( channel, TTY_CONFIG, 0 );
+//    _tty_set_register( channel, TTY_CONFIG, 0 );
+
+    _release_lock( &_tty_lock[channel] );
+    
     _it_restore( save_sr_ptr );
 }