Changeset 535

Timestamp:

Sep 21, 2018, 10:20:57 PM (6 years ago)

Author:

nicolas.van.phan@…

Message:

Replace TXT0 by MTTY0 for LETI

Location:

trunk

Files:

• boot/tsar_mips32/boot.c (modified) (1 diff)
• kernel/kern/kernel_init.c (modified) (2 diffs)
• tools/arch_info/boot_info.h (modified) (1 diff)

trunk/boot/tsar_mips32/boot.c

@@ -403 +403 @@
     boot_info->x_max        = header->x_size; // [FIXME]
     boot_info->y_max        = header->name[5] == 'l' ? header->y_size - 1 : header->y_size; // [FIXME]
+    boot_info->use_mty0     = header->name[5] == 'l' ? true : false;
     boot_info->paddr_width  = header->paddr_width;
     boot_info->io_cxy       = header->io_cxy;

trunk/kernel/kern/kernel_init.c

@@ -262 +262 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////
+// This function is the same as txt0_device_init() but uses the internal multi_tty device
+// attached to cluster (0,0) instead of the external tty_tsar.
+// This function is used instead of txt0_device_init() only for TSAR LETI.
+///////////////////////////////////////////////////////////////////////////////////////////
+// @ info    : pointer on the local boot-info structure.
+///////////////////////////////////////////////////////////////////////////////////////////
+static void mtty0_device_init( boot_info_t * info)
+{
+    boot_device_t * dev_tbl;         // pointer on array of devices in boot_info
+    uint32_t        dev_nr;          // actual number of devices in this cluster
+    xptr_t          base;            // remote pointer on segment base
+    uint32_t        func;            // device functional index
+    uint32_t        impl;            // device implementation index
+    uint32_t        i;               // device index in dev_tbl
+    uint32_t        x;               // X cluster coordinate
+    uint32_t        y;               // Y cluster coordinate
+
+    dev_nr = info->int_dev_nr;
+    dev_tbl = info->int_dev;
+
+    // Loop on internal peripherals of cluster (0,0) to find MTY0
+    for ( i = 0; i < dev_nr; i++ )
+    {
+        base = dev_tbl[i].base;
+        func = FUNC_FROM_TYPE( dev_tbl[i].type );
+        impl = IMPL_FROM_TYPE( dev_tbl[i].type );
+
+        if ( func == DEV_FUNC_TXT )
+        {
+            txt0_chdev.func     = func;
+            txt0_chdev.impl     = impl;
+            txt0_chdev.channel  = 0;
+            txt0_chdev.base     = base;
+            txt0_chdev.is_rx    = false;
+
+            // Initialize MTY0 chdev lock
+            remote_spinlock_init( XPTR( local_cxy, &txt0_chdev.wait_lock ) );
+
+            // MTY specific initialization
+            dev_txt_init( &txt0_chdev );
+
+            // register the MTY in all chdev_dir[x][y] structures
+            for( x = 0 ; x < info->x_size ; x++ )
+            {
+                for( y = 0 ; y < info->y_max; y++ ) // [FIXME]
+                {
+                    cxy_t  cxy = (x<<info->y_width) + y;
+                    hal_remote_swd( XPTR( cxy , &chdev_dir.txt_tx[0] ) ,
+                                    XPTR( local_cxy , &txt0_chdev ) );
+                }
+            }
+        }
+    } // end loop on internal devices
+} // end mty0_device_init()
+
+///////////////////////////////////////////////////////////////////////////////////////////
 // This function allocates memory and initializes the chdev descriptors for the internal
 // peripherals contained in the local cluster, other than the LAPIC, as specified by 
@@ -793 +849 @@
     thread->remote_locks = 0;
 
-    // CP0 in I/O cluster initialises TXT0 chdev descriptor
-    //if( (core_lid == 0) && (core_cxy == io_cxy) ) txt0_device_init( info );
     // CP0 in cluster 0 initializes TXT0 chdev descriptor
-    if( core_cxy == 0 && core_lid == 0 ) txt0_device_init( info );
+    if( core_cxy == 0 && core_lid == 0 ) // [MODIF]
+    {
+        if( info->use_mty0 == 1 ) {
+            mtty0_device_init( info );
+        } else {
+            txt0_device_init( info );
+        }
+    }
     // [FIXME]
 

trunk/tools/arch_info/boot_info.h

@@ -114 +114 @@
     uint32_t      x_max;                         /*! [FIXME] Nb of non-empty cluster in row */
     uint32_t      y_max;                         /*! [FIXME] Nb of non_empty cluster in col */
+    uint32_t      use_mty0;                      /*! [FIXME] Use multi_tty on cluster 0     */
         uint32_t      io_cxy;                        /*! IO cluster identifier                  */