Changeset 63cda71 in mainline


Ignore:
Timestamp:
2006-07-13T14:58:57Z (18 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.

Files:
5 added
24 edited
3 moved

Legend:

Unmodified
Added
Removed

  • boot/arch/ppc32/loader/Makefile

    reda7bf81 r63cda71  
    5151SOURCES = \
    5252        main.c \
    53         ofw.c \
     53        ofwarch.c \
    5454        ../../../genarch/ofw.c \
    5555        ../../../generic/printf.c \

  • boot/arch/ppc32/loader/asm.h

    reda7bf81 r63cda71  
    2727 */
    2828
    29 #ifndef __ASM_H__
    30 #define __ASM_H__
     29#ifndef BOOT_ppc32_ASM_H_
     30#define BOOT_ppc32_ASM_H_
    3131
    3232#define PAGE_SIZE 4096

  • boot/arch/ppc32/loader/boot.S

    reda7bf81 r63cda71  
    3838        stw r5, 0(r4)
    3939       
    40         bl init
     40        bl ofw_init
    4141       
    4242        b bootstrap

  • boot/arch/ppc32/loader/main.c

    reda7bf81 r63cda71  
    3131#include "asm.h"
    3232#include "_components.h"
     33#include <ofw.h>
     34#include <align.h>
    3335
    3436#define HEAP_GAP 1024000

  • boot/arch/ppc32/loader/main.h

    reda7bf81 r63cda71  
    2727 */
    2828
    29 #ifndef __MAIN_H__
    30 #define __MAIN_H__
     29#ifndef BOOT_ppc32_MAIN_H_
     30#define BOOT_ppc32_MAIN_H_
    3131
    3232#include "ofw.h"
    33 
    34 /** Align to the nearest higher address.
    35  *
    36  * @param addr  Address or size to be aligned.
    37  * @param align Size of alignment, must be power of 2.
    38  */
    39 #define ALIGN_UP(addr, align) (((addr) + ((align) - 1)) & ~((align) - 1))
    4033
    4134#define TASKMAP_MAX_RECORDS 32

  • boot/arch/ppc32/loader/ofwarch.c

    reda7bf81 r63cda71  
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
    28  
     28
     29#include <ofwarch.h>
    2930#include <ofw.h>
    3031#include <printf.h>
    … …  
    5657        if (ofw_get_property(device, "assigned-addresses", &macio, sizeof(macio)) <= 0)
    5758                return false;
    58         keyboard->addr = macio.addr.addr_lo;
     59        keyboard->addr = (void *) macio.addr.addr_lo;
    5960        keyboard->size = macio.size_lo;
    6061

  • boot/arch/ppc32/loader/ofwarch.h

    reda7bf81 r63cda71  
    11/*
    2  * Copyright (C) 2005 Martin Decky
     2 * Copyright (C) 2006 Jakub Jermar
    33 * All rights reserved.
    44 *
    … …  
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
    28  
    29 #include <ofw.h>
    30 #include <printf.h>
    3128
    32 void write(const char *str, const int len)
    33 {
    34         int i;
    35        
    36         for (i = 0; i < len; i++) {
    37                 if (str[i] == '\n')
    38                         ofw_write("\r", 1);
    39                 ofw_write(&str[i], 1);
    40         }
    41 }
     29#ifndef BOOT_ppc32_OFWARCH_H_
     30#define BOOT_ppc32_OFWARCH_H_
    4231
    43 int ofw_translate_failed(ofw_arg_t flag)
    44 {
    45         return flag != -1;
    46 }
     32#define OFW_ADDRESS_CELLS       1
     33#define OFW_SIZE_CELLS          1
     34
     35#endif

  • boot/arch/ppc32/loader/types.h

    reda7bf81 r63cda71  
    2727 */
    2828
    29 #ifndef TYPES_H__
    30 #define TYPES_H__
     29#ifndef BOOT_ppc32_TYPES_H_
     30#define BOOT_ppc32_TYPES_H_
    3131
    3232#include <gentypes.h>

  • boot/arch/ppc64/loader/Makefile

    reda7bf81 r63cda71  
    5252SOURCES = \
    5353        main.c \
     54        ofwarch.c \
    5455        ../../../genarch/ofw.c \
    5556        ../../../generic/printf.c \

  • boot/arch/ppc64/loader/boot.S

    reda7bf81 r63cda71  
    3838        stw r5, 0(r4)
    3939       
    40         bl init
     40        bl ofw_init
    4141       
    4242        b bootstrap

  • boot/arch/ppc64/loader/main.c

    reda7bf81 r63cda71  
    3131#include "asm.h"
    3232#include "_components.h"
     33#include <ofw.h>
    3334
    3435#define HEAP_GAP 1024000

  • boot/arch/ppc64/loader/main.h

    reda7bf81 r63cda71  
    2727 */
    2828
    29 #ifndef __MAIN_H__
    30 #define __MAIN_H__
     29#ifndef BOOT_ppc64_MAIN_H_
     30#define BOOT_ppc64_MAIN_H_
    3131
    32 #include "ofw.h"
    33 
    34 /** Align to the nearest higher address.
    35  *
    36  * @param addr  Address or size to be aligned.
    37  * @param align Size of alignment, must be power of 2.
    38  */
    39 #define ALIGN_UP(addr, align) (((addr) + ((align) - 1)) & ~((align) - 1))
     32#include <ofw.h>
    4033
    4134#define TASKMAP_MAX_RECORDS 32

  • boot/arch/ppc64/loader/ofwarch.c

    reda7bf81 r63cda71  
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
    28  
     28
     29#include <ofwarch.h>
    2930#include <ofw.h>
    3031#include <printf.h>

  • boot/arch/ppc64/loader/types.h

    reda7bf81 r63cda71  
    2727 */
    2828
    29 #ifndef TYPES_H__
    30 #define TYPES_H__
     29#ifndef BOOT_ppc64_TYPES_H_
     30#define BOOT_ppc64_TYPES_H_
    3131
    3232#include <gentypes.h>

  • boot/arch/sparc64/loader/Makefile

    reda7bf81 r63cda71  
    5353        ../../../generic/printf.c \
    5454        ../../../genarch/ofw.c \
    55         ofw.c \
     55        ofwarch.c \
    5656        asm.S \
    5757        boot.S
    … …  
    6565.PHONY: all clean depend
    6666
    67 all: image.boot
     67all: image.boot disasm
    6868
    6969-include Makefile.depend
    … …  
    8686%.o: %.c
    8787        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     88
     89disasm: image.boot
     90        $(OBJDUMP) -d image.boot > boot.disasm

  • boot/arch/sparc64/loader/asm.h

    reda7bf81 r63cda71  
    2727 */
    2828
    29 #ifndef __ASM_H__
    30 #define __ASM_H__
     29#ifndef BOOT_sparc64_ASM_H_
     30#define BOOT_sparc64_ASM_H_
    3131
    3232#define PAGE_SIZE 8192

  • boot/arch/sparc64/loader/boot.S

    reda7bf81 r63cda71  
    3030
    3131#define PSTATE_IE_BIT   2
     32#define PSTATE_AM_BIT   8
    3233
    3334.register %g2, #scratch
    … …  
    5657
    5758        /*
    58          * Disable interrupts.
     59         * Disable interrupts and disable address masking.
    5960         */
    6061        rdpr %pstate, %g2
    61         and %g2, ~PSTATE_IE_BIT, %g2    ! mask the Interrupt Enable bit
     62        and %g2, ~(PSTATE_IE_BIT|PSTATE_AM_BIT), %g2
    6263        wrpr %g2, 0, %pstate
    6364
    … …  
    6667        set ofw_cif, %l0
    6768 
    68         call init               ! initialize OpenFirmware
     69        call ofw_init           ! initialize OpenFirmware
    6970        stx %o4, [%l0]
    7071       

  • boot/arch/sparc64/loader/main.c

    reda7bf81 r63cda71  
    3232#include "_components.h"
    3333#include <ofw.h>
     34#include <align.h>
    3435
    3536#define KERNEL_VIRTUAL_ADDRESS 0x400000
    … …  
    4445        init_components(components);
    4546
     47        if (!ofw_memmap(&bootinfo.memmap)) {
     48                printf("Error: unable to get memory map, halting.\n");
     49                halt();
     50        }
     51       
     52        if (bootinfo.memmap.total == 0) {
     53                printf("Error: no memory detected, halting.\n");
     54                halt();
     55        }
     56       
     57        if (!ofw_screen(&bootinfo.screen)) {
     58                printf("Error: unable to get screen properties, halting.\n");
     59                halt();
     60        }
     61        bootinfo.screen.addr = ofw_translate(bootinfo.screen.addr);
     62       
     63        if (!ofw_keyboard(&bootinfo.keyboard)) {
     64                printf("Error: unable to get keyboard properties, halting.\n");
     65                halt();
     66        }
     67       
     68        printf("\nDevice statistics\n");
     69        printf(" memory: %dM\n", bootinfo.memmap.total>>20);
     70        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);
     71        printf(" keyboard at %P (size %d bytes)\n", (uintptr_t) bootinfo.keyboard.addr, bootinfo.keyboard.size);
     72
    4673        printf("\nMemory statistics\n");
    47         printf(" kernel entry point at %L\n", KERNEL_VIRTUAL_ADDRESS);
    48         printf(" %L: boot info structure\n", &bootinfo);
     74        printf(" kernel entry point at %P\n", KERNEL_VIRTUAL_ADDRESS);
     75        printf(" %P: boot info structure\n", &bootinfo);
    4976       
    5077        unsigned int i;
    5178        for (i = 0; i < COMPONENTS; i++)
    52                 printf(" %L: %s image (size %d bytes)\n", components[i].start, components[i].name, components[i].size);
     79                printf(" %P: %s image (size %d bytes)\n", components[i].start, components[i].name, components[i].size);
    5380
    5481        printf("\nCopying components\n");

  • boot/arch/sparc64/loader/main.h

    reda7bf81 r63cda71  
    2727 */
    2828
    29 #ifndef __MAIN_H__
    30 #define __MAIN_H__
     29#ifndef BOOT_sparc64_MAIN_H_
     30#define BOOT_sparc64_MAIN_H_
    3131
    32 /** Align to the nearest higher address.
    33  *
    34  * @param addr  Address or size to be aligned.
    35  * @param align Size of alignment, must be power of 2.
    36  */
    37 #define ALIGN_UP(addr, align) (((addr) + ((align) - 1)) & ~((align) - 1))
     32#include <ofw.h>
    3833
    3934#define TASKMAP_MAX_RECORDS 32
    … …  
    4742        unsigned int cnt;
    4843        task_t tasks[TASKMAP_MAX_RECORDS];
     44        memmap_t memmap;
     45        screen_t screen;
     46        keyboard_t keyboard;
    4947} bootinfo_t;
    5048

  • boot/arch/sparc64/loader/types.h

    reda7bf81 r63cda71  
    2727 */
    2828
    29 #ifndef TYPES_H__
    30 #define TYPES_H__
     29#ifndef BOOT_sparc64_TYPES_H_
     30#define BOOT_sparc64_TYPES_H_
    3131
    3232#include <gentypes.h>

  • boot/genarch/ofw.c

    reda7bf81 r63cda71  
    2727 */
    2828 
    29 #include "ofw.h"
     29#include <ofw.h>
     30#include <ofwarch.h>
    3031#include <printf.h>
    3132#include <asm.h>
    … …  
    4142phandle ofw_aliases;
    4243
     44void ofw_init(void)
     45{
     46        ofw_chosen = ofw_find_device("/chosen");
     47        if (ofw_chosen == -1)
     48                halt();
     49       
     50        if (ofw_get_property(ofw_chosen, "stdout",  &ofw_stdout, sizeof(ofw_stdout)) <= 0)
     51                ofw_stdout = 0;
     52       
     53        ofw_root = ofw_find_device("/");
     54        if (ofw_root == -1) {
     55                puts("\r\nError: Unable to find / device, halted.\r\n");
     56                halt();
     57        }
     58       
     59        if (ofw_get_property(ofw_chosen, "mmu",  &ofw_mmu, sizeof(ofw_mmu)) <= 0) {
     60                puts("\r\nError: Unable to get mmu property, halted.\r\n");
     61                halt();
     62        }
     63
     64        ofw_memory = ofw_find_device("/memory");
     65        if (ofw_memory == -1) {
     66                puts("\r\nError: Unable to find /memory device, halted.\r\n");
     67                halt();
     68        }
     69       
     70        ofw_aliases = ofw_find_device("/aliases");
     71        if (ofw_aliases == -1) {
     72                puts("\r\nError: Unable to find /aliases device, halted.\r\n");
     73                halt();
     74        }
     75}
     76
     77
    4378static unsigned long ofw_call(const char *service, const int nargs, const int nret, ofw_arg_t *rets, ...)
    4479{
    … …  
    80115
    81116
    82 static unsigned int ofw_get_address_cells(const phandle device)
    83 {
    84         unsigned int ret;
     117unsigned int ofw_get_address_cells(const phandle device)
     118{
     119        unsigned int ret = 1;
    85120       
    86121        if (ofw_get_property(device, "#address-cells", &ret, sizeof(ret)) <= 0)
    87122                if (ofw_get_property(ofw_root, "#address-cells", &ret, sizeof(ret)) <= 0)
    88                         ret = 1;
     123                        ret = OFW_ADDRESS_CELLS;
    89124       
    90125        return ret;
    … …  
    92127
    93128
    94 static unsigned int ofw_get_size_cells(const phandle device)
     129unsigned int ofw_get_size_cells(const phandle device)
    95130{
    96131        unsigned int ret;
    … …  
    98133        if (ofw_get_property(device, "#size-cells", &ret, sizeof(ret)) <= 0)
    99134                if (ofw_get_property(ofw_root, "#size-cells", &ret, sizeof(ret)) <= 0)
    100                         ret = 1;
     135                        ret = OFW_SIZE_CELLS;
    101136       
    102137        return ret;
    … …  
    107142{
    108143        return ofw_call("open", 1, 1, NULL, name);
    109 }
    110 
    111 
    112 void init(void)
    113 {
    114         ofw_chosen = ofw_find_device("/chosen");
    115         if (ofw_chosen == -1)
    116                 halt();
    117        
    118         if (ofw_get_property(ofw_chosen, "stdout",  &ofw_stdout, sizeof(ofw_stdout)) <= 0)
    119                 ofw_stdout = 0;
    120        
    121         ofw_root = ofw_find_device("/");
    122         if (ofw_root == -1) {
    123                 puts("\r\nError: Unable to find / device, halted.\r\n");
    124                 halt();
    125         }
    126        
    127         if (ofw_get_property(ofw_chosen, "mmu",  &ofw_mmu, sizeof(ofw_mmu)) <= 0) {
    128                 puts("\r\nError: Unable to get mmu property, halted.\r\n");
    129                 halt();
    130         }
    131        
    132         ofw_memory = ofw_find_device("/memory");
    133         if (ofw_memory == -1) {
    134                 puts("\r\nError: Unable to find /memory device, halted.\r\n");
    135                 halt();
    136         }
    137        
    138         ofw_aliases = ofw_find_device("/aliases");
    139         if (ofw_aliases == -1) {
    140                 puts("\r\nError: Unable to find /aliases device, halted.\r\n");
    141                 halt();
    142         }
    143144}
    144145
    … …  
    170171        else
    171172                shift = 0;
    172                
     173
    173174        return (void *) ((result[2]<<shift)|result[3]);
    174175}
    … …  
    207208int ofw_memmap(memmap_t *map)
    208209{
    209         unsigned long buf[BUF_SIZE];
    210         int ret = ofw_get_property(ofw_memory, "reg", buf, sizeof(buf));
    211         if (ret <= 0)
    212                 return false;
    213                
    214210        unsigned int ac = ofw_get_address_cells(ofw_memory);
    215211        unsigned int sc = ofw_get_size_cells(ofw_memory);
    216        
     212
     213        uint32_t buf[((ac+sc)*MEMMAP_MAX_RECORDS)];
     214        int ret = ofw_get_property(ofw_memory, "reg", buf, sizeof(buf));
     215        if (ret <= 0)           /* ret is the number of written bytes */
     216                return false;
     217
    217218        int pos;
    218219        map->total = 0;
    219220        map->count = 0;
    220         for (pos = 0; (pos < ret / sizeof(unsigned long)) && (map->count < MEMMAP_MAX_RECORDS); pos += ac + sc) {
    221                 void * start = (void *) buf[pos + ac - 1];
     221        for (pos = 0; (pos < ret / sizeof(uint32_t)) && (map->count < MEMMAP_MAX_RECORDS); pos += ac + sc) {
     222                void * start = (void *) ((uintptr_t) buf[pos + ac - 1]);
    222223                unsigned int size = buf[pos + ac + sc - 1];
    223224               
    … …  
    229230                }
    230231        }
     232       
     233        return true;
    231234}
    232235
    … …  
    235238{
    236239        char device_name[BUF_SIZE];
     240        uint32_t virtaddr;
    237241       
    238242        if (ofw_get_property(ofw_aliases, "screen", device_name, sizeof(device_name)) <= 0)
    … …  
    243247                return false;
    244248       
    245         if (ofw_get_property(device, "address", &screen->addr, sizeof(screen->addr)) <= 0)
    246                 return false;
    247        
     249        if (ofw_get_property(device, "address", &virtaddr, sizeof(virtaddr)) <= 0)
     250                return false;
     251
     252        screen->addr = (void *) ((uintptr_t) virtaddr);
     253
    248254        if (ofw_get_property(device, "width", &screen->width, sizeof(screen->width)) <= 0)
    249255                return false;

  • boot/genarch/ofw.h

    reda7bf81 r63cda71  
    2727 */
    2828
    29 #ifndef __OFW_H__
    30 #define __OFW_H__
     29#ifndef BOOT_OFW_H_
     30#define BOOT_OFW_H_
    3131
    3232#include <types.h>
    … …  
    3939#define MAX_OFW_ARGS            12
    4040
    41 typedef unsigned long ofw_arg_t;
     41typedef unative_t ofw_arg_t;
    4242typedef unsigned int ihandle;
    4343typedef unsigned int phandle;
    … …  
    6565
    6666typedef struct {
    67         uint32_t addr;
     67        void *addr;
    6868        unsigned int width;
    6969        unsigned int height;
    … …  
    7373
    7474typedef struct {
    75         uint32_t addr;
     75        void *addr;
    7676        unsigned int size;
    7777} keyboard_t;
    … …  
    9393extern phandle ofw_aliases;
    9494
    95 extern void init(void);
     95extern void ofw_init(void);
    9696extern void ofw_write(const char *str, const int len);
    9797
    … …  
    100100
    101101extern int ofw(ofw_args_t *arg);
     102extern unsigned int ofw_get_address_cells(const phandle device);
     103extern unsigned int ofw_get_size_cells(const phandle device);
    102104extern void *ofw_translate(const void *virt);
    103105extern int ofw_translate_failed(ofw_arg_t flag);

  • boot/generic/gentypes.h

    reda7bf81 r63cda71  
    2727 */
    2828
    29 #ifndef GENTYPES_H__
    30 #define GENTYPES_H__
     29#ifndef BOOT_GENTYPES_H_
     30#define BOOT_GENTYPES_H_
    3131
    3232#define NULL 0

  • boot/generic/printf.h

    reda7bf81 r63cda71  
    2727 */
    2828
    29 #ifndef PRINTF_H__
    30 #define PRINTF_H__
     29#ifndef BOOT_PRINTF_H_
     30#define BOOT_PRINTF_H_
    3131
    3232#define INT8    1

  • kernel/arch/sparc64/include/register.h

    reda7bf81 r63cda71  
    3636#define KERN_sparc64_REGISTER_H_
    3737
    38 #ifdef __ASM__
    39 #define PSTATE_IE_BIT   2
    40 #define PSTATE_AM_BIT   8
    41 #else
    42 
     38#include <arch/regdef.h>
    4339#include <arch/types.h>
    4440
    … …  
    112108#endif
    113109
    114 #endif
    115 
    116110/** @}
    117111 */

  • kernel/arch/sparc64/src/asm.S

    reda7bf81 r63cda71  
    2828
    2929#include <arch/stack.h>
    30 #include <arch/register.h>
     30#include <arch/regdef.h>
    3131
    3232.text

  • kernel/arch/sparc64/src/start.S

    reda7bf81 r63cda71  
    2828
    2929#include <arch/boot/boot.h>
    30 #include <arch/register.h>
     30#include <arch/regdef.h>
    3131
    3232.register %g2, #scratch
    … …  
    3838
    3939/*
    40  * Here is where the kernel is passed control.
     40 * Here is where the kernel is passed control
     41 * from the boot loader.
    4142 */
    4243
Note: See TracChangeset for help on using the changeset viewer.