Changeset 45b26dad in mainline for boot/arch/sparc64/loader

Timestamp:

2006-09-26T12:59:28Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b44939b

Parents:

6ff1f1e

Message:

sparc64 work:

• Loader now starts all processors.
• Kernel halts all but the bootstrup processor for now.
• Read clock-frequency from the respective processor node in the device tree

Location:

boot/arch/sparc64/loader

Files:

• asm.S (modified) (1 diff)
• asm.h (modified) (1 diff)
• main.c (modified) (3 diffs)
• main.h (modified) (2 diffs)
• ofwarch.c (modified) (2 diffs)
• ofwarch.h (modified) (1 diff)

boot/arch/sparc64/loader/asm.S

@@ -101 +101 @@
         mov %o1, %o0
         mov %o2, %o1
+        mov %o3, %o2
         jmp %l1                         ! jump to kernel
         nop

boot/arch/sparc64/loader/asm.h

@@ -36 +36 @@
 
 extern void halt(void);
-extern void jump_to_kernel(void *entry, void *bootinfo, unsigned int bootinfo_size) __attribute__((noreturn));
+extern void jump_to_kernel(void *entry, int bsp, void *bootinfo, unsigned int bootinfo_size) __attribute__((noreturn));
 
 #endif

boot/arch/sparc64/loader/main.c

@@ -37 +37 @@
 #include <align.h>
 
-#define KERNEL_VIRTUAL_ADDRESS 0x400000
-
 bootinfo_t bootinfo;
 
@@ -58 +56 @@
         }
         
-        if (!ofw_cpu(&bootinfo.cpu))
-                printf("Error: unable to get cpu properties\n");
-
-        printf("\nDevice info\n");
-        printf(" cpu: %dMHz\n", bootinfo.cpu.clock_frequency/1000000);
+        printf("\nSystem info\n");
         printf(" memory: %dM\n", bootinfo.memmap.total>>20);
 
@@ -97 +91 @@
         printf("done.\n");
 
+        printf("\nChecking for secondary processors...");
+        if (!ofw_cpu())
+                printf("Error: unable to get cpu properties\n");
+        printf("done.\n");
+
         printf("\nBooting the kernel...\n");
-        jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS, &bootinfo, sizeof(bootinfo));
+        jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS, 1, &bootinfo, sizeof(bootinfo));
 }

boot/arch/sparc64/loader/main.h

@@ -35 +35 @@
 #include <types.h>
 
+#define KERNEL_VIRTUAL_ADDRESS 0x400000
+
 #define TASKMAP_MAX_RECORDS 32
 
@@ -48 +50 @@
 
 typedef struct {
-        uint32_t clock_frequency;
-} cpu_t;
-
-typedef struct {
         taskmap_t taskmap;
         memmap_t memmap;
-        cpu_t cpu;
         ballocs_t ballocs;
         ofw_tree_node_t *ofw_root;

boot/arch/sparc64/loader/ofwarch.c

@@ -54 +54 @@
 }
 
-int ofw_cpu(cpu_t *cpu)
+
+#define ASI_UPA_CONFIG          0x4a
+#define UPA_CONFIG_MID_SHIFT    17
+#define UPA_CONFIG_MID_MASK     0x1f
+
+int ofw_cpu(void)
 {
         char type_name[BUF_SIZE];
@@ -62 +67 @@
         if (node == 0 || node == -1) {
                 printf("Could not find any child nodes of the root node.\n");
-                return;
+                return 0;
         }
+        
+        uint64_t current_mid;
+        
+        __asm__ volatile ("ldxa [%1] %2, %0\n" : "=r" (current_mid) : "r" (0), "i" (ASI_UPA_CONFIG));
+        current_mid >>= UPA_CONFIG_MID_SHIFT;
+        current_mid &= UPA_CONFIG_MID_MASK;
         
         for (; node != 0 && node != -1; node = ofw_get_peer_node(node)) {
                 if (ofw_get_property(node, "device_type", type_name, sizeof(type_name)) > 0) {
                         if (strcmp(type_name, "cpu") == 0) {
-                                uint32_t mhz;
+                                uint32_t mid;
                                 
-                                if (ofw_get_property(node, "clock-frequency", &mhz, sizeof(mhz)) <= 0)
+                                if (ofw_get_property(node, "upa-portid", &mid, sizeof(mid)) <= 0)
                                         continue;
                                         
-                                cpu->clock_frequency = mhz;
-                                return 1;
+                                if (current_mid != mid) {
+                                        /*
+                                         * Start secondary processor.
+                                         */
+                                        (void) ofw_call("SUNW,start-cpu", 3, 1, NULL, node, KERNEL_VIRTUAL_ADDRESS, 0);
+                                }
                         }
                 }
-        };
+        }
 
-        return 0;
+        return 1;
 }

boot/arch/sparc64/loader/ofwarch.h

@@ -35 +35 @@
 #define OFW_SIZE_CELLS          2
 
-extern int bpp2align[];
-
-extern int ofw_cpu(cpu_t *cpu);
+extern int ofw_cpu(void);
 
 #endif