Changeset 3debedec in mainline


Ignore:
Timestamp:
2006-02-16T20:26:14Z (19 years ago)
Author:
Ondrej Palkovsky <ondrap@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ba52899
Parents:
2a46e10
Message:

Made powerpc to get on PearPC to the version print when compiled with -O1:

  • create proper memory zones
  • switch to real mode on boot

TODO

  • kernel relocation during boot
  • autodetection of framebuffer settings (PCI?) - now includes hardcoded settings for PearPc.
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed

  • arch/ppc32/_link.ld.in

    r2a46e10 r3debedec  
    1212
    1313SECTIONS {
    14         .image 0x80000000: AT (0x80000000) {
     14        .image 0x800000: AT (0x800000) {
    1515                ktext_start = .;
    1616                *(K_TEXT_START)
    … …  
    3131                LONG(kdata_end - kdata_start);
    3232                hardcoded_load_address = .;
    33                 LONG(0x80000000);
     33                LONG(0x800000);
    3434                *(.bss);                /* uninitialized static variables */   
    3535                *(COMMON);              /* global variables */

  • arch/ppc32/include/console.h

    r2a46e10 r3debedec  
    3030#define __ppc32_CONSOLE_H__
    3131
    32 extern void ofw_ppc32_console_init(void);
     32extern void ppc32_console_init(void);
    3333
    3434#endif

  • arch/ppc32/include/mm/memory_init.h

    r2a46e10 r3debedec  
    3333
    3434size_t get_memory_size(void);
     35void preboot_read_config(void);
     36void ppc_init_zones(void);
    3537
    3638#endif

  • arch/ppc32/include/mm/page.h

    r2a46e10 r3debedec  
    3737#define PAGE_SIZE       FRAME_SIZE
    3838
    39 #define KA2PA(x)        (((__address) (x)) - 0x80000000)
    40 #define PA2KA(x)        (((__address) (x)) + 0x80000000)
     39#define KA2PA(x)        ((__address)(x))
     40#define PA2KA(x)        ((__address)(x))
    4141
    4242#define PTL0_ENTRIES_ARCH               0

  • arch/ppc32/src/console.c

    r2a46e10 r3debedec  
    3131#include <console/chardev.h>
    3232#include <console/console.h>
     33#include <genarch/fb/fb.h>
    3334
    34 /** Print one character.
    35  *
    36  * @param ch Character to be printed.
    37  */
    38 static void ofw_ppc32_putchar(chardev_t *d, const char ch)
    39 {
    40         ofw_putchar(ch);
    41 }
    42 
    43 static chardev_t ofw_ppc32_console;
    44 static chardev_operations_t ofw_ppc32_console_ops = {
    45         .write = ofw_ppc32_putchar
    46 };
    4735
    4836/** Initialize console to use ofw output */
    49 void ofw_ppc32_console_init(void)
     37void ppc32_console_init(void)
    5038{
    51         chardev_initialize("ofw_out", &ofw_ppc32_console, &ofw_ppc32_console_ops);
    52         stdout = &ofw_ppc32_console;
     39        /* TODO: PCI detection etc. etc. - this is fine in PearPC for now */
     40        fb_init(0x84000000,800,600,4);
    5341}

  • arch/ppc32/src/mm/frame.c

    r2a46e10 r3debedec  
    2828
    2929#include <arch/mm/frame.h>
     30#include <arch/mm/memory_init.h>
    3031#include <mm/frame.h>
    3132#include <config.h>
    … …  
    3435void frame_arch_init(void)
    3536{
    36         /* First page is exception vector,
    37          * second is 'implementation specific', evade it too
    38          */
    39         zone_create(0, SIZE2FRAMES(config.memory_size), 2, 0);
     37        ppc_init_zones();
     38        /* First is exception vector, second is 'implementation specific' */
    4039        frame_mark_unavailable(0, 2);
    4140}

  • arch/ppc32/src/mm/memory_init.c

    r2a46e10 r3debedec  
    3030#include <genarch/ofw/ofw.h>
    3131#include <panic.h>
     32#include <mm/frame.h>
     33#include <align.h>
    3234
    3335#define MEMMAP_MAX_RECORDS 32
    … …  
    3840} memmap_t;
    3941
    40 size_t get_memory_size(void)
     42static memmap_t memmap[MEMMAP_MAX_RECORDS];
     43size_t total_mem = 0;
     44
     45static void init_memmap(void)
    4146{
     47        int i;
     48
    4249        phandle handle = ofw_find_device("/memory");
    4350        if (handle == -1)
    4451                panic("No RAM\n");
    4552       
    46         memmap_t memmap[MEMMAP_MAX_RECORDS];
    4753        size_t ret = ofw_get_property(handle, "reg", &memmap, sizeof(memmap));
    4854        if (ret == -1)
    4955                panic("Device /memory has no reg property\n");
    5056       
    51         size_t total = 0;
    52         int i;
    5357       
    5458        for (i = 0; i < MEMMAP_MAX_RECORDS; i++) {
    5559                if (memmap[i].size == 0)
    5660                        break;
    57                 total += memmap[i].size;
     61                total_mem += memmap[i].size;
    5862        }
     63}
    5964
    60         return total;
     65void preboot_read_config(void)
     66{
     67        init_memmap();
    6168}
     69
     70size_t get_memory_size(void)
     71{
     72        return total_mem;
     73}
     74
     75void ppc_init_zones(void)
     76{
     77        int i;
     78        pfn_t confdata;
     79
     80        for (i = 0; i < MEMMAP_MAX_RECORDS; i++) {
     81                if (memmap[i].size == 0)
     82                        break;
     83                confdata = ADDR2PFN(memmap[i].start);
     84                if (confdata == 0)
     85                        confdata = 2;
     86                zone_create(ADDR2PFN(memmap[i].start),
     87                            SIZE2FRAMES(ALIGN_DOWN(memmap[i].size,PAGE_SIZE)),
     88                            confdata, 0);
     89        }
     90}

  • arch/ppc32/src/ppc32.c

    r2a46e10 r3debedec  
    3232void arch_pre_mm_init(void)
    3333{
    34         ofw_ppc32_console_init();
     34        ppc32_console_init();
    3535}
    3636

  • arch/ppc32/src/start.S

    r2a46e10 r3debedec  
    2828
    2929#include <arch/asm/macro.h>
     30#include <arch/asm/spr.h>
    3031
    3132.section K_TEXT_START
    … …  
    3334.global kernel_image_start
    3435
     36.org 0x0
     37/* 256 bytes of some data */
     38/* exception table - must use 'ba' instructions for branches,
     39 * because it is elsewhere than the linker thinks
     40 */
     41.space 4096
     42
    3543kernel_image_start:
     44        /* Initialize OFW, might be needed before relocate_kernel? */
    3645        lis r4, ofw@ha
    3746        addi r4, r4, ofw@l
    … …  
    3948       
    4049        bl ofw_init
     50        bl preboot_read_config
     51
     52        bl relocate_kernel
     53__after_reloc:
     54        /* Set stack to some more meaningful value */
     55        /* TODO: This is hardcoded for PearPC, must be changed later */
     56        lis r1, 0x70
     57        b main_bsp
    4158       
    42         b main_bsp
     59relocate_kernel:
     60        /* TODO: We _know_ that pearpc loads it to 8MB, and
     61         * but it should be really generic
     62         */
     63        lis r4, 0x80 /* r4 is where data was loaded - 8MB */
     64       
     65        bl to_real_mode
     66        /* Now we are in real mode, copy first block and jump to it,
     67         * we are running in the loaded kernel now
     68         * We still have in r3 physical load kernel address
     69         */
     70       
     71        b __after_reloc /* We know in pearpc we are ok, so return,
     72                         * otherwise we should relocate kernel
     73                         * here
     74                         */
     75
     76       
     77
     78       
     79/* Turn off page translation
     80 * - assume that physical-loaded address is in r4
     81 */
     82to_real_mode:
     83        mflr r0
     84       
     85        lis   r5, ktext_start@ha // Expected start of kernel
     86        addi r5, r5, ktext_start@l
     87       
     88        add  r0, r4, r0         
     89        sub  r0, r0, r5         // r0 now contains physical return address
     90       
     91        mfmsr r3
     92        andis. r3, r3, (~MSR_DR | MSR_IR) >> 16
     93        mtspr SPRN_SRR0, r0
     94        mtspr SPRN_SRR1, r3
     95        sync                    // Really needed? RFI should do it as well?
     96        RFI
     97

  • kernel.config

    r2a46e10 r3debedec  
    4646
    4747# Framebuffer support
    48 ! [ARCH=mips32&MIPS_MACHINE=lgxemul] CONFIG_FB (y/n)
     48! [(ARCH=mips32&MIPS_MACHINE=lgxemul)|(ARCH=mips32&MIPS_MACHINE=bgxemul)] CONFIG_FB (y/n)
    4949
    5050# Support for SMP
Note: See TracChangeset for help on using the changeset viewer.