Changeset 4db05ea in mainline

Timestamp:

2018-10-20T16:09:17Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

566457ad

Parents:

2cea4c58

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-18 18:45:48)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-20 16:09:17)

Message:

Pass ppc32 kernel entry point from C code

Location:

boot/arch/ppc32

Files:

• include/arch/asm.h (modified) (1 diff)
• src/asm.S (modified) (4 diffs)
• src/main.c (modified) (1 diff)

boot/arch/ppc32/include/arch/asm.h

@@ -33 +33 @@
 #include <arch/main.h>
 
-extern void jump_to_kernel(void *, void *, size_t, void *)
+extern void jump_to_kernel(void *, void *, size_t, void *, uintptr_t)
     __attribute__((noreturn));
 extern void real_mode(void);

boot/arch/ppc32/src/asm.S

@@ -127 +127 @@
         # r5 = pages to translate
         # r6 = real mode meeting point (physical address)
+        # r7 = kernel entry point (virtual address in kernel's address space)
 
         # disable interrupts
@@ -160 +161 @@
         # r4 = translate table (physical address)
         # r5 = pages to translate
+        # r7 = kernel entry point (virtual address in kernel's address space)
 
         # move the images of components to the proper
@@ -399 +401 @@
         # start the kernel
         #
-        # pc = PA2KA(BOOT_OFFSET)
+        # pc = kernel's entry point (r7)
         # r3 = bootinfo (physical address)
         # sprg0 = BOOT_OFFSET
@@ -405 +407 @@
         # 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
+        mtspr srr0, r7
 
         lis r31, BOOT_OFFSET@ha

boot/arch/ppc32/src/main.c

@@ -135 +135 @@
 
         printf("Booting the kernel...\n");
-        jump_to_kernel(bootinfo_pa, transtable_pa, pages, real_mode_pa);
+        jump_to_kernel(bootinfo_pa, transtable_pa, pages, real_mode_pa,
+            PA2KA(BOOT_OFFSET));
 }