Changes in boot/arch/sparc64/loader/ofwarch.c [e731b0d:fa024ce] in mainline

File:

• boot/arch/sparc64/loader/ofwarch.c (modified) (7 diffs)

boot/arch/sparc64/loader/ofwarch.c

@@ -30 +30 @@
 /**
  * @file
- * @brief Architecture dependent parts of OpenFirmware interface.
+ * @brief       Architecture dependent parts of OpenFirmware interface.
  */
 
@@ -40 +40 @@
 #include "main.h"
 #include "asm.h"
+
+/* these tho variables will be set by the detect_subarchitecture function */
+extern uint8_t subarchitecture;
+extern uint16_t mid_mask;
 
 void write(const char *str, const int len)
@@ -61 +65 @@
  * except for the current CPU.
  *
- * @param child         The first child of the OFW tree node whose children
- *                      represent CPUs to be woken up.
- * @param current_mid   MID of the current CPU, the current CPU will
- *                      (of course) not be woken up.
- * @param physmem_start Starting address of the physical memory.
- *
- * @return Number of CPUs which have the same parent node as
- *         "child".
- *
+ * @param child         The first child of the OFW tree node whose children
+ *                      represent CPUs to be woken up.
+ * @param current_mid   MID of the current CPU, the current CPU will
+ *                      (of course) not be woken up.
+ * @return              Number of CPUs which have the same parent node as
+ *                      "child".
  */
-static int wake_cpus_in_node(phandle child, uint64_t current_mid,
-    uintptr_t physmem_start)
+static int wake_cpus_in_node(phandle child, uint64_t current_mid)
 {
         int cpus;
+        char type_name[BUF_SIZE];
         
-        for (cpus = 0; (child != 0) && (child != -1);
+        for (cpus = 0; child != 0 && child != -1;
             child = ofw_get_peer_node(child), cpus++) {
-                char type_name[BUF_SIZE];
-                
                 if (ofw_get_property(child, "device_type", type_name,
                     sizeof(type_name)) > 0) {
@@ -89 +88 @@
                                  * "cpuid" for US-IV
                                  */
-                                if ((ofw_get_property(child, "upa-portid", &mid, sizeof(mid)) <= 0)
-                                    && (ofw_get_property(child, "portid", &mid, sizeof(mid)) <= 0)
-                                    && (ofw_get_property(child, "cpuid", &mid, sizeof(mid)) <= 0))
+                                if (ofw_get_property(
+                                    child, "upa-portid",
+                                    &mid, sizeof(mid)) <= 0
+                                    && ofw_get_property(child, "portid",
+                                    &mid, sizeof(mid)) <= 0
+                                    && ofw_get_property(child, "cpuid",
+                                    &mid, sizeof(mid)) <= 0)
                                         continue;
-                                
+                                        
                                 if (current_mid != mid) {
                                         /*
@@ -100 +103 @@
                                         (void) ofw_call("SUNW,start-cpu", 3, 1,
                                             NULL, child, KERNEL_VIRTUAL_ADDRESS,
-                                            physmem_start | AP_PROCESSOR);
+                                            bootinfo.physmem_start |
+                                            AP_PROCESSOR);
                                 }
                         }
                 }
         }
-        
+
         return cpus;
 }
@@ -112 +116 @@
  * Finds out the current CPU's MID and wakes up all AP processors.
  */
-int ofw_cpu(uint16_t mid_mask, uintptr_t physmem_start)
+int ofw_cpu(void)
 {
-        /* Get the current CPU MID */
+        int cpus;
+        phandle node;
+        phandle subnode;
+        phandle cpus_parent;
+        phandle cmp;
+        char name[BUF_SIZE];
+
+        /* get the current CPU MID */
         uint64_t current_mid;
         
-        asm volatile (
-                "ldxa [%1] %2, %0\n"
-                : "=r" (current_mid)
-                : "r" (0), "i" (ASI_ICBUS_CONFIG)
-        );
+        asm volatile ("ldxa [%1] %2, %0\n"
+            : "=r" (current_mid)
+            : "r" (0), "i" (ASI_ICBUS_CONFIG));
+        current_mid >>= ICBUS_CONFIG_MID_SHIFT;
+
+        current_mid &= mid_mask;
+
+        /* wake up CPUs */
         
-        current_mid >>= ICBUS_CONFIG_MID_SHIFT;
-        current_mid &= mid_mask;
-        
-        /* Wake up the CPUs */
-        
-        phandle cpus_parent = ofw_find_device("/ssm@0,0");
-        if ((cpus_parent == 0) || (cpus_parent == -1))
+        cpus_parent = ofw_find_device("/ssm@0,0");
+        if (cpus_parent == 0 || cpus_parent == -1) {
                 cpus_parent = ofw_find_device("/");
-        
-        phandle node = ofw_get_child_node(cpus_parent);
-        int cpus = wake_cpus_in_node(node, current_mid, physmem_start);
-        while ((node != 0) && (node != -1)) {
-                char name[BUF_SIZE];
-                
+        }
+
+        node = ofw_get_child_node(cpus_parent);
+        cpus = wake_cpus_in_node(node, current_mid);
+        while (node != 0 && node != -1) {
                 if (ofw_get_property(node, "name", name,
-                    sizeof(name)) > 0) {
+                        sizeof(name)) > 0) {
                         if (strcmp(name, "cmp") == 0) {
-                                phandle subnode = ofw_get_child_node(node);
+                                subnode = ofw_get_child_node(node);
                                 cpus += wake_cpus_in_node(subnode,
-                                        current_mid, physmem_start);
+                                        current_mid);
                         }
                 }
@@ -149 +157 @@
         
         return cpus;
+        
 }
 
 /** Get physical memory starting address.
  *
- * @param start Pointer to variable where the physical memory starting
- *              address will be stored.
+ * @param start         Pointer to variable where the physical memory starting
+ *                      address will be stored.
  *
- * @return Non-zero on succes, zero on failure.
- *
+ * @return              Non-zero on succes, zero on failure.
  */
 int ofw_get_physmem_start(uintptr_t *start)
 {
         uint32_t memreg[4];
+
         if (ofw_get_property(ofw_memory, "reg", &memreg, sizeof(memreg)) <= 0)
                 return 0;
-        
+
         *start = (((uint64_t) memreg[0]) << 32) | memreg[1];
         return 1;
 }
+