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

Timestamp:

Jul 5, 2018, 3:45:43 PM (6 years ago)

Author:

alain

Message:

Fix a bug in soclib_pic driver (bad separation between IOPIC an LAPIC initialisation)

File:

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

trunk/hal/tsar_mips32/drivers/soclib_pic.c

@@ -22 +22 @@
  */
 
-#include <hal_types.h>
+#include <hal_kernel_types.h>
 #include <chdev.h>
 #include <soclib_pic.h>
@@ -255 +255 @@
 {
     uint32_t    i;      // for loop on IOPIC inputs
-    uint32_t    x;      // for loop on clusters in a row
-    uint32_t    y;      // for loop on clusters in a column inputs
-    uint32_t    lid;    // for loop on cores in a cluster
-
-    // get target architecture parameters
-    cluster_t * cluster = LOCAL_CLUSTER;
-    uint32_t    x_size  = cluster->x_size;
-    uint32_t    y_size  = cluster->y_size;
-    uint32_t    y_width = cluster->y_width;
-    uint32_t    ncores  = cluster->cores_nr;
 
     // get IOPIC controller cluster and segment base pointer
-    cxy_t      iopic_seg_cxy = (cxy_t)GET_CXY( pic->base );
-    uint32_t * iopic_seg_ptr = (uint32_t *)GET_PTR( pic->base );
+    cxy_t      iopic_seg_cxy = GET_CXY( pic->base );
+    uint32_t * iopic_seg_ptr = GET_PTR( pic->base );
 
     // reset the IOPIC component registers : disable all input IRQs
@@ -277 +267 @@
         hal_remote_sw( iopic_seg_xp , 0 ); 
     }
-    
-    // GET XCU controller segment base 
-    uint32_t * base = soclib_pic_xcu_base();
-
-    // reset the XCU component registers in all clusters:
-    // mask all HWIs, all WTIs, and all PTIs, for all cores   
-    for( x = 0 ; x < x_size ; x++ )
-    {
-        for( y = 0 ; y < y_size ; y++ )
-        {
-            for( lid = 0 ; lid < ncores ; lid++ )
-            {
-                cxy_t cxy = (x<<y_width) + y;
-                xptr_t hwi_mask_xp = XPTR( cxy , base + (XCU_MSK_HWI_DISABLE << 5 | lid) );
-                xptr_t wti_mask_xp = XPTR( cxy , base + (XCU_MSK_WTI_DISABLE << 5 | lid) );
-                xptr_t pti_mask_xp = XPTR( cxy , base + (XCU_MSK_PTI_DISABLE << 5 | lid) );
-                hal_remote_sw( hwi_mask_xp , 0xFFFFFFFF );
-                hal_remote_sw( wti_mask_xp , 0xFFFFFFFF );
-                hal_remote_sw( pti_mask_xp , 0xFFFFFFFF );
-            }
-        }
-    }
+
 }  // end soclib_pic_init()
 
@@ -357 +326 @@
     // register PIC extension in cluster manager
     cluster->pic_extend = cluster_ext_ptr;
+
+    // reset the XCU component registers 
+    // mask all HWIs, all WTIs, and all PTIs, for all cores in local cluster   
+    for( lid = 0 ; lid < cluster->cores_nr ; lid++ )
+    {
+        xcu_base[XCU_MSK_HWI_DISABLE << 5 | lid] = 0xFFFFFFFF;
+        xcu_base[XCU_MSK_WTI_DISABLE << 5 | lid] = 0xFFFFFFFF;
+        xcu_base[XCU_MSK_PTI_DISABLE << 5 | lid] = 0xFFFFFFFF;
+    }
 
 }  // end soclib_pic_extend_init()