From owner-svn-src-head@freebsd.org  Fri Dec 30 16:06:06 2016
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F0A15C9751B;
 Fri, 30 Dec 2016 16:06:06 +0000 (UTC) (envelope-from br@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 C05FB1DB7;
 Fri, 30 Dec 2016 16:06:06 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBUG65Qa067227;
 Fri, 30 Dec 2016 16:06:05 GMT (envelope-from br@FreeBSD.org)
Received: (from br@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBUG65MI067225;
 Fri, 30 Dec 2016 16:06:05 GMT (envelope-from br@FreeBSD.org)
Message-Id: <201612301606.uBUG65MI067225@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org
 using -f
From: Ruslan Bukin <br@FreeBSD.org>
Date: Fri, 30 Dec 2016 16:06:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r310824 - head/sys/dev/xdma
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.23
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: Fri, 30 Dec 2016 16:06:07 -0000

Author: br
Date: Fri Dec 30 16:06:05 2016
New Revision: 310824
URL: https://svnweb.freebsd.org/changeset/base/310824

Log:
  o Fix unlocking.
  o Fix types for ds_addr/ds_len.
  
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/dev/xdma/xdma.c
  head/sys/dev/xdma/xdma.h

Modified: head/sys/dev/xdma/xdma.c
==============================================================================
--- head/sys/dev/xdma/xdma.c	Fri Dec 30 14:54:54 2016	(r310823)
+++ head/sys/dev/xdma/xdma.c	Fri Dec 30 16:06:05 2016	(r310824)
@@ -412,7 +412,7 @@ xdma_prep_memcpy(xdma_channel_t *xchan, 
 	if (ret != 0) {
 		device_printf(xdma->dev,
 		    "%s: Can't prepare memcpy transfer.\n", __func__);
-		XDMA_UNLOCK();
+		XCHAN_UNLOCK(xchan);
 
 		return (-1);
 	}
@@ -460,7 +460,8 @@ xdma_prep_cyclic(xdma_channel_t *xchan, 
 	if (ret != 0) {
 		device_printf(xdma->dev,
 		    "%s: Can't prepare cyclic transfer.\n", __func__);
-		XDMA_UNLOCK();
+		XCHAN_UNLOCK(xchan);
+
 		return (-1);
 	}
 

Modified: head/sys/dev/xdma/xdma.h
==============================================================================
--- head/sys/dev/xdma/xdma.h	Fri Dec 30 14:54:54 2016	(r310823)
+++ head/sys/dev/xdma/xdma.h	Fri Dec 30 16:06:05 2016	(r310824)
@@ -77,8 +77,8 @@ struct xdma_channel_config {
 typedef struct xdma_channel_config xdma_config_t;
 
 struct xdma_descriptor {
-	uintptr_t	ds_addr;
-	uint32_t	ds_len;
+	bus_addr_t	ds_addr;
+	bus_size_t	ds_len;
 };
 
 typedef struct xdma_descriptor xdma_descriptor_t;