From owner-svn-src-all@FreeBSD.ORG  Sun Jul 29 08:52:33 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 54384106564A;
	Sun, 29 Jul 2012 08:52:33 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3F3068FC12;
	Sun, 29 Jul 2012 08:52:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6T8qX0s028833;
	Sun, 29 Jul 2012 08:52:33 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6T8qXNq028831;
	Sun, 29 Jul 2012 08:52:33 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201207290852.q6T8qXNq028831@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 29 Jul 2012 08:52:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238884 - head/sys/dev/ath
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Jul 2012 08:52:33 -0000

Author: adrian
Date: Sun Jul 29 08:52:32 2012
New Revision: 238884
URL: http://svn.freebsd.org/changeset/base/238884

Log:
  Fix breakage introduced in r238824 - correctly calculate the descriptor
  wrapping.
  
  The previous code was only wrapping descriptor "block" boundaries rather
  than individual descriptors.  It sounds equivalent but it isn't.
  
  r238824 changed the descriptor allocation to enforce that an individual
  descriptor doesn't wrap a 4KiB boundary rather than the whole block
  of descriptors.  Eg, for TX descriptors, they're allocated in blocks
  of 10 descriptors for each ath_buf (for scatter/gather DMA.)

Modified:
  head/sys/dev/ath/if_ath.c

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Sun Jul 29 06:34:45 2012	(r238883)
+++ head/sys/dev/ath/if_ath.c	Sun Jul 29 08:52:32 2012	(r238884)
@@ -2914,7 +2914,7 @@ ath_descdma_setup(struct ath_softc *sc,
 			 * in the descriptor.
 			 */
 			 if (ATH_DESC_4KB_BOUND_CHECK(bf->bf_daddr,
-			     dd->dd_descsize * ndesc)) {
+			     dd->dd_descsize)) {
 				/* Start at the next page */
 				ds += 0x1000 - (bf->bf_daddr & 0xFFF);
 				bf->bf_desc = (struct ath_desc *) ds;
@@ -2932,6 +2932,12 @@ ath_descdma_setup(struct ath_softc *sc,
 		bf->bf_lastds = bf->bf_desc;	/* Just an initial value */
 		TAILQ_INSERT_TAIL(head, bf, bf_list);
 	}
+
+	/*
+	 * XXX TODO: ensure that ds doesn't overflow the descriptor
+	 * allocation otherwise weird stuff will occur and crash your
+	 * machine.
+	 */
 	return 0;
 	/* XXX this should likely just call ath_descdma_cleanup() */
 fail3: