Changeset 432 for trunk/hal/tsar_mips32/drivers/soclib_pic.c

Timestamp:

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

Author:

alain

Message:

bloup

File:

• trunk/hal/tsar_mips32/drivers/soclib_pic.c (modified) (8 diffs)

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