1 files changed, 29 insertions, 117 deletions

diff --git a/sys/boot/ia64/common/exec.c b/sys/boot/ia64/common/exec.c
index 93cfdbd..a5a02d4 100644
--- a/sys/boot/ia64/common/exec.c
+++ b/sys/boot/ia64/common/exec.c
@@ -1,73 +1,27 @@
-/* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */
-
 /*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
+ * Copyright (c) 2006 Marcel Moolenaar
  * All rights reserved.
  *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
  *
- *	@(#)boot.c	8.1 (Berkeley) 6/10/93
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
@@ -79,10 +33,11 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/linker.h>
 #include <machine/elf.h>
-#include <machine/bootinfo.h>
 #include <machine/ia64_cpu.h>
 #include <machine/pte.h>
-#include <machine/vmparam.h>
+
+#include <ia64/include/bootinfo.h>
+#include <ia64/include/vmparam.h>
 
 #include <efi.h>
 #include <efilib.h>
@@ -95,28 +50,12 @@ static int	elf64_exec(struct preloaded_file *amp);
 
 struct file_format ia64_elf = { elf64_loadfile, elf64_exec };
 
-static __inline u_int64_t
-disable_ic()
-{
-	u_int64_t psr;
-	__asm __volatile("mov %0=psr;;" : "=r" (psr));
-	__asm __volatile("rsm psr.ic|psr.i;; srlz.i;;");
-	return psr;
-}
-
-static __inline void
-restore_ic(u_int64_t psr)
-{
-	__asm __volatile("mov psr.l=%0;; srlz.i" :: "r" (psr));
-}
-
 /*
  * Entered with psr.ic and psr.i both zero.
  */
 void
-enter_kernel(u_int64_t start, struct bootinfo *bi)
+enter_kernel(uint64_t start, uint64_t bi)
 {
-	u_int64_t		psr;
 
 	__asm __volatile("srlz.i;;");
 	__asm __volatile("mov cr.ipsr=%0"
@@ -130,6 +69,8 @@ enter_kernel(u_int64_t start, struct bootinfo *bi)
 	__asm __volatile("mov ar.rsc=0;; flushrs;;");
 	__asm __volatile("mov r8=%0" :: "r" (bi));
 	__asm __volatile("rfi;;");
+
+	/* NOTREACHED */
 }
 
 static int
@@ -138,51 +79,21 @@ elf64_exec(struct preloaded_file *fp)
 	struct file_metadata	*md;
 	Elf_Ehdr		*hdr;
 	pt_entry_t		pte;
-	struct bootinfo		*bi;
-	u_int64_t		psr;
-	UINTN			mapkey, pages, size;
-	UINTN			descsz;
-	UINT32			descver;
-	EFI_STATUS		status;
-
-	if ((md = file_findmetadata(fp, MODINFOMD_ELFHDR)) == NULL)
-		return(EFTYPE);			/* XXX actually EFUCKUP */
+	uint64_t		bi_addr;
+
+	md = file_findmetadata(fp, MODINFOMD_ELFHDR);
+	if (md == NULL)
+		return (EINVAL);
 	hdr = (Elf_Ehdr *)&(md->md_data);
 
-	/*
-	 * Allocate enough pages to hold the bootinfo block and the memory
-	 * map EFI will return to us. The memory map has an unknown size,
-	 * so we have to determine that first. Note that the AllocatePages
-	 * call can itself modify the memory map, so we have to take that
-	 * into account as well. The changes to the memory map are caused
-	 * by splitting a range of free memory into two (AFAICT), so that
-	 * one is marked as being loader data.
-	 */
-	size = 0;
-	descsz = sizeof(EFI_MEMORY_DESCRIPTOR);
-	BS->GetMemoryMap(&size, NULL, &mapkey, &descsz, &descver);
-	size += descsz + ((sizeof(struct bootinfo) + 0x0f) & ~0x0f);
-	pages = EFI_SIZE_TO_PAGES(size);
-	status = BS->AllocatePages(AllocateAnyPages, EfiLoaderData, pages,
-	    (void*)&bi);
-	if (EFI_ERROR(status)) {
-		printf("unable to create bootinfo block (status=0x%lx)\n",
-		    (long)status);
-		return (ENOMEM);
-	}
-
-	bzero(bi, sizeof(struct bootinfo));
-	bi_load(bi, fp, &mapkey, pages);
+	bi_load(fp, &bi_addr);
 
 	printf("Entering %s at 0x%lx...\n", fp->f_name, hdr->e_entry);
 
-	status = BS->ExitBootServices(IH, mapkey);
-	if (EFI_ERROR(status)) {
-		printf("ExitBootServices returned 0x%lx\n", status);
-		return (EINVAL);
-	}
+	ldr_enter(fp->f_name);
 
-	psr = disable_ic();
+	__asm __volatile("rsm psr.ic|psr.i;;");
+	__asm __volatile("srlz.i;;");
 
 	/*
 	 * Region 6 is direct mapped UC and region 7 is direct mapped
@@ -206,7 +117,8 @@ elf64_exec(struct preloaded_file *fp)
 	__asm __volatile("itr.d dtr[%0]=%1;;" :: "r"(0), "r"(pte));
 	__asm __volatile("srlz.i;;");
 
-	enter_kernel(hdr->e_entry, bi);
+	enter_kernel(hdr->e_entry, bi_addr);
 
-	restore_ic(psr);
+	/* NOTREACHED */
+	return (0);
 }