From owner-svn-src-head@freebsd.org  Thu May 31 11:11:24 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4FCB4F72715;
 Thu, 31 May 2018 11:11:24 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 0586F7E3FB;
 Thu, 31 May 2018 11:11:24 +0000 (UTC)
 (envelope-from andrew@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DC50719676;
 Thu, 31 May 2018 11:11:23 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4VBBNKe021998;
 Thu, 31 May 2018 11:11:23 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4VBBNqY021988;
 Thu, 31 May 2018 11:11:23 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201805311111.w4VBBNqY021988@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Thu, 31 May 2018 11:11:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r334420 - head/sys/arm64/arm64
X-SVN-Group: head
X-SVN-Commit-Author: andrew
X-SVN-Commit-Paths: head/sys/arm64/arm64
X-SVN-Commit-Revision: 334420
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 May 2018 11:11:24 -0000

Author: andrew
Date: Thu May 31 11:11:23 2018
New Revision: 334420
URL: https://svnweb.freebsd.org/changeset/base/334420

Log:
  Fix the memory attribute for EFI_MD_ATTR_UC on arm64.
  
  This is defined as Device-nGnRnE in the UEFI spec (UEFI 2.4, section
  2.3.6.1). This is the VM_MEMATTR_DEVICE type in FreeBSD.
  
  Reported by:	tuexen
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/arm64/arm64/efirt_machdep.c

Modified: head/sys/arm64/arm64/efirt_machdep.c
==============================================================================
--- head/sys/arm64/arm64/efirt_machdep.c	Thu May 31 09:56:02 2018	(r334419)
+++ head/sys/arm64/arm64/efirt_machdep.c	Thu May 31 11:11:23 2018	(r334420)
@@ -196,7 +196,7 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int 
 		else if ((p->md_attr & EFI_MD_ATTR_WC) != 0)
 			mode = VM_MEMATTR_WRITE_COMBINING;
 		else if ((p->md_attr & EFI_MD_ATTR_UC) != 0)
-			mode = VM_MEMATTR_UNCACHEABLE;
+			mode = VM_MEMATTR_DEVICE;
 		else {
 			if (bootverbose)
 				printf("EFI Runtime entry %d mapping "