Index: boot/arch/ppc32/src/asm.S =================================================================== --- boot/arch/ppc32/src/asm.S (revision 4646710d9ea7943ec02c77020e7b60258fd30d8b) +++ boot/arch/ppc32/src/asm.S (revision 1033d1fbada20027b76c48da5df9154d3a23932b) @@ -48,10 +48,10 @@ li \reg, 0 sync - + .rept 64 tlbie \reg addi \reg, \reg, 0x1000 .endr - + eieio tlbsync @@ -61,44 +61,44 @@ .macro BAT_COMPUTE base size mask lower upper # less than 128 KB -> no BAT - + lis \upper, 0x0002 cmpw \size, \upper blt no_bat - + # mask = total >> 18 - + li \upper, 18 srw \mask, \size, \upper - + # create Block Length mask by replicating # the leading logical one 14 times - + li \upper, 14 mtctr \mask li \upper, 1 - + 0: # mask = (mask >> 1) | mask - + srw \lower, \mask, \upper or \mask, \mask, \lower - + bdnz 0b - + # mask = mask & 0x07ff # (BAT can map up to 256 MB) - + andi. \mask, \mask, 0x07ff - + # mask = (mask << 2) | 0x0002 # (priviledged access only) - + li \upper, 2 slw \mask, \mask, \upper ori \mask, \mask, 0x0002 - + lis \upper, (0x8000 + \base) or \upper, \upper, \mask - + lis \lower, \base ori \lower, \lower, 0x0002 @@ -111,5 +111,5 @@ addi r4, r4, ofw_cif@l stw r5, 0(r4) - + bl ofw_init b bootstrap @@ -127,17 +127,17 @@ # r5 = pages to translate # r6 = real mode meeting point (physical address) - + # disable interrupts - + mfmsr r31 rlwinm r31, r31, 0, 17, 15 mtmsr r31 - + # set real mode meeting point physical address - + mtspr srr0, r6 - + # jump to real_mode - + mfmsr r31 lis r30, ~0@h @@ -145,5 +145,5 @@ and r31, r31, r30 mtspr srr1, r31 - + sync isync @@ -155,246 +155,246 @@ .align PAGE_WIDTH SYMBOL(real_mode) - + # arguments: # r3 = bootinfo (physical address) # r4 = translate table (physical address) # r5 = pages to translate - + # move the images of components to the proper # location using the translate table - + li r31, PAGE_SIZE >> 2 li r30, 0 - + page_copy: - + cmpwi r5, 0 beq copy_end - + mtctr r31 lwz r29, 0(r4) - + copy_loop: - + lwz r28, 0(r29) stw r28, 0(r30) - + SMC_COHERENCY r30 - + addi r29, r29, 4 addi r30, r30, 4 - + bdnz copy_loop - + addi r4, r4, 4 subi r5, r5, 1 b page_copy - + copy_end: - + # initially fill segment registers - + li r31, 0 - + li r29, 8 mtctr r29 li r30, 0 # ASID 0 (VSIDs 0 .. 7) - + seg_fill_uspace: - + mtsrin r30, r31 addi r30, r30, 1 addis r31, r31, 0x1000 # move to next SR - + bdnz seg_fill_uspace - + li r29, 8 mtctr r29 lis r30, 0x4000 # priviledged access only ori r30, r30, 8 # ASID 0 (VSIDs 8 .. 15) - + seg_fill_kernel: - + mtsrin r30, r31 addi r30, r30, 1 addis r31, r31, 0x1000 # move to next SR - + bdnz seg_fill_kernel - + # invalidate block address translation registers - + li r30, 0 - + mtspr ibat0u, r30 mtspr ibat0l, r30 - + mtspr ibat1u, r30 mtspr ibat1l, r30 - + mtspr ibat2u, r30 mtspr ibat2l, r30 - + mtspr ibat3u, r30 mtspr ibat3l, r30 - + mtspr dbat0u, r30 mtspr dbat0l, r30 - + mtspr dbat1u, r30 mtspr dbat1l, r30 - + mtspr dbat2u, r30 mtspr dbat2l, r30 - + mtspr dbat3u, r30 mtspr dbat3l, r30 - + # create empty Page Hash Table # on top of memory, size 64 KB - + lwz r31, 4(r3) # r31 = memory size - + lis r30, 65536@h ori r30, r30, 65536@l # r30 = 65536 - + subi r29, r30, 1 # r29 = 65535 - + sub r31, r31, r30 andc r31, r31, r29 # pht = ALIGN_DOWN(memory_size - 65536, 65536) - + mtsdr1 r31 - + li r29, 2 srw r30, r30, r29 # r30 = 16384 li r29, 0 - + pht_clear: - + # write zeroes - + stw r29, 0(r31) FLUSH_DCACHE r31 - + addi r31, r31, 4 subi r30, r30, 4 - + cmpwi r30, 0 beq clear_end - + bdnz pht_clear - + clear_end: - + # create BAT identity mapping - + lwz r31, 4(r3) # r31 = memory size - + lis r30, 268435456@h ori r30, r30, 268435456@l # r30 = 256 MB - + # BAT0 - + # r29 = min(r31, r30) - + cmpw r31, r30 blt bat0_r31 - + mr r29, r30 b bat0_r30 - + bat0_r31: - + mr r29, r31 - + bat0_r30: - + BAT_COMPUTE 0x0000 r29 r28 r27 r26 mtspr ibat0u, r26 mtspr ibat0l, r27 - + mtspr dbat0u, r26 mtspr dbat0l, r27 - + # BAT1 - + sub r31, r31, r29 # r31 = r31 - r29 - + # r29 = min(r31, r30) - + cmpw r31, r30 blt bat1_r31 - + mr r29, r30 b bat1_r30 - + bat1_r31: - + mr r29, r31 - + bat1_r30: - + BAT_COMPUTE 0x1000 r29 r28 r27 r26 mtspr ibat1u, r26 mtspr ibat1l, r27 - + mtspr dbat1u, r26 mtspr dbat1l, r27 - + # BAT2 - + sub r31, r31, r29 # r31 = r31 - r29 - + # r29 = min(r31, r30) - + cmpw r31, r30 blt bat2_r31 - + mr r29, r30 b bat2_r30 - + bat2_r31: - + mr r29, r31 - + bat2_r30: - + BAT_COMPUTE 0x2000 r29 r28 r27 r26 mtspr ibat2u, r26 mtspr ibat2l, r27 - + mtspr dbat2u, r26 mtspr dbat2l, r27 - + # BAT3 - + sub r31, r31, r29 # r31 = r31 - r29 - + # r29 = min(r31, r30) - + cmpw r31, r30 blt bat3_r31 - + mr r29, r30 b bat3_r30 - + bat3_r31: - + mr r29, r31 - + bat3_r30: - + BAT_COMPUTE 0x3000 r29 r28 r27 r26 mtspr ibat3u, r26 mtspr ibat3l, r27 - + mtspr dbat3u, r26 mtspr dbat3l, r27 - + no_bat: - + # flush TLB - + TLB_FLUSH r31 - + # start the kernel # @@ -404,25 +404,25 @@ # sprg3 = physical memory size # sp = 0 (enforces the usage of sprg0 as exception stack) - + lis r31, PA2KA(BOOT_OFFSET)@ha addi r31, r31, PA2KA(BOOT_OFFSET)@l mtspr srr0, r31 - + lis r31, BOOT_OFFSET@ha addi r31, r31, BOOT_OFFSET@l mtsprg0 r31 - + # bootinfo starts with a 64 bit integer containing # the physical memory size, get the lower 4 bytes - + lwz r31, 4(r3) mtsprg3 r31 - + li sp, 0 - + mfmsr r31 ori r31, r31, (msr_ir | msr_dr)@l mtspr srr1, r31 - + sync isync Index: boot/arch/ppc32/src/main.c =================================================================== --- boot/arch/ppc32/src/main.c (revision 4646710d9ea7943ec02c77020e7b60258fd30d8b) +++ boot/arch/ppc32/src/main.c (revision 1033d1fbada20027b76c48da5df9154d3a23932b) @@ -60,9 +60,9 @@ version_print(); ofw_memmap(&bootinfo.memmap); - + void *bootinfo_pa = ofw_translate(&bootinfo); void *real_mode_pa = ofw_translate(&real_mode); void *loader_address_pa = ofw_translate((void *) LOADER_ADDRESS); - + printf("\nMemory statistics (total %llu MB)\n", bootinfo.memmap.total >> 20); printf(" %p|%p: real mode trampoline\n", &real_mode, real_mode_pa); @@ -72,5 +72,5 @@ printf(" %p|%p: loader entry point\n", (void *) LOADER_ADDRESS, loader_address_pa); - + size_t i; for (i = 0; i < COMPONENTS; i++) @@ -78,5 +78,5 @@ ofw_translate(components[i].addr), components[i].name, components[i].inflated, components[i].size); - + size_t dest[COMPONENTS]; size_t top = 0; @@ -85,5 +85,5 @@ for (i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) { top = ALIGN_UP(top, PAGE_SIZE); - + if (i > 0) { bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].addr = @@ -91,16 +91,16 @@ bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].size = components[i].inflated; - + str_cpy(bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].name, BOOTINFO_TASK_NAME_BUFLEN, components[i].name); - + bootinfo.taskmap.cnt++; } - + dest[i] = top; top += components[i].inflated; cnt++; } - + if (top >= (size_t) loader_address_pa) { printf("Inflated components overlap loader area.\n"); @@ -108,5 +108,5 @@ halt(); } - + void *balloc_base; void *balloc_base_pa; @@ -114,5 +114,5 @@ BALLOC_MAX_SIZE, loader_address_pa); printf(" %p|%p: boot allocator area\n", balloc_base, balloc_base_pa); - + void *inflate_base; void *inflate_base_pa; @@ -120,5 +120,5 @@ loader_address_pa); printf(" %p|%p: inflate area\n", inflate_base, inflate_base_pa); - + uintptr_t balloc_start = ALIGN_UP(top, PAGE_SIZE); size_t pages = (balloc_start + ALIGN_UP(BALLOC_MAX_SIZE, PAGE_SIZE)) @@ -129,17 +129,17 @@ pages * sizeof(void *), loader_address_pa); printf(" %p|%p: translate table\n", transtable, transtable_pa); - + check_overlap("boot allocator area", balloc_base_pa, pages); check_overlap("inflate area", inflate_base_pa, pages); check_overlap("translate table", transtable_pa, pages); - + printf("\nInflating components ... "); - + for (i = cnt; i > 0; i--) { printf("%s ", components[i - 1].name); - + int err = inflate(components[i - 1].addr, components[i - 1].size, inflate_base + dest[i - 1], components[i - 1].inflated); - + if (err != EOK) { printf("\n%s: Inflating error %d, halting.\n", @@ -148,30 +148,30 @@ } } - + printf(".\n"); - + printf("Setting up boot allocator ...\n"); balloc_init(&bootinfo.ballocs, balloc_base, PA2KA(balloc_start), BALLOC_MAX_SIZE); - + printf("Setting up screens ...\n"); ofw_setup_screens(); - + printf("Canonizing OpenFirmware device tree ...\n"); bootinfo.ofw_root = ofw_tree_build(); - + printf("Setting up translate table ...\n"); for (i = 0; i < pages; i++) { uintptr_t off = i << PAGE_WIDTH; void *phys; - + if (off < balloc_start) phys = ofw_translate(inflate_base + off); else phys = ofw_translate(balloc_base + off - balloc_start); - + ((void **) transtable)[i] = phys; } - + printf("Booting the kernel...\n"); jump_to_kernel(bootinfo_pa, transtable_pa, pages, real_mode_pa); Index: boot/arch/ppc32/src/ofw.c =================================================================== --- boot/arch/ppc32/src/ofw.c (revision 4646710d9ea7943ec02c77020e7b60258fd30d8b) +++ boot/arch/ppc32/src/ofw.c (revision 1033d1fbada20027b76c48da5df9154d3a23932b) @@ -43,5 +43,5 @@ if (ch == '\n') ofw_putchar('\r'); - + if (ascii_check(ch)) ofw_putchar(ch);