From owner-svn-src-projects@FreeBSD.ORG  Sun Feb 23 18:45:05 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7A03599C;
 Sun, 23 Feb 2014 18:45:05 +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 652A9192E;
 Sun, 23 Feb 2014 18:45:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1NIj5Fx072931;
 Sun, 23 Feb 2014 18:45:05 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1NIj5wC072930;
 Sun, 23 Feb 2014 18:45:05 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201402231845.s1NIj5wC072930@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sun, 23 Feb 2014 18:45:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r262379 - 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: Sun, 23 Feb 2014 18:45:05 -0000

Author: andrew
Date: Sun Feb 23 18:45:04 2014
New Revision: 262379
URL: http://svnweb.freebsd.org/changeset/base/262379

Log:
  Round the address we load the kernel to to be 2MiB aligned

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

Modified: projects/arm64/sys/boot/arm64/efi/copy.c
==============================================================================
--- projects/arm64/sys/boot/arm64/efi/copy.c	Sun Feb 23 18:44:10 2014	(r262378)
+++ projects/arm64/sys/boot/arm64/efi/copy.c	Sun Feb 23 18:45:04 2014	(r262379)
@@ -56,6 +56,9 @@ arm64_efi_copy_init(void)
 		    status & EFI_ERROR_MASK);
 		return (status);
 	}
+	/* Round the kernel load address to a 2MiB value */
+	staging = roundup2(staging, 2 * 1024 * 1024);
+
 
 	return (0);
 }
@@ -92,6 +95,6 @@ ssize_t
 arm64_efi_readin(const int fd, vm_offset_t dest, const size_t len)
 {
 
-	return (read(fd, (void *)(dest + stage_offset), len));
+	return (read(fd, arm64_efi_translate(dest), len));
 }