Changeset b97b348 in mainline for kernel/arch/sparc64/src


Ignore:
Timestamp:
2010-05-12T20:00:19Z (15 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
be6cef1b
Parents:
f09d891
Message:

do not use ofw_quiesce() (it can actually make more harm than good)
fix the order of arguments passed from the bootloader to kernel on sparc64 (this fixes booting on machines with non-zero physical address start)
remove separate cache.S, use the code directly in start.S

Location:
kernel/arch/sparc64/src
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/sparc64/src/smp/sun4v/smp.c

    rf09d891 rb97b348  
    433433        if (__hypercall_fast4(CPU_START, cpuid,
    434434            (uint64_t) KA2PA(kernel_image_start), KA2PA(trap_table),
    435             physmem_start) != EOK)
     435            physmem_base) != EOK)
    436436                return false;
    437437#endif

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

    rf09d891 rb97b348  
    3636#include <arch/mm/tlb.h>
    3737#include <arch/mm/tte.h>
     38#include <arch/mm/cache_spec.h>
    3839
    3940#ifdef CONFIG_SMP
    … …  
    6263 *
    6364 * The registers are expected to be in this state:
    64  *  - %o0 bootinfo structure address (BSP only)
    65  *  - %o1 starting address of physical memory
     65 *  - %o0 starting address of physical memory
    6666 *        + bootstrap processor flag
    6767 *          bits 63...1: physical memory starting address / 2
    6868 *          bit 0:       non-zero on BSP processor, zero on AP processors
     69 *  - %o1 bootinfo structure address (BSP only)
     70 *
    6971 *
    7072 * Moreover, we depend on boot having established the following environment:
    … …  
    7779kernel_image_start:
    7880        mov BSP_FLAG, %l0
    79         and %o1, %l0, %l7                       ! l7 <= bootstrap processor?
    80         andn %o1, %l0, %l6                      ! l6 <= start of physical memory
     81        and %o0, %l0, %l7                       ! l7 <= bootstrap processor?
     82        andn %o0, %l0, %l6                      ! l6 <= start of physical memory
    8183
    8284        ! Get bits (PHYSMEM_ADDR_SIZE - 1):13 of physmem_base.
    … …  
    268270        or %l3, %l5, %l3
    269271        stx %l3, [%l4 + %lo(kernel_8k_tlb_data_template)]
    270 
    271         /*
    272          * Flush D-Cache.
    273          */
    274         call dcache_flush
    275         nop
    276 
     272       
     273        ! flush the whole D-cache
     274        set (DCACHE_SIZE - DCACHE_LINE_SIZE), %g1
     275        stxa %g0, [%g1] ASI_DCACHE_TAG
     276       
     2770:
     278        membar #Sync
     279        subcc %g1, DCACHE_LINE_SIZE, %g1
     280        bnz,pt %xcc, 0b
     281       
     282        stxa %g0, [%g1] ASI_DCACHE_TAG
     283        membar #Sync
     284       
    277285        /*
    278286         * So far, we have not touched the stack.
    … …  
    282290        or %sp, %lo(temporary_boot_stack), %sp
    283291        sub %sp, STACK_BIAS, %sp
    284 
     292       
     293        /*
     294         * Call arch_pre_main(bootinfo)
     295         */
     296        mov %o1, %o0
    285297        call arch_pre_main
    286298        nop

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

    rf09d891 rb97b348  
    9393 *
    9494 * The registers are expected to be in this state:
    95  *  - %o0 bootinfo structure address (BSP only)
    96  *  - %o1 starting address of physical memory
     95 *  - %o0 starting address of physical memory
    9796 *        + bootstrap processor flag
    9897 *          bits 63...1: physical memory starting address / 2
    9998 *          bit 0:       non-zero on BSP processor, zero on AP processors
     99 *  - %o1 bootinfo structure address (BSP only)
     100 *
    100101 *
    101102 * Moreover, we depend on boot having established the following environment:
    … …  
    107108kernel_image_start:
    108109        mov BSP_FLAG, %l0
    109         and %o1, %l0, %l7                       ! l7 <= bootstrap processor?
    110         andn %o1, %l0, %l6                      ! l6 <= start of physical memory
    111         or %o0, %g0, %l0
     110        and %o0, %l0, %l7                       ! l7 <= bootstrap processor?
     111        andn %o0, %l0, %l6                      ! l6 <= start of physical memory
     112        or %o1, %g0, %l1
    112113
    113114        ! Get bits (PHYSMEM_ADDR_SIZE - 1):13 of physmem_base.
    … …  
    246247        sub %sp, STACK_BIAS, %sp
    247248
    248         or %l0, %g0, %o0
     249        /*
     250         * Call arch_pre_main(bootinfo)
     251         */
     252        or %l1, %g0, %o0
    249253        call arch_pre_main
    250254        nop
Note: See TracChangeset for help on using the changeset viewer.