From owner-svn-src-all@freebsd.org Fri Nov 24 23:41:05 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98D2FDF4214; Fri, 24 Nov 2017 23:41:05 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 7262C68F90; Fri, 24 Nov 2017 23:41:05 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAONf4Hc082661; Fri, 24 Nov 2017 23:41:04 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAONf4HW082657; Fri, 24 Nov 2017 23:41:04 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201711242341.vAONf4HW082657@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Fri, 24 Nov 2017 23:41:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326182 - in head/stand: ofw/libofw powerpc/kboot powerpc/ps3 X-SVN-Group: head X-SVN-Commit-Author: nwhitehorn X-SVN-Commit-Paths: in head/stand: ofw/libofw powerpc/kboot powerpc/ps3 X-SVN-Commit-Revision: 326182 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Nov 2017 23:41:05 -0000 Author: nwhitehorn Date: Fri Nov 24 23:41:04 2017 New Revision: 326182 URL: https://svnweb.freebsd.org/changeset/base/326182 Log: 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 Modified: head/stand/ofw/libofw/elf_freebsd.c head/stand/ofw/libofw/ppc64_elf_freebsd.c head/stand/powerpc/kboot/ppc64_elf_freebsd.c head/stand/powerpc/ps3/ppc64_elf_freebsd.c Modified: head/stand/ofw/libofw/elf_freebsd.c ============================================================================== --- head/stand/ofw/libofw/elf_freebsd.c Fri Nov 24 19:57:13 2017 (r326181) +++ head/stand/ofw/libofw/elf_freebsd.c Fri Nov 24 23:41:04 2017 (r326182) @@ -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"); Modified: head/stand/ofw/libofw/ppc64_elf_freebsd.c ============================================================================== --- head/stand/ofw/libofw/ppc64_elf_freebsd.c Fri Nov 24 19:57:13 2017 (r326181) +++ head/stand/ofw/libofw/ppc64_elf_freebsd.c Fri Nov 24 23:41:04 2017 (r326182) @@ -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"); Modified: head/stand/powerpc/kboot/ppc64_elf_freebsd.c ============================================================================== --- head/stand/powerpc/kboot/ppc64_elf_freebsd.c Fri Nov 24 19:57:13 2017 (r326181) +++ head/stand/powerpc/kboot/ppc64_elf_freebsd.c Fri Nov 24 23:41:04 2017 (r326182) @@ -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); Modified: head/stand/powerpc/ps3/ppc64_elf_freebsd.c ============================================================================== --- head/stand/powerpc/ps3/ppc64_elf_freebsd.c Fri Nov 24 19:57:13 2017 (r326181) +++ head/stand/powerpc/ps3/ppc64_elf_freebsd.c Fri Nov 24 23:41:04 2017 (r326182) @@ -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"); }