Changeset 205 for trunk/hal

Timestamp:

Jul 17, 2017, 11:41:25 AM (7 years ago)

Author:

alain

Message:

Change dev_pic_enable_irq() and dev_pic_disable_irq() prototypes
to handle remote IRQs.

Location:

trunk/hal/tsar_mips32/drivers

Files:

• soclib_pic.c (modified) (3 diffs)
• soclib_pic.h (modified) (2 diffs)

trunk/hal/tsar_mips32/drivers/soclib_pic.c

@@ -68 +68 @@
 inline uint32_t * soclib_pic_xcu_base()
 {
-    return ((soclib_pic_cluster_t *)LOCAL_CLUSTER->pic_extend)->xcu_base;
-
-}  // end soclib_pic_xcu_base()
+    return ((soclib_pic_cluster_t *)(LOCAL_CLUSTER->pic_extend))->xcu_base;
+}
+
+/////////////////////////////////////////////////////////
+inline uint32_t * soclib_pic_remote_xcu_base( cxy_t cxy )
+{
+    soclib_pic_cluster_t * extend;
+
+    // get extended pointer on PIC extension in remote cluster 
+    extend = hal_remote_lpt( XPTR( cxy , &cluster_manager.pic_extend ) );
+
+        return (uint32_t *)hal_remote_lpt( XPTR( cxy , &extend->xcu_base ) );
+                 
+}
 
 
@@ -397 +408 @@
 }  // end soclib_pic_bind_irq();
 
-//////////////////////////////////////////
-void soclib_pic_enable_irq( lid_t     lid,
-                            chdev_t * src_chdev )
-{
-    // get local pointer on XCU segment base
-    uint32_t * seg_xcu_ptr = soclib_pic_xcu_base();
+///////////////////////////////////////
+void soclib_pic_enable_irq( lid_t  lid,
+                            xptr_t src_chdev_xp )
+{
+    // get cluster and local pointer on remote src_chdev
+    cxy_t     src_chdev_cxy = GET_CXY( src_chdev_xp );
+    chdev_t * src_chdev_ptr = (chdev_t *)GET_PTR( src_chdev_xp );
+
+    // get local pointer on remote XCU segment base
+    uint32_t * seg_xcu_ptr = soclib_pic_remote_xcu_base( src_chdev_cxy );
 
     // get the source chdev IRQ type and index
-    uint32_t irq_type = src_chdev->irq_type;
-    uint32_t irq_id   = src_chdev->irq_id;
+    uint32_t irq_type = hal_remote_lw( XPTR( src_chdev_cxy , &src_chdev_ptr->irq_type ) );
+    uint32_t irq_id   = hal_remote_lw( XPTR( src_chdev_cxy , &src_chdev_ptr->irq_id ) );
 
     if( irq_type == SOCLIB_TYPE_HWI )
     {
-         // enable this HWI in local XCU controller 
-        seg_xcu_ptr[(XCU_MSK_HWI_ENABLE << 5) | lid] = (1 << irq_id);
+        // enable this HWI in remote XCU controller 
+        hal_remote_sw( XPTR( src_chdev_cxy , 
+                       &seg_xcu_ptr[(XCU_MSK_HWI_ENABLE << 5) | lid] ) , (1 << irq_id) );
     }
     else if( irq_type == SOCLIB_TYPE_WTI )
     {
-         // enable this WTI in local XCU controller 
-        seg_xcu_ptr[(XCU_MSK_WTI_ENABLE << 5) | lid] = 1 << irq_id;
+        // enable this WTI in local XCU controller 
+        hal_remote_sw( XPTR( src_chdev_cxy , 
+                       &seg_xcu_ptr[(XCU_MSK_WTI_ENABLE << 5) | lid] ) , (1 << irq_id) );
     }
     else
@@ -424 +441 @@
 } // end soclib_pic_enable_irq()
 
-///////////////////////////////////////////
-void soclib_pic_disable_irq( lid_t     lid,
-                             chdev_t * src_chdev )
-{
-    // get local pointer on XCU segment base
-    uint32_t * seg_xcu_ptr = soclib_pic_xcu_base();
+////////////////////////////////////////
+void soclib_pic_disable_irq( lid_t  lid,
+                             xptr_t src_chdev_xp )
+{
+    // get cluster and local pointer on remote src_chdev
+    cxy_t     src_chdev_cxy = GET_CXY( src_chdev_xp );
+    chdev_t * src_chdev_ptr = (chdev_t *)GET_PTR( src_chdev_xp );
+
+    // get local pointer on remote XCU segment base
+    uint32_t * seg_xcu_ptr = soclib_pic_remote_xcu_base( src_chdev_cxy );
 
     // get the source chdev IRQ type and index
-    uint32_t irq_type = src_chdev->irq_type;
-    uint32_t irq_id   = src_chdev->irq_id;
+    uint32_t irq_type = hal_remote_lw( XPTR( src_chdev_cxy , &src_chdev_ptr->irq_type ) );
+    uint32_t irq_id   = hal_remote_lw( XPTR( src_chdev_cxy , &src_chdev_ptr->irq_id ) );
 
     if( irq_type == SOCLIB_TYPE_HWI )
     {
-         // disable this HWI in local XCU controller 
-        seg_xcu_ptr[(XCU_MSK_HWI_DISABLE << 5) | lid] = 1 << irq_id;
+        // enable this HWI in remote XCU controller 
+        hal_remote_sw( XPTR( src_chdev_cxy , 
+                       &seg_xcu_ptr[(XCU_MSK_HWI_DISABLE << 5) | lid] ) , (1 << irq_id) );
     }
     else if( irq_type == SOCLIB_TYPE_WTI )
     {
-         // disable this WTI in local XCU controller 
-        seg_xcu_ptr[(XCU_MSK_WTI_DISABLE << 5) | lid] = 1 << irq_id;
+        // enable this WTI in local XCU controller 
+        hal_remote_sw( XPTR( src_chdev_cxy , 
+                       &seg_xcu_ptr[(XCU_MSK_WTI_DISABLE << 5) | lid] ) , (1 << irq_id) );
     }
     else

trunk/hal/tsar_mips32/drivers/soclib_pic.h

@@ -206 +206 @@
 
 /******************************************************************************************
- * This function enable a HWI/WTI IRQ identified by the <src_chdev> argument,
+ * This function enables a remote HWI/WTI IRQ, identified by the <src_chdev_xp> argument,
  * that contains information on the IRQ type (HWI/WTI), and IRQ index. 
- * It access the relevant XCU mask register, but does not access IOPIC.
- ******************************************************************************************
- * @ lid        : target core local index.
- * @ src_chdev  : local pointer on source chdev descriptor.
- *****************************************************************************************/
-void soclib_pic_enable_irq( lid_t     lid,
-                            chdev_t * src_chdev );
-
-/******************************************************************************************
- * This function disable a HWI/WTI IRQ identified by the <src_chdev> argument, 
+ * It access the remote XCU mask register, but does not access IOPIC.
+ ******************************************************************************************
+ * @ lid           : target core local index (in cluster containing the source chdev).
+ * @ src_chdev_xp  : extended pointer on source chdev descriptor.
+ *****************************************************************************************/
+void soclib_pic_enable_irq( lid_t   lid,
+                            xptr_t  src_chdev_xp );
+
+/******************************************************************************************
+ * This function disables a remote HWI/WTI IRQ, identified by the <src_chdev_xp> argument, 
  * that contains information on the IRQ type (HWI/WTI), and IRQ index.
- * It access the relevant XCU mask register, but does not access IOPIC.
- ******************************************************************************************
- * @ lid        : target core local index.
- * @ src_chdev  : local pointer on source chdev descriptor.
- *****************************************************************************************/
-void soclib_pic_disable_irq( lid_t     lid,
-                             chdev_t * src_chdev );
+ * It access the remote XCU mask register, but does not access IOPIC.
+ ******************************************************************************************
+ * @ lid           : target core local index (in cluster containing the source chdev).
+ * @ src_chdev_xp  : extended pointer on source chdev descriptor.
+ *****************************************************************************************/
+void soclib_pic_disable_irq( lid_t   lid,
+                             xptr_t  src_chdev_xp );
 
 /******************************************************************************************
@@ -266 +266 @@
 
 /******************************************************************************************
- * This function returns a local pointer on the local XCU base segment.
+ * This function returns the local pointer on the local XCU base segment.
  *****************************************************************************************/
 uint32_t * soclib_pic_xcu_base();
+
+/******************************************************************************************
+ * This function returns the local pointer on a remote XCU base segment.
+ * It is used by the soclip_pic_enable_irq() and soclib_pic_disable_irq() functions.
+ ******************************************************************************************
+ * @ cxy  : target cluster identifier.
+ *****************************************************************************************/
+uint32_t * soclib_pic_remote_xcu_base( cxy_t cxy );
 
 /******************************************************************************************