Changeset 350

Timestamp:

Jun 29, 2014, 12:53:25 PM (10 years ago)

Author:

alain

Message:

Introducing two modifications regarding the locks protecting
exclusive access to BDV and TTY peripherals channels:

• use the giet_lock_t type to have only one lock per cache line.
• store these locks in the seg_kernel_data or in seg_kernel_uncdata, depending on the GIET_NO HARD_CC configuration parameter, to have cacheable locks when it is possible.

Location:

soft/giet_vm/giet_drivers

Files:

• bdv_driver.c (modified) (2 diffs)
• bdv_driver.h (modified) (1 diff)
• ioc_driver.c (modified) (2 diffs)
• tty_driver.c (modified) (1 diff)
• tty_driver.h (modified) (2 diffs)

soft/giet_vm/giet_drivers/bdv_driver.c

@@ -63 +63 @@
 #include <ctx_handler.h>
 
+#if !defined(GIET_NO_HARD_CC)
+# error: You must define GIET_NO_HARD_CC in the giet_config.h file
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 // BDV global variables
@@ -68 +72 @@
 
 #define in_unckdata __attribute__((section (".unckdata")))
-
-in_unckdata unsigned int          _bdv_lock = 0;
-in_unckdata volatile unsigned int _bdv_status = 0;
+#define in_kdata __attribute__((section (".kdata")))
+
+#if GIET_NO_HARD_CC
+in_unckdata giet_lock_t           _bdv_lock __attribute__((aligned(64)));
+in_unckdata volatile unsigned int _bdv_status;
 in_unckdata volatile unsigned int _bdv_gtid;
+#else
+in_kdata giet_lock_t           _bdv_lock __attribute__((aligned(64)));
+in_kdata volatile unsigned int _bdv_status;
+in_kdata volatile unsigned int _bdv_gtid;
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////

soft/giet_vm/giet_drivers/bdv_driver.h

@@ -10 +10 @@
 #define _GIET_BDV_DRIVER_H_
 
+#include "utils.h"
+
 ///////////////////////////////////////////////////////////////////////////////////
 // BDV global variables
 ///////////////////////////////////////////////////////////////////////////////////
 
-extern unsigned int          _bdv_lock;    // BDV is a shared ressource
+extern giet_lock_t           _bdv_lock;    // BDV is a shared ressource
 extern volatile unsigned int _bdv_status;  // required for IRQ signaling
 extern volatile unsigned int _bdv_gtid;    // descheduled task id = gpid<<16 + ltid

soft/giet_vm/giet_drivers/ioc_driver.c

@@ -183 +183 @@
     unsigned int flags;            // page protection flags
     unsigned int ix2;              // page index in IOMMU PT1 page table
-    unsigned int ppn_first;        // first physical page number for user buffer
+    unsigned int ppn_first = 0;    // first physical page number for user buffer
     unsigned int buf_xaddr = 0;    // user buffer virtual address in IO space (if IOMMU)
     paddr_t      buf_paddr = 0;    // user buffer physical address (if no IOMMU),
@@ -308 +308 @@
 
 #if       ( USE_IOC_BDV )
-
-#if GIET_DEBUG_IOC_DRIVER
-_printf("\n[IOC DEBUG] Calling BDV driver\n");
-#endif
         if (to_mem) error = _bdv_read ( mode, lba, buf_paddr, count);
         else        error = _bdv_write( mode, lba, buf_paddr, count);
-
 #elif ( USE_IOC_SPI )
-
-#if GIET_DEBUG_IOC_DRIVER
-_printf("\n[IOC DEBUG] Calling SPI driver\n");
-#endif
         if (to_mem) error = _sdc_read (mode, lba, buf_paddr, count);
         else        error = _sdc_write(mode, lba, buf_paddr, count);
-
 #elif ( USE_IOC_HBA )
-
-#if GIET_DEBUG_IOC_DRIVER
-_printf("\n[IOC DEBUG] Calling HBA driver\n");
-#endif
         if (to_mem) error = _hba_read (channel, mode, lba, buf_paddr, count);
         else        error = _hba_write(channel, mode, lba, buf_paddr, count);
-
 #elif ( USE_IOC_RDK )
-
-#if GIET_DEBUG_IOC_DRIVER
-_printf("\n[IOC DEBUG] Calling RDK driver\n");
-#endif
         if (to_mem) error = _rdk_read (lba, buf_vaddr, count);
         else        error = _rdk_write(lba, buf_vaddr, count);
-
 #endif
 

soft/giet_vm/giet_drivers/tty_driver.c

@@ -39 +39 @@
 #endif
 
+#if !defined(GIET_NO_HARD_CC)
+# error: You must define GIET_NO_HARD_CC in the giet_config.h file
+#endif
+
 #if (NB_TTY_CHANNELS < 1)
 # error: NB_TTY_CHANNELS cannot be smaller than 1!
 #endif
 
+//////////////////////////////////////////////////////////////////////////////
+//   TTY global variables
+//////////////////////////////////////////////////////////////////////////////
+
 #define in_unckdata __attribute__((section (".unckdata")))
 #define in_kdata    __attribute__((section (".kdata")))
 
-//////////////////////////////////////////////////////////////////////////////
-//   TTY global variables
-//////////////////////////////////////////////////////////////////////////////
-
+#if GIET_NO_HARD_CC
 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_unckdata unsigned int _tty_lock[NB_TTY_CHANNELS]
-    = { [0 ... NB_TTY_CHANNELS - 1] = 0 };
+in_unckdata volatile unsigned int _tty_rx_full[NB_TTY_CHANNELS]; 
+in_unckdata giet_lock_t _tty_lock[NB_TTY_CHANNELS] __attribute__((aligned(64)));
+#else
+in_kdata volatile unsigned int _tty_rx_buf[NB_TTY_CHANNELS];
+in_kdata volatile unsigned int _tty_rx_full[NB_TTY_CHANNELS]; 
+in_kdata giet_lock_t _tty_lock[NB_TTY_CHANNELS] __attribute__((aligned(64)));
+#endif
 
 //////////////////////////////////////////////////////////////////////////////

soft/giet_vm/giet_drivers/tty_driver.h

@@ -8 +8 @@
 #ifndef _GIET_TTY_DRIVERS_H_
 #define _GIET_TTY_DRIVERS_H_
+
+#include "utils.h"
 
 ///////////////////////////////////////////////////////////////////////////////////
@@ -27 +29 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
-extern volatile unsigned char _tty_get_buf[];
+extern volatile unsigned int _tty_rx_buf[];
 
-extern volatile unsigned char _tty_get_full[];
+extern volatile unsigned int _tty_rx_full[];
+
+extern giet_lock_t _tty_lock[];
 
 //////////////////////////////////////////////////////////////////////////////////