Changeset 9a5b556 in mainline for boot/arch/sparc64/loader

Timestamp:

2006-09-12T13:03:55Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6eabb6e6

Parents:

7bb6b06

Message:

sparc64 work:

• find a CPU node and read its clock_frequency attribute
• implement asm_delay_loop()
• set TICK_COMPARE register according to processor frequency
• small improvements at random places

OpenFirmware work:

• two new functions for walking the device tree

Generic boot loader work:

• added basic string functions

Usual pile of indentation and formatting fixes.

Location:

boot/arch/sparc64/loader

Files:

• Makefile (modified) (1 diff)
• main.c (modified) (1 diff)
• main.h (modified) (1 diff)
• ofwarch.c (modified) (2 diffs)
• ofwarch.h (modified) (2 diffs)

boot/arch/sparc64/loader/Makefile

@@ -52 +52 @@
         main.c \
         ../../../generic/printf.c \
+        ../../../generic/string.c \
         ../../../genarch/ofw.c \
         ofwarch.c \

boot/arch/sparc64/loader/main.c

@@ -67 +67 @@
                 printf("Error: unable to get keyboard properties\n");
 
+        if (!ofw_cpu(&bootinfo.cpu))
+                printf("Error: unable to get cpu properties\n");
+
         printf("\nDevice statistics\n");
+        printf(" cpu: %dMHz\n", bootinfo.cpu.clock_frequency/1000000);
         printf(" memory: %dM\n", bootinfo.memmap.total>>20);
         printf(" screen at %P, resolution %dx%d, %d bpp (scanline %d bytes)\n", (uintptr_t) bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline);

boot/arch/sparc64/loader/main.h

@@ -46 +46 @@
 
 typedef struct {
+        uint32_t clock_frequency;
+} cpu_t;
+
+typedef struct {
         taskmap_t taskmap;
         memmap_t memmap;
         screen_t screen;
         keyboard_t keyboard;
+        cpu_t cpu;
 } bootinfo_t;
 

boot/arch/sparc64/loader/ofwarch.c

@@ -35 +35 @@
 #include <ofw.h>
 #include <printf.h>
+#include <string.h>
+#include "main.h"
 
 int bpp2align[] = {
@@ -80 +82 @@
         return true;
 }
+
+int ofw_cpu(cpu_t *cpu)
+{
+        char type_name[BUF_SIZE];
+
+        phandle node;
+        node = ofw_get_child_node(ofw_root);
+        if (node == 0 || node == -1) {
+                printf("Could not find any child nodes of the root node.\n");
+                return;
+        }
+        
+        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 (strncmp(type_name, "cpu", 3) == 0) {
+                                uint32_t mhz;
+                                
+                                if (ofw_get_property(node, "clock-frequency", &mhz, sizeof(mhz)) <= 0)
+                                        continue;
+                                        
+                                cpu->clock_frequency = mhz;
+                                return 1;
+                        }
+                }
+        };
+
+        return 0;
+}

boot/arch/sparc64/loader/ofwarch.h

@@ -30 +30 @@
 #define BOOT_sparc64_OFWARCH_H_
 
+#include "main.h"
+
 #define OFW_ADDRESS_CELLS       2
 #define OFW_SIZE_CELLS          2
@@ -35 +37 @@
 extern int bpp2align[];
 
+extern int ofw_cpu(cpu_t *cpu);
+
 #endif