Changeset 25a76ab8 in mainline for boot/arch/sparc64/src/ofw.c

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• boot/arch/sparc64/src/ofw.c (moved) (moved from boot/arch/sparc64/loader/ofwarch.c ) (8 diffs)

boot/arch/sparc64/src/ofw.c

@@ -33 +33 @@
  */
 
-#include <ofwarch.h>
-#include <ofw.h>
+#include <arch/arch.h>
+#include <arch/ofw.h>
+#include <genarch/ofw.h>
+#include <typedefs.h>
 #include <printf.h>
-#include <string.h>
-#include <register.h>
-#include "main.h"
-#include "asm.h"
+#include <halt.h>
+#include <putchar.h>
+#include <str.h>
 
-void write(const char *str, const int len)
+void putchar(const wchar_t ch)
 {
-        int i;
+        if (ch == '\n')
+                ofw_putchar('\r');
         
-        for (i = 0; i < len; i++) {
-                if (str[i] == '\n')
-                        ofw_write("\r", 1);
-                ofw_write(&str[i], 1);
-        }
+        if (ascii_check(ch))
+                ofw_putchar(ch);
+        else
+                ofw_putchar(U_SPECIAL);
 }
 
-int ofw_translate_failed(ofw_arg_t flag)
-{
-        return flag != -1;
-}
-
-/**
- * Starts all CPUs represented by following siblings of the given node,
- * except for the current CPU.
+/** Start all CPUs represented by following siblings of the given node.
+ *
+ * Except for the current CPU.
  *
  * @param child         The first child of the OFW tree node whose children
@@ -71 +67 @@
  *
  */
-static int wake_cpus_in_node(phandle child, uint64_t current_mid,
+static size_t wake_cpus_in_node(phandle child, uint64_t current_mid,
     uintptr_t physmem_start)
 {
-        int cpus;
+        size_t cpus;
         
-        for (cpus = 0; (child != 0) && (child != -1);
+        for (cpus = 0; (child != 0) && (child != (phandle) -1);
             child = ofw_get_peer_node(child), cpus++) {
                 char type_name[OFW_TREE_PROPERTY_MAX_VALUELEN];
@@ -83 +79 @@
                     OFW_TREE_PROPERTY_MAX_VALUELEN) > 0) {
                         type_name[OFW_TREE_PROPERTY_MAX_VALUELEN - 1] = 0;
-                        if (strcmp(type_name, "cpu") == 0) {
+                        
+                        if (str_cmp(type_name, "cpu") == 0) {
                                 uint32_t mid;
                                 
@@ -100 +97 @@
                                          */
                                         (void) ofw_call("SUNW,start-cpu", 3, 1,
-                                            NULL, child, KERNEL_VIRTUAL_ADDRESS,
+                                            NULL, child, KERNEL_ADDRESS,
                                             physmem_start | AP_PROCESSOR);
                                 }
@@ -110 +107 @@
 }
 
-/**
- * Finds out the current CPU's MID and wakes up all AP processors.
+/** Find out the current CPU's MID and wake up all AP processors.
+ *
  */
-int ofw_cpu(uint16_t mid_mask, uintptr_t physmem_start)
+void ofw_cpu(uint16_t mid_mask, uintptr_t physmem_start)
 {
         /* Get the current CPU MID */
@@ -119 +116 @@
         
         asm volatile (
-                "ldxa [%1] %2, %0\n"
-                : "=r" (current_mid)
-                : "r" (0), "i" (ASI_ICBUS_CONFIG)
+                "ldxa [%[zero]] %[asi], %[current_mid]\n"
+                : [current_mid] "=r" (current_mid)
+                : [zero] "r" (0),
+                  [asi] "i" (ASI_ICBUS_CONFIG)
         );
         
@@ -130 +128 @@
         
         phandle cpus_parent = ofw_find_device("/ssm@0,0");
-        if ((cpus_parent == 0) || (cpus_parent == -1))
+        if ((cpus_parent == 0) || (cpus_parent == (phandle) -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)) {
+        size_t cpus = wake_cpus_in_node(node, current_mid, physmem_start);
+        
+        while ((node != 0) && (node != (phandle) -1)) {
                 char name[OFW_TREE_PROPERTY_MAX_VALUELEN];
                 
@@ -141 +140 @@
                     OFW_TREE_PROPERTY_MAX_VALUELEN) > 0) {
                         name[OFW_TREE_PROPERTY_MAX_VALUELEN - 1] = 0;
-                        if (strcmp(name, "cmp") == 0) {
+                        
+                        if (str_cmp(name, "cmp") == 0) {
                                 phandle subnode = ofw_get_child_node(node);
                                 cpus += wake_cpus_in_node(subnode,
-                                        current_mid, physmem_start);
+                                    current_mid, physmem_start);
                         }
                 }
+                
                 node = ofw_get_peer_node(node);
         }
         
-        return cpus;
+        if (cpus == 0)
+                printf("Warning: Unable to get CPU properties.\n");
 }
 
 /** Get physical memory starting address.
  *
- * @param start Pointer to variable where the physical memory starting
- *              address will be stored.
- *
- * @return Non-zero on succes, zero on failure.
+ * @return Physical memory starting address.
  *
  */
-int ofw_get_physmem_start(uintptr_t *start)
+uintptr_t ofw_get_physmem_start(void)
 {
         uint32_t memreg[4];
-        if (ofw_get_property(ofw_memory, "reg", &memreg, sizeof(memreg)) <= 0)
-                return 0;
+        if ((ofw_ret_t) ofw_get_property(ofw_memory, "reg", &memreg,
+            sizeof(memreg)) <= 0) {
+                printf("Error: Unable to get physical memory starting address, halting.\n");
+                halt();
+        }
         
-        *start = (((uint64_t) memreg[0]) << 32) | memreg[1];
-        return 1;
+        return ((((uintptr_t) memreg[0]) << 32) | memreg[1]);
 }