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

Timestamp:

Jul 27, 2017, 12:23:29 AM (7 years ago)

Author:

alain

Message:

1) Introduce independant command fields for the various devices in the thread descriptor.
2) Introduce a new dev_pic_enable_ipi() function in the generic PIC device
3) Fix two bugs identified by Maxime in the scheduler initialisation, and in the sched_select().
4) fix several bugs in the TSAR hal_kentry.S.
5) Introduce a third kgiet segment (besides kdata and kcode) in the TSAR bootloader.

File:

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

trunk/hal/tsar_mips32/drivers/soclib_pic.c

@@ -83 +83 @@
 }
 
-
-//////////////////////////////////////////
-uint32_t soclib_pic_ack_timer( lid_t lid )
-{
-    // get local XCU segment base 
-        uint32_t * base = soclib_pic_xcu_base();
-
-    // read from register
-        return base[(XCU_PTI_ACK << 5) | lid];
-
-}  // end soclib_pic_ack_timer()
-
 ///////////////////////////////////////////
 void soclib_pic_xcu_status( lid_t      lid,
@@ -113 +101 @@
 }
 
+////////////////////////////////////////////////////
+inline uint32_t soclib_pic_xcu_ack( uint32_t * reg )
+{
+    return *reg;
+}
+
 /////////////////////////////
 void soclib_pic_irq_handler()
@@ -120 +114 @@
     uint32_t   pti_status;   // PTI index + 1  / no pending PTI if 0
     chdev_t  * src_chdev;    // pointer on source chdev descriptor
-    uint32_t   index;        // IRQ index
+    uint32_t   index;        // WTI / HWI / PTI index
+    uint32_t   ack;          // XCU acknowledge requires a read...
 
     core_t * core = CURRENT_THREAD->core;
@@ -130 +125 @@
                            &pti_status );
 
+    irq_dmsg("\n[INFO] %s : enter / WTI_STS = %x / HWI_STS = %x / WTI_STS = %x\n",
+             __FUNCTION__ , wti_status , hwi_status , pti_status );
+
     // analyse status and handle up to 3 pending IRQ (one WTI, one HWI, one PTI)
 
@@ -140 +138 @@
             assert( (index == core->lid) , __FUNCTION__ , "illegal IPI index" );
 
-            // TODO acknowledge WTI [AG]
-
-            // TODO force scheduling [AG]
+            // acknowledge WTI
+            uint32_t * base = soclib_pic_xcu_base();
+            ack = base[(XCU_WTI_REG << 5) | core->lid];
+
+            // force scheduling
+            sched_yield();
         }
         else                                    // it is an external device
@@ -156 +157 @@
                     core->spurious_irqs ++;
 
-                // TODO disable this WTI in local XCU [AG]
+                // disable WTI in local XCU controller 
+                uint32_t * base = soclib_pic_xcu_base();
+                base[(XCU_MSK_WTI_DISABLE << 5) | core->lid] = 1 << core->lid;
             }
             else                                 // call relevant ISR
@@ -183 +186 @@
                 core->spurious_irqs ++;
 
-            // TODO disable this HWI in local XCU [AG]
+            // disable HWI in local XCU controller
+            uint32_t * base = soclib_pic_xcu_base();
+            base[(XCU_MSK_HWI_DISABLE << 5) | core->lid] = 1 << core->lid;
                 }
         else                    // call relevant ISR
@@ -205 +210 @@
 
         // acknowledge PTI
-        soclib_pic_ack_timer( index );
-
-        // TODO execute all actions related to TICK event
+        uint32_t * base = soclib_pic_xcu_base();
+        ack = base[(XCU_PTI_ACK << 5) | core->lid];
+
+        // execute all actions related to TICK event
         core_clock( core );
         }
@@ -431 +437 @@
     else if( irq_type == SOCLIB_TYPE_WTI )
     {
-        // enable this WTI in local XCU controller 
+        // enable this WTI in remote XCU controller 
         hal_remote_sw( XPTR( src_chdev_cxy , 
                        &seg_xcu_ptr[(XCU_MSK_WTI_ENABLE << 5) | lid] ) , (1 << irq_id) );
@@ -464 +470 @@
     else if( irq_type == SOCLIB_TYPE_WTI )
     {
-        // enable this WTI in local XCU controller 
+        // enable this WTI in remote XCU controller 
         hal_remote_sw( XPTR( src_chdev_cxy , 
                        &seg_xcu_ptr[(XCU_MSK_WTI_DISABLE << 5) | lid] ) , (1 << irq_id) );
@@ -486 +492 @@
     base[(XCU_PTI_PER << 5) | lid] = period;
 
-    // enable the PTI in local XCU controller 
+    // enable PTI in local XCU controller 
     base[(XCU_MSK_PTI_ENABLE << 5) | lid] = 1 << lid;
+}
+
+////////////////////////////
+void soclib_pic_enable_ipi()
+{
+    // calling core local index
+    lid_t  lid = CURRENT_CORE->lid;
+
+    // get XCU segment base
+    uint32_t * base = soclib_pic_xcu_base();
+
+    // enable WTI in local XCU controller 
+    base[(XCU_MSK_WTI_ENABLE << 5) | lid] = 1 << lid;
 }