Changeset 801 for trunk

Timestamp:

Sep 12, 2014, 3:10:03 PM (10 years ago)

Author:

cfuguet

Message:

tsar_boot: Using P_WIDTH constant to get lpid from CP0 EBASE

Location:

trunk/softs/tsar_boot

Files:

• Makefile (modified) (1 diff)
• conf/platform_de2_115_fpga/hard_config.h (modified) (1 diff)
• conf/platform_tsar_generic_iob/hard_config.h (modified) (1 diff)
• include/defs.h (modified) (1 diff)
• src/reset.S (modified) (1 diff)

trunk/softs/tsar_boot/Makefile

@@ -115 +115 @@
 $(BUILD_DIR)/preloader.ld: preloader.ld.in
         $(ECHO) "[   CC    ]     $(notdir $<)"
-        $(CC) -DUSE_DT=$(USE_DT) -x c $(INCLUDE) -E $< | $(SED) -e '/#/d' -e '/^[\s\t]*$$/d' > $@
+        $(CC) -x c -P -E -DUSE_DT=$(USE_DT) $(INCLUDE) $< -o $@
 
 $(TARGET): $(BUILD_DIR) $(OBJS) $(BUILD_DIR)/preloader.ld $(BUILD_DIR)/$(DRV_LIB)

trunk/softs/tsar_boot/conf/platform_de2_115_fpga/hard_config.h

@@ -8 +8 @@
 #define X_WIDTH                4
 #define Y_WIDTH                4
+#define P_WIDTH                1
 #define X_IO                   0
 #define Y_IO                   0

trunk/softs/tsar_boot/conf/platform_tsar_generic_iob/hard_config.h

@@ -10 +10 @@
 #define X_WIDTH                4
 #define Y_WIDTH                4
+#define P_WIDTH                2
 #define X_IO                   0
 #define Y_IO                   0

trunk/softs/tsar_boot/include/defs.h

@@ -32 +32 @@
  */
 
-#ifndef NB_PROCS_MAX
-#   error "NB_PROCS_MAX constant must be defined in hard_config.h"
+#ifndef P_WIDTH
+#   error "P_WIDTH constant must be defined in the hard_config.h file"
 #endif
 

trunk/softs/tsar_boot/src/reset.S

@@ -79 +79 @@
     mtc0    k0,     CP0_STATUS
 
-    /* All processors compute pid, lpid, cluster_xy */
+    /*
+     * All processors compute gpid, lpid, cluster_xy
+     * gpid = ebase[9:0] = X_WIDTH : Y_WIDTH : P_WIDTH
+     *                        x         y       lpid
+     * X, Y and LPID fields are left-aligned
+     */
 
     mfc0    k0,     CP0_EBASE
-    andi    t0,     k0,     0x3FF    /* t0 <= pid (at most 1024 procs)      */
-
-    move    t3,     t0
-
-    la      k0,     NB_PROCS_MAX     /* k0 <= # of processors per cluster   */
-    divu    t3,     k0
-    mfhi    t1                       /* t1 <= lpid       = pid % NB_PROCS   */
-    mflo    t2                       /* t2 <= cluster_xy = pid / NB_PROCS   */
+    andi    t0,     k0,     0x3FF            /* t0 <= gpid (<= 1024 procs)  */
+    andi    t1,     t0,     ((1<<P_WIDTH)-1) /* t1 <= lpid                  */
+    srl     t2,     t0,     P_WIDTH          /* t2 <= cluster_xy            */
 
     /* All processors initialise the count register in CP0 */