From 28b2cf37b90ab77d9c3056606c3bcbac98634c8b Mon Sep 17 00:00:00 2001 From: Nathan Whitehorn Date: Fri, 24 Nov 2017 23:41:04 +0000 Subject: [PATCH] Modify all FreeBSD bootloaders on PowerPC AIM (Book-S) systems to pass a magic number to the kernel in r7 rather than the (currently unused and irrelevant) width of the metadata pointer, which I believe was intended for a never-used approach to the 64-bit port. This enables the kernel, in a future commit, to switch on the cookie to distinguish a real metadata pointer from loader(8) from garbage left in r6 by some other boot loader. MFC after: 3 weeks --- stand/ofw/libofw/elf_freebsd.c | 2 +- stand/ofw/libofw/ppc64_elf_freebsd.c | 6 +++--- stand/powerpc/kboot/ppc64_elf_freebsd.c | 2 +- stand/powerpc/ps3/ppc64_elf_freebsd.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stand/ofw/libofw/elf_freebsd.c b/stand/ofw/libofw/elf_freebsd.c index 80ece7eeba46..9a53300a06c3 100644 --- a/stand/ofw/libofw/elf_freebsd.c +++ b/stand/ofw/libofw/elf_freebsd.c @@ -91,7 +91,7 @@ __elfN(ofw_exec)(struct preloaded_file *fp) mdp, sizeof(mdp)); } else { OF_chain((void *)reloc, end - (char *)reloc, (void *)entry, - (void *)mdp, sizeof(mdp)); + (void *)mdp, 0xfb5d104d); } panic("exec returned"); diff --git a/stand/ofw/libofw/ppc64_elf_freebsd.c b/stand/ofw/libofw/ppc64_elf_freebsd.c index b411da491222..8ac612a9f657 100644 --- a/stand/ofw/libofw/ppc64_elf_freebsd.c +++ b/stand/ofw/libofw/ppc64_elf_freebsd.c @@ -93,11 +93,11 @@ ppc64_ofw_elf_exec(struct preloaded_file *fp) if (dtbp != 0) { OF_quiesce(); - ((int (*)(u_long, u_long, u_long, void *, u_long))entry)(dtbp, 0, 0, - mdp, sizeof(mdp)); + ((int (*)(u_long, u_long, u_long, void *, u_long))entry)(dtbp, + 0, 0, mdp, 0xfb5d104d); } else { OF_chain((void *)reloc, end - (char *)reloc, (void *)entry, - (void *)mdp, sizeof(mdp)); + (void *)mdp, 0xfb5d104d); } panic("exec returned"); diff --git a/stand/powerpc/kboot/ppc64_elf_freebsd.c b/stand/powerpc/kboot/ppc64_elf_freebsd.c index 22fa7b576775..1ac0d9eb4b8b 100644 --- a/stand/powerpc/kboot/ppc64_elf_freebsd.c +++ b/stand/powerpc/kboot/ppc64_elf_freebsd.c @@ -96,7 +96,7 @@ ppc64_elf_exec(struct preloaded_file *fp) trampoline[3] = dtb; trampoline[6] = mdp; - trampoline[7] = sizeof(mdp); + trampoline[7] = 0xfb5d104d; printf("Kernel entry at %#jx (%#x) ...\n", e->e_entry, trampoline[2]); printf("DTB at %#x, mdp at %#x\n", dtb, mdp); diff --git a/stand/powerpc/ps3/ppc64_elf_freebsd.c b/stand/powerpc/ps3/ppc64_elf_freebsd.c index 3eb991e10ae9..2fbb30de1179 100644 --- a/stand/powerpc/ps3/ppc64_elf_freebsd.c +++ b/stand/powerpc/ps3/ppc64_elf_freebsd.c @@ -89,7 +89,7 @@ ppc64_elf_exec(struct preloaded_file *fp) dev_cleanup(); entry(0 /* FDT */, 0 /* Phys. mem offset */, 0 /* OF entry */, - (void *)mdp, sizeof(mdp)); + (void *)mdp, 0xfb5d104d); panic("exec returned"); }