Changeset 63cda71 in mainline for boot/arch/sparc64

Timestamp:

2006-07-13T14:58:57Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

94d614e

Parents:

eda7bf81

Message:

Fix ofw_memmap() in boot infrastructure.
The cell size is 32-bit and not equal sizeof(ofw_arg_t).
Define architecture dependant #address-cells and #size-cells for cases
the respective properties are missing in the OpenFirmware device tree.
The algorithm now works both for ppc32 and sparc64.

Add memmap_t, screen_t and keyboard_t to sparc64 bootinfo structure.
Be more verbose during sparc64 boot.

Move ALIGN_UP to generic part of boot/.

Change header guards in several places so that they don't contain double underscore.

Location:

boot/arch/sparc64/loader

Files:

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

boot/arch/sparc64/loader/Makefile

@@ -53 +53 @@
         ../../../generic/printf.c \
         ../../../genarch/ofw.c \
-        ofw.c \
+        ofwarch.c \
         asm.S \
         boot.S
@@ -65 +65 @@
 .PHONY: all clean depend
 
-all: image.boot
+all: image.boot disasm
 
 -include Makefile.depend
@@ -86 +86 @@
 %.o: %.c
         $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+
+disasm: image.boot
+        $(OBJDUMP) -d image.boot > boot.disasm

boot/arch/sparc64/loader/asm.h

@@ -27 +27 @@
  */
 
-#ifndef __ASM_H__
-#define __ASM_H__
+#ifndef BOOT_sparc64_ASM_H_
+#define BOOT_sparc64_ASM_H_
 
 #define PAGE_SIZE 8192

boot/arch/sparc64/loader/boot.S

@@ -30 +30 @@
 
 #define PSTATE_IE_BIT   2
+#define PSTATE_AM_BIT   8
 
 .register %g2, #scratch
@@ -56 +57 @@
 
         /*
-         * Disable interrupts.
+         * Disable interrupts and disable address masking.
          */
         rdpr %pstate, %g2
-        and %g2, ~PSTATE_IE_BIT, %g2    ! mask the Interrupt Enable bit
+        and %g2, ~(PSTATE_IE_BIT|PSTATE_AM_BIT), %g2
         wrpr %g2, 0, %pstate
 
@@ -66 +67 @@
         set ofw_cif, %l0
  
-        call init               ! initialize OpenFirmware
+        call ofw_init           ! initialize OpenFirmware
         stx %o4, [%l0]
         

boot/arch/sparc64/loader/main.c

@@ -32 +32 @@
 #include "_components.h"
 #include <ofw.h>
+#include <align.h>
 
 #define KERNEL_VIRTUAL_ADDRESS 0x400000
@@ -44 +45 @@
         init_components(components);
 
+        if (!ofw_memmap(&bootinfo.memmap)) {
+                printf("Error: unable to get memory map, halting.\n");
+                halt();
+        }
+        
+        if (bootinfo.memmap.total == 0) {
+                printf("Error: no memory detected, halting.\n");
+                halt();
+        }
+        
+        if (!ofw_screen(&bootinfo.screen)) {
+                printf("Error: unable to get screen properties, halting.\n");
+                halt();
+        }
+        bootinfo.screen.addr = ofw_translate(bootinfo.screen.addr);
+        
+        if (!ofw_keyboard(&bootinfo.keyboard)) {
+                printf("Error: unable to get keyboard properties, halting.\n");
+                halt();
+        }
+        
+        printf("\nDevice statistics\n");
+        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);
+        printf(" keyboard at %P (size %d bytes)\n", (uintptr_t) bootinfo.keyboard.addr, bootinfo.keyboard.size);
+
         printf("\nMemory statistics\n");
-        printf(" kernel entry point at %L\n", KERNEL_VIRTUAL_ADDRESS);
-        printf(" %L: boot info structure\n", &bootinfo);
+        printf(" kernel entry point at %P\n", KERNEL_VIRTUAL_ADDRESS);
+        printf(" %P: boot info structure\n", &bootinfo);
         
         unsigned int i;
         for (i = 0; i < COMPONENTS; i++)
-                printf(" %L: %s image (size %d bytes)\n", components[i].start, components[i].name, components[i].size);
+                printf(" %P: %s image (size %d bytes)\n", components[i].start, components[i].name, components[i].size);
 
         printf("\nCopying components\n");

boot/arch/sparc64/loader/main.h

@@ -27 +27 @@
  */
 
-#ifndef __MAIN_H__
-#define __MAIN_H__
+#ifndef BOOT_sparc64_MAIN_H_
+#define BOOT_sparc64_MAIN_H_
 
-/** Align to the nearest higher address.
- *
- * @param addr  Address or size to be aligned.
- * @param align Size of alignment, must be power of 2.
- */
-#define ALIGN_UP(addr, align) (((addr) + ((align) - 1)) & ~((align) - 1))
+#include <ofw.h>
 
 #define TASKMAP_MAX_RECORDS 32
@@ -47 +42 @@
         unsigned int cnt;
         task_t tasks[TASKMAP_MAX_RECORDS];
+        memmap_t memmap;
+        screen_t screen;
+        keyboard_t keyboard;
 } bootinfo_t;
 

boot/arch/sparc64/loader/types.h

@@ -27 +27 @@
  */
 
-#ifndef TYPES_H__
-#define TYPES_H__
+#ifndef BOOT_sparc64_TYPES_H_
+#define BOOT_sparc64_TYPES_H_
 
 #include <gentypes.h>