From owner-svn-src-head@FreeBSD.ORG  Mon Jun  8 22:01:35 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B56B29FD;
 Mon,  8 Jun 2015 22:01:35 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
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 A3CAF11EB;
 Mon,  8 Jun 2015 22:01:35 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t58M1Zpn086935;
 Mon, 8 Jun 2015 22:01:35 GMT (envelope-from marcel@FreeBSD.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t58M1Zdr086934;
 Mon, 8 Jun 2015 22:01:35 GMT (envelope-from marcel@FreeBSD.org)
Message-Id: <201506082201.t58M1Zdr086934@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marcel set sender to
 marcel@FreeBSD.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Mon, 8 Jun 2015 22:01:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284169 - head/tools/bus_space
X-SVN-Group: head
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.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2015 22:01:35 -0000

Author: marcel
Date: Mon Jun  8 22:01:34 2015
New Revision: 284169
URL: https://svnweb.freebsd.org/changeset/base/284169

Log:
  Map the allocated DMA memory into the address space.

Modified:
  head/tools/bus_space/busdma.c

Modified: head/tools/bus_space/busdma.c
==============================================================================
--- head/tools/bus_space/busdma.c	Mon Jun  8 21:47:44 2015	(r284168)
+++ head/tools/bus_space/busdma.c	Mon Jun  8 22:01:34 2015	(r284169)
@@ -61,7 +61,9 @@ struct obj {
 			unsigned long	datarate;
 		} tag;
 		struct {
-		} md;
+			unsigned long	physaddr;
+			void		*virtaddr;
+		} mem;
 	} u;
 };
 
@@ -260,6 +262,10 @@ bd_mem_alloc(int tid, u_int flags)
 	md->parent = tag;
 	tag->refcnt++;
 	md->key = ioc.result;
+	md->u.mem.physaddr = ioc.u.mem.physaddr;
+	md->u.mem.virtaddr = mmap(NULL, tag->u.tag.maxsz,
+	    PROT_READ | PROT_WRITE, MAP_NOCORE | MAP_SHARED, md->fd,
+	    md->u.mem.physaddr);
 	return (md->oid);
 }
 
@@ -273,6 +279,8 @@ bd_mem_free(int mdid)
 	if (md == NULL)
 		return (errno);
 
+	if (md->u.mem.virtaddr != MAP_FAILED)
+		munmap(md->u.mem.virtaddr, md->parent->u.tag.maxsz);
 	memset(&ioc, 0, sizeof(ioc));
 	ioc.request = PROTO_IOC_BUSDMA_MEM_FREE;
 	ioc.key = md->key;