From owner-svn-src-stable@freebsd.org  Wed Aug 31 17:30:22 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B6D2BCAE1D;
 Wed, 31 Aug 2016 17:30:22 +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 mx1.freebsd.org (Postfix) with ESMTPS id 2D8D5637;
 Wed, 31 Aug 2016 17:30:22 +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 u7VHUL5o024800;
 Wed, 31 Aug 2016 17:30:21 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7VHUL4f024798;
 Wed, 31 Aug 2016 17:30:21 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201608311730.u7VHUL4f024798@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: Wed, 31 Aug 2016 17:30:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r305135 - in stable/11/sys/arm64: arm64 include
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Aug 2016 17:30:22 -0000

Author: andrew
Date: Wed Aug 31 17:30:21 2016
New Revision: 305135
URL: https://svnweb.freebsd.org/changeset/base/305135

Log:
  MFC 302789:
  Add memmmap on arm64 so we can mmap /dev/mem and /dev/kmem.

Modified:
  stable/11/sys/arm64/arm64/mem.c
  stable/11/sys/arm64/include/memdev.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm64/arm64/mem.c
==============================================================================
--- stable/11/sys/arm64/arm64/mem.c	Wed Aug 31 16:56:54 2016	(r305134)
+++ stable/11/sys/arm64/arm64/mem.c	Wed Aug 31 17:30:21 2016	(r305135)
@@ -114,3 +114,19 @@ memrw(struct cdev *dev, struct uio *uio,
 	return (error);
 }
 
+/*
+ * allow user processes to MMAP some memory sections
+ * instead of going through read/write
+ */
+/* ARGSUSED */
+int
+memmmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
+    int prot __unused, vm_memattr_t *memattr __unused)
+{
+	if (dev2unit(dev) == CDEV_MINOR_MEM)
+		*paddr = offset;
+	else if (dev2unit(dev) == CDEV_MINOR_KMEM)
+		*paddr = vtophys(offset);
+	/* else panic! */
+	return (0);
+}

Modified: stable/11/sys/arm64/include/memdev.h
==============================================================================
--- stable/11/sys/arm64/include/memdev.h	Wed Aug 31 16:56:54 2016	(r305134)
+++ stable/11/sys/arm64/include/memdev.h	Wed Aug 31 17:30:21 2016	(r305135)
@@ -35,6 +35,6 @@
 d_open_t	memopen;
 d_read_t	memrw;
 #define		memioctl	(d_ioctl_t *)NULL
-#define		memmmap		(d_mmap_t *)NULL
+d_mmap_t	memmmap;
 
 #endif /* _MACHINE_MEMDEV_H_ */