Changeset 14 for trunk/kernel/drivers/soclib

Timestamp:

May 3, 2017, 1:23:24 PM (8 years ago)

Author:

alain

Message:

Bugs fix.

Location:

trunk/kernel/drivers/soclib

Files:

• soclib_iob.c (modified) (1 diff)
• soclib_xcu.c (modified) (3 diffs)
• soclib_xcu.h (modified) (1 diff)

trunk/kernel/drivers/soclib/soclib_iob.c

@@ -22 +22 @@
  */
 
-#include <almos_config.h>
+#include <kernel_config.h>
 #include <hal_types.h>
 #include <hal_remote.h>

trunk/kernel/drivers/soclib/soclib_xcu.c

@@ -36 +36 @@
         uint32_t * base = (uint32_t *)GET_PTR( icu->base );
 
-    // write into registers
+    // disable all IRQs
     base[XCU_MSK_HWI_DISABLE << 5 | lid] = 0xFFFFFFFF;
     base[XCU_MSK_WTI_DISABLE << 5 | lid] = 0xFFFFFFFF;
@@ -70 +70 @@
         else if( type == HWI_TYPE ) base[XCU_MSK_HWI_ENABLE << 5 | lid] = mask;
         else                        base[XCU_MSK_PTI_ENABLE << 5 | lid] = mask;
+}
+
+///////////////////////////////////////////
+void soclib_xcu_get_masks( chdev_t   * icu,
+                           lid_t       lid,
+                           uint32_t  * hwi_mask,
+                           uint32_t  * wti_mask,
+                           uint32_t  * pti_mask )
+{
+    // get XCU segment base address
+        uint32_t * base = (uint32_t *)GET_PTR( icu->base );
+ 
+    // get values from registers
+    *hwi_mask = base[XCU_MSK_HWI << 5 | lid]; 
+    *wti_mask = base[XCU_MSK_WTI << 5 | lid]; 
+    *pti_mask = base[XCU_MSK_PTI << 5 | lid]; 
 }
 
@@ -108 +124 @@
         uint32_t prio = base[XCU_PRIO << 5 | lid];
 
-    if( prio & 0x4 ) *wti_status = ((prio >> 24) & 0x1F) + 1;
-    if( prio & 0x2 ) *hwi_status = ((prio >> 16) & 0x1F) + 1;
-    if( prio & 0x1 ) *pti_status = ((prio >>  8) & 0x1F) + 1;
+    *wti_status = (prio & 0x4) ? (((prio >> 24) & 0x1F) + 1) : 0;
+    *hwi_status = (prio & 0x2) ? (((prio >> 16) & 0x1F) + 1) : 0;
+    *pti_status = (prio & 0x1) ? (((prio >>  8) & 0x1F) + 1) : 0;
 }
 

trunk/kernel/drivers/soclib/soclib_xcu.h

@@ -94 +94 @@
 
 /******************************************************************************************
+ * This function returns the values contained in the HWI/WTI/PTI mask registers for
+ * a given core. It must be called by a local thread.
+ ******************************************************************************************
+ * @ icu      : pointer on local XCU chdev descriptor
+ * @ lid      : local core index == output IRQ index
+ * @ hwi_mask : [out] HWI mask for selected core 
+ * @ wti_mask : [out] WTI mask for selected core
+ * @ pti_mask : [out] PTI mask for selected core
+ *****************************************************************************************/
+void soclib_xcu_get_masks( chdev_t   * icu,
+                           lid_t       lid,
+                           uint32_t  * hwi_mask,
+                           uint32_t  * wti_mask,
+                           uint32_t  * pti_mask );
+
+/******************************************************************************************
  * This function set the period value for a local XCU timer.
  ******************************************************************************************