From owner-svn-src-projects@FreeBSD.ORG  Mon Sep  1 18:25:35 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 1738DC34;
 Mon,  1 Sep 2014 18:25:35 +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 F0ADA1EDA;
 Mon,  1 Sep 2014 18:25:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s81IPYeH081356;
 Mon, 1 Sep 2014 18:25:34 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s81IPYxq081355;
 Mon, 1 Sep 2014 18:25:34 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201409011825.s81IPYxq081355@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Mon, 1 Sep 2014 18:25:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r270936 - projects/arm64/sys/arm64/arm64
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.18-1
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: Mon, 01 Sep 2014 18:25:35 -0000

Author: andrew
Date: Mon Sep  1 18:25:34 2014
New Revision: 270936
URL: http://svnweb.freebsd.org/changeset/base/270936

Log:
  Fix pmap_invalidate_page and pmap_invalidate_range, the addresses need
  to be be shifted to get them in the correct location in the register.

Modified:
  projects/arm64/sys/arm64/arm64/pmap.c

Modified: projects/arm64/sys/arm64/arm64/pmap.c
==============================================================================
--- projects/arm64/sys/arm64/arm64/pmap.c	Mon Sep  1 16:51:57 2014	(r270935)
+++ projects/arm64/sys/arm64/arm64/pmap.c	Mon Sep  1 18:25:34 2014	(r270936)
@@ -1484,10 +1484,10 @@ pmap_invalidate_page(pmap_t pmap, vm_off
 
 	__asm __volatile(
 	    "dsb  sy		\n"
-	    "tlbi vae1, %0	\n"
+	    "tlbi vaae1, %0	\n"
 	    "dsb  sy		\n"
 	    "isb		\n"
-	    : : "r"(va));
+	    : : "r"(va >> PAGE_SHIFT));
 }
 
 PMAP_INLINE void
@@ -1496,10 +1496,12 @@ pmap_invalidate_range(pmap_t pmap, vm_of
 	vm_offset_t addr;
 
 	if (pmap == kernel_pmap) {
+		sva >>= PAGE_SHIFT;
+		eva >>= PAGE_SHIFT;
 		__asm __volatile("dsb	sy");
-		for (addr = sva; addr < eva; addr += PAGE_SIZE) {
+		for (addr = sva; addr < eva; addr++) {
 			__asm __volatile(
-			    "tlbi vae1, %0" : : "r"(addr));
+			    "tlbi vaae1, %0" : : "r"(addr));
 		}
 		__asm __volatile(
 		    "dsb  sy	\n"