From owner-svn-src-projects@FreeBSD.ORG  Sat Feb 15 18:07:32 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 89562EB8;
 Sat, 15 Feb 2014 18:07:32 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 74C921BE0;
 Sat, 15 Feb 2014 18:07:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1FI7WP5038982;
 Sat, 15 Feb 2014 18:07:32 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1FI7WfC038981;
 Sat, 15 Feb 2014 18:07:32 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201402151807.s1FI7WfC038981@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sat, 15 Feb 2014 18:07:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r261942 - projects/arm64/sys/boot/arm64/efi
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Feb 2014 18:07:32 -0000

Author: andrew
Date: Sat Feb 15 18:07:31 2014
New Revision: 261942
URL: http://svnweb.freebsd.org/changeset/base/261942

Log:
  Implement elf64_exec on arm64.

Modified:
  projects/arm64/sys/boot/arm64/efi/exec.c

Modified: projects/arm64/sys/boot/arm64/efi/exec.c
==============================================================================
--- projects/arm64/sys/boot/arm64/efi/exec.c	Sat Feb 15 18:06:49 2014	(r261941)
+++ projects/arm64/sys/boot/arm64/efi/exec.c	Sat Feb 15 18:07:31 2014	(r261942)
@@ -39,6 +39,8 @@ __FBSDID("$FreeBSD$");
 #include <efi.h>
 #include <efilib.h>
 
+#include "libarm64.h"
+
 static int elf64_exec(struct preloaded_file *amp);
 static int elf64_obj_exec(struct preloaded_file *amp);
 
@@ -55,8 +57,38 @@ struct file_format *file_formats[] = {
 static int
 elf64_exec(struct preloaded_file *fp)
 {
-	printf("elf64_exec\n");
-	return (EINVAL);
+	struct file_metadata *md;
+	EFI_STATUS status;
+	UINTN descsz, memmapsz, mapkey;
+	UINT32 descver;
+	Elf_Ehdr *ehdr;
+	void (*entry)(void *);
+
+	if ((md = file_findmetadata(fp, MODINFOMD_ELFHDR)) == NULL)
+        	return(EFTYPE);
+
+	ehdr = (Elf_Ehdr *)&(md->md_data);
+
+	entry = arm64_efi_translate(ehdr->e_entry);
+
+	memmapsz = 0;
+	status = BS->GetMemoryMap(&memmapsz, NULL, &mapkey, &descsz, &descver);
+        if (EFI_ERROR(status) && status != EFI_BUFFER_TOO_SMALL) {
+		printf("%s: GetMemoryMap() returned 0x%lx\n", __func__,
+		    (long)status);
+		return (EINVAL);
+	}
+
+	status = BS->ExitBootServices(IH, mapkey);
+        if (EFI_ERROR(status)) {
+		printf("%s: ExitBootServices() returned 0x%lx\n", __func__,
+		    (long)status);
+		return (EINVAL);
+	}
+
+	/* TODO: Pass the required metadata to the kernel */
+	(*entry)(NULL);
+	panic("exec returned");
 }
 
 static int