Changeset a9ac978 in mainline for boot/arch/sparc64/loader/ofwarch.c

Timestamp:

2006-09-27T20:11:34Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00b38a3

Parents:

86b31ba9

Message:

SMP stuff for sparc64.
Almost complete except for IPIs.
The absence of IPI support deadlocks
the kernel when more CPUs are configured.

File:

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

boot/arch/sparc64/loader/ofwarch.c

@@ -36 +36 @@
 #include <printf.h>
 #include <string.h>
+#include <register.h>
 #include "main.h"
 
@@ -54 +55 @@
 }
 
-
-#define ASI_UPA_CONFIG          0x4a
-#define UPA_CONFIG_MID_SHIFT    17
-#define UPA_CONFIG_MID_MASK     0x1f
-
 int ofw_cpu(void)
 {
@@ -75 +71 @@
         current_mid >>= UPA_CONFIG_MID_SHIFT;
         current_mid &= UPA_CONFIG_MID_MASK;
+
+        int cpus;
         
-        for (; node != 0 && node != -1; node = ofw_get_peer_node(node)) {
+        for (cpus = 0; node != 0 && node != -1; node = ofw_get_peer_node(node), cpus++) {
                 if (ofw_get_property(node, "device_type", type_name, sizeof(type_name)) > 0) {
                         if (strcmp(type_name, "cpu") == 0) {
@@ -94 +92 @@
         }
 
-        return 1;
+        return cpus;
 }