Changeset 432 for trunk/hal/tsar_mips32/drivers

Timestamp:

Feb 14, 2018, 3:39:35 PM (7 years ago)

Author:

alain

Message:

bloup

Location:

trunk/hal/tsar_mips32/drivers

Files:

• soclib_nic.c (modified) (1 diff)
• soclib_pic.c (modified) (8 diffs)
• soclib_pic.h (modified) (1 diff)
• soclib_tty.c (modified) (7 diffs)

trunk/hal/tsar_mips32/drivers/soclib_nic.c

@@ -49 +49 @@
 
     // initialize Soclib NIC global registers 
-    hal_remote_sw( XPTR( nic_cxy , &nic_ptr + NIC_G_BC_ENABLE ) , 0 );
-    hal_remote_sw( XPTR( nic_cxy , &nic_ptr + NIC_G_RUN       ) , 0 );
+    hal_remote_sw( XPTR( nic_cxy , nic_ptr + NIC_GLOBAL_SPAN + NIC_G_BC_ENABLE ) , 0 );
+    hal_remote_sw( XPTR( nic_cxy , nic_ptr + NIC_GLOBAL_SPAN + NIC_G_RUN       ) , 0 );
 
     // allocate memory for chbuf descriptor (one page)

trunk/hal/tsar_mips32/drivers/soclib_pic.c

@@ -96 +96 @@
 
     // read PRIO register
-        uint32_t prio = base[(XCU_PRIO << 5) | lid];
+    // in TSAR : XCU output [4*lid] is connected to core [lid]
+        uint32_t prio = base[ (XCU_PRIO << 5) | (lid<<2) ];
 
     *wti_status = (prio & 0x4) ? (((prio >> 24) & 0x1F) + 1) : 0;
@@ -129 +130 @@
                            &pti_status );
 
-    irq_dmsg("\n[DBG] %s : core[%x,%d] enter / WTI = %x / HWI = %x / WTI = %x\n",
+    irq_dmsg("\n[DBG] %s : core[%x,%d] enter / WTI = %x / HWI = %x / PTI = %x\n",
              __FUNCTION__ , local_cxy , core->lid , wti_status , hwi_status , pti_status );
 
@@ -447 +448 @@
     {
         // enable this HWI in remote XCU controller 
+        // in TSAR : XCU output [4*lid] is connected to core [lid]
         hal_remote_sw( XPTR( src_chdev_cxy , 
-                       &seg_xcu_ptr[(XCU_MSK_HWI_ENABLE << 5) | lid] ) , (1 << irq_id) );
+                       &seg_xcu_ptr[ (XCU_MSK_HWI_ENABLE << 5) | (lid<<4) ] ) , (1 << irq_id) );
     }
     else if( irq_type == SOCLIB_TYPE_WTI )
     {
         // enable this WTI in remote XCU controller 
+        // in TSAR : XCU output [4*lid] is connected to core [lid]
         hal_remote_sw( XPTR( src_chdev_cxy , 
-                       &seg_xcu_ptr[(XCU_MSK_WTI_ENABLE << 5) | lid] ) , (1 << irq_id) );
+                       &seg_xcu_ptr[ (XCU_MSK_WTI_ENABLE << 5) | (lid<<4) ] ) , (1 << irq_id) );
     }
     else
@@ -479 +482 @@
     if( irq_type == SOCLIB_TYPE_HWI )
     {
-        // enable this HWI in remote XCU controller 
+        // enable this HWI in remote XCU controller
+        // in TSAR : XCU output [4*lid] is connected to core [lid]
         hal_remote_sw( XPTR( src_chdev_cxy , 
-                       &seg_xcu_ptr[(XCU_MSK_HWI_DISABLE << 5) | lid] ) , (1 << irq_id) );
+                       &seg_xcu_ptr[(XCU_MSK_HWI_DISABLE << 5) | (lid<<2) ] ) , (1 << irq_id) );
     }
     else if( irq_type == SOCLIB_TYPE_WTI )
     {
         // enable this WTI in remote XCU controller 
+        // in TSAR : XCU output [4*lid] is connected to core [lid]
         hal_remote_sw( XPTR( src_chdev_cxy , 
-                       &seg_xcu_ptr[(XCU_MSK_WTI_DISABLE << 5) | lid] ) , (1 << irq_id) );
+                       &seg_xcu_ptr[(XCU_MSK_WTI_DISABLE << 5) | (lid<<4) ] ) , (1 << irq_id) );
     }
     else
@@ -509 +514 @@
 
     // enable PTI in local XCU controller 
-    base[(XCU_MSK_PTI_ENABLE << 5) | lid] = 1 << lid;
+    // In TSAR : XCU output [4*lid] is connected to core [lid]
+    base[ (XCU_MSK_PTI_ENABLE << 5) | (lid<<2) ] = 1 << lid;
 }
 
@@ -522 +528 @@
 
     // enable WTI in local XCU controller 
-    base[(XCU_MSK_WTI_ENABLE << 5) | lid] = 1 << lid;
+    // In TSAR : XCU output [4*lid] is connected to core [lid]
+    base[ (XCU_MSK_WTI_ENABLE << 5) | (lid<<2) ] = 1 << lid;
 }
 
@@ -533 +540 @@
 
     // write to WTI mailbox[cxy][lid]
-    hal_remote_sw( XPTR( cxy , &base[(XCU_WTI_REG << 5) | lid] ) , 0 );
+    hal_remote_sw( XPTR( cxy , &base[(XCU_WTI_REG << 5) | lid ] ) , 0 );
 }
 
@@ -546 +553 @@
 
     // acknowlege IPI
-    uint32_t   ack  = base[(XCU_WTI_REG << 5) | lid];
+    uint32_t   ack  = base[ (XCU_WTI_REG << 5) | lid ];
 
     // we must make a fake use for ack value to avoid a warning

trunk/hal/tsar_mips32/drivers/soclib_pic.h

@@ -137 +137 @@
 typedef struct soclib_pic_core_s
 {
-    struct chdev_s * hwi_vector[SOCLIB_MAX_HWI];
-    struct chdev_s * wti_vector[SOCLIB_MAX_WTI];
+    struct chdev_s * hwi_vector[SOCLIB_MAX_HWI];    /* HWI interrupt vector             */
+    struct chdev_s * wti_vector[SOCLIB_MAX_WTI];    /* WTI interrupt vector             */
 }
 soclib_pic_core_t;

trunk/hal/tsar_mips32/drivers/soclib_tty.c

@@ -72 +72 @@
 #endif
 
-txt_dmsg("\n[DBG] %s : core[%x,%d] / DEV thread enter / cycle %d\n", 
-__FUNCTION__ , local_cxy , CURRENT_THREAD->core->lid , hal_time_stamp() );
+#if CONFIG_DEBUG_HAL_TXT
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if (CONFIG_DEBUG_HAL_TXT < cycle )
+printk("\n[DBG] %s : thread %x enter / cycle %d\n",
+__FUNCTION__ , CURRENT_THREAD , cycle );
+#endif
 
     // get client thread cluster and local pointer
@@ -108 +112 @@
     hal_remote_sw( reg_xp , 1 );
 
-txt_dmsg("\n[DBG] %s : core[%x,%d] DEV thread deschedule / cycle %d\n",
-__FUNCTION__ , local_cxy , CURRENT_THREAD->core->lid , hal_time_stamp() );
+#if CONFIG_DEBUG_HAL_TXT
+cycle = (uint32_t)hal_get_cycles();
+if (CONFIG_DEBUG_HAL_TXT < cycle )
+printk("\n[DBG] %s : thread %x deschedule / cycle %d\n", 
+__FUNCTION__ , CURRENT_THREAD , cycle );
+#endif
 
     // Block and deschedule server thread
@@ -115 +123 @@
     sched_yield("blocked on ISR");
 
-txt_dmsg("\n[DBG] %s : core[%x,%d] / DEV thread resume / cycle %d\n",
-__FUNCTION__ , local_cxy , CURRENT_THREAD->core->lid , hal_time_stamp() );
+#if CONFIG_DEBUG_HAL_TXT
+cycle = (uint32_t)hal_get_cycles();
+if (CONFIG_DEBUG_HAL_TXT < cycle )
+printk("\n[DBG] %s : thread %x resume / cycle %d\n", 
+__FUNCTION__ , CURRENT_THREAD , cycle );
+#endif
 
 #if CONFIG_READ_DEBUG
@@ -184 +196 @@
 #endif
 
+#if CONFIG_DEBUG_HAL_TXT
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if (CONFIG_DEBUG_HAL_TXT < cycle)
+printk("\n[DBG] %s : enter / cycle %d\n", __FUNCTION__ , cycle );
+#endif
+
     // get extended pointer on client thread
     xptr_t root      = XPTR( local_cxy , &chdev->wait_root );
@@ -197 +215 @@
     buf_xp  = hal_remote_lwd( XPTR( client_cxy , &client_ptr->txt_cmd.buf_xp ) );
 
-txt_dmsg("\n[DBG] %s : core[%x,%d] enter / cycle %d\n", 
-__FUNCTION__ , local_cxy, CURRENT_THREAD->core->lid , hal_time_stamp() );
-
     // get SOCLIB_TTY peripheral cluster and local pointer
     cxy_t      tty_cxy = GET_CXY( chdev->base );
@@ -234 +249 @@
         hal_remote_sw( reg_xp , 0 );
     }
-    else if( type == TXT_WRITE )         // write all characters in string
+    else   // type == TXT_WRITE           // write all characters in string
     {
         // loop on characters
@@ -276 +291 @@
     hal_fence();
 
-txt_dmsg("\n[DBG] %s : core[%x,%d] exit / cycle %d\n", 
-__FUNCTION__ , local_cxy , CURRENT_THREAD->core->lid , hal_time_stamp() );
+#if CONFIG_DEBUG_HAL_TXT
+cycle = (uint32_t)hal_get_cycles();
+if (CONFIG_DEBUG_HAL_TXT < cycle)
+{
+    if( type == TXT_READ) 
+        printk("\n[DBG] %s : exit after RX / cycle %d\n", __FUNCTION__ , cycle );
+    else
+        printk("\n[DBG] %s : exit after TX / cycle %d\n", __FUNCTION__ , cycle );
+}      
+#endif
 
 #if (CONFIG_READ_DEBUG & 0x1) || (CONFIG_WRITE_DEBUG & 0x1)