From owner-svn-src-user@FreeBSD.ORG Tue Dec 30 17:30:48 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CEF13D78; Tue, 30 Dec 2014 17:30:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BA90F16C; Tue, 30 Dec 2014 17:30:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBUHUmeb048774; Tue, 30 Dec 2014 17:30:48 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBUHUmmo048771; Tue, 30 Dec 2014 17:30:48 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201412301730.sBUHUmmo048771@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Tue, 30 Dec 2014 17:30:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r276413 - user/nwhitehorn/kboot/powerpc/kboot X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Dec 2014 17:30:49 -0000 Author: nwhitehorn Date: Tue Dec 30 17:30:47 2014 New Revision: 276413 URL: https://svnweb.freebsd.org/changeset/base/276413 Log: Lay out first steps for launch trampoline. Added: user/nwhitehorn/kboot/powerpc/kboot/kerneltramp.S (contents, props changed) Modified: user/nwhitehorn/kboot/powerpc/kboot/Makefile user/nwhitehorn/kboot/powerpc/kboot/ppc64_elf_freebsd.c Modified: user/nwhitehorn/kboot/powerpc/kboot/Makefile ============================================================================== --- user/nwhitehorn/kboot/powerpc/kboot/Makefile Tue Dec 30 16:55:53 2014 (r276412) +++ user/nwhitehorn/kboot/powerpc/kboot/Makefile Tue Dec 30 17:30:47 2014 (r276413) @@ -10,7 +10,7 @@ INSTALLFLAGS= -b # Architecture-specific loader code SRCS= conf.c metadata.c vers.c main.c ppc64_elf_freebsd.c -SRCS+= host_syscall.S hostcons.c hostdisk.c +SRCS+= host_syscall.S hostcons.c hostdisk.c kerneltramp.S SRCS+= ucmpdi2.c LOADER_DISK_SUPPORT?= yes Added: user/nwhitehorn/kboot/powerpc/kboot/kerneltramp.S ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/nwhitehorn/kboot/powerpc/kboot/kerneltramp.S Tue Dec 30 17:30:47 2014 (r276413) @@ -0,0 +1,38 @@ +/* + * This is the analog to the kexec "purgatory" code + * + * The goal here is to call the actual kernel entry point with the arguments it + * expects when kexec calls into it with no arguments. The value of the kernel + * entry point and arguments r3-r7 are copied into the trampoline text (which can + * be executed from any address) at bytes 8-32. + * + * TODO: + * - This may or may not need to relocate the kernel before executing it + * - kexec enters at address 0x60 for all APs. We need to catch these and hold + * them. + */ + +#include + + .globl CNAME(kerneltramp),CNAME(szkerneltramp) +CNAME(kerneltramp): + mflr %r9 + bl 1f + .space 24 /* branch address, r3-r7 */ +1: + mflr %r8 + mtlr %r9 + lwz %r3,0(%r8) + ld %r3,0(%r3) /* Resolve function descriptor */ + mtctr %r3 + lwz %r3,4(%r8) + lwz %r4,8(%r8) + lwz %r5,12(%r8) + lwz %r6,16(%r8) + lwz %r7,20(%r8) + bctr +endkerneltramp: + + .data +CNAME(szkerneltramp): + .long endkerneltramp - CNAME(kerneltramp) Modified: user/nwhitehorn/kboot/powerpc/kboot/ppc64_elf_freebsd.c ============================================================================== --- user/nwhitehorn/kboot/powerpc/kboot/ppc64_elf_freebsd.c Tue Dec 30 16:55:53 2014 (r276412) +++ user/nwhitehorn/kboot/powerpc/kboot/ppc64_elf_freebsd.c Tue Dec 30 17:30:47 2014 (r276413) @@ -41,6 +41,8 @@ __FBSDID("$FreeBSD$"); extern char end[]; extern vm_offset_t reloc; /* From /conf.c */ +extern void *kerneltramp; +extern size_t szkerneltramp; int ppc64_elf_loadfile(char *filename, u_int64_t dest, @@ -62,7 +64,7 @@ ppc64_elf_exec(struct preloaded_file *fp vm_offset_t mdp; Elf_Ehdr *e; int error; - int (*entry)(u_long, u_long, u_long, void *, u_long); + uint32_t *trampoline; if ((fmp = file_findmetadata(fp, MODINFOMD_ELFHDR)) == NULL) { return(EFTYPE); @@ -70,17 +72,24 @@ ppc64_elf_exec(struct preloaded_file *fp e = (Elf_Ehdr *)&fmp->md_data; /* Handle function descriptor */ - entry = (void *)(uintptr_t)(*(uint64_t *)e->e_entry); + trampoline = malloc(szkerneltramp); + memcpy(trampoline, &kerneltramp, szkerneltramp); + trampoline[2] = e->e_entry; + trampoline[3] = 0; /* FDT */ + trampoline[4] = 0; /* Phys. mem offset */ + trampoline[5] = 0; /* OF entry point */ if ((error = md_load64(fp->f_args, &mdp)) != 0) return (error); - printf("Kernel entry at %p ...\n", entry); + trampoline[6] = mdp; + trampoline[7] = sizeof(mdp); + printf("Kernel entry at %#x ...\n", e->e_entry); dev_cleanup(); - entry(0 /* FDT */, 0 /* Phys. mem offset */, 0 /* OF entry */, - (void *)mdp, sizeof(mdp)); + archsw.arch_copyin(trampoline, 0 /* XXX */, szkerneltramp); + /* XXX kexec_load, reboot */ panic("exec returned"); }