From owner-svn-src-all@FreeBSD.ORG  Sat Mar 26 22:39:23 2011
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 747E4106566B;
	Sat, 26 Mar 2011 22:39:23 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 656A98FC08;
	Sat, 26 Mar 2011 22:39:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2QMdNRK039295;
	Sat, 26 Mar 2011 22:39:23 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2QMdNVn039293;
	Sat, 26 Mar 2011 22:39:23 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201103262239.p2QMdNVn039293@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 26 Mar 2011 22:39:23 +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: r220046 - head/sys/dev/dc
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: Sat, 26 Mar 2011 22:39:23 -0000

Author: marius
Date: Sat Mar 26 22:39:23 2011
New Revision: 220046
URL: http://svn.freebsd.org/changeset/base/220046

Log:
  Wait until the DMA engine is stopped before unmapping buffers and
  descriptors, which fixes DMA errors seen on sparc64.
  
  Obtained from:	OpenBSD
  MFC after:	1 week

Modified:
  head/sys/dev/dc/if_dc.c

Modified: head/sys/dev/dc/if_dc.c
==============================================================================
--- head/sys/dev/dc/if_dc.c	Sat Mar 26 21:32:10 2011	(r220045)
+++ head/sys/dev/dc/if_dc.c	Sat Mar 26 22:39:23 2011	(r220046)
@@ -3917,7 +3917,7 @@ dc_stop(struct dc_softc *sc)
 	struct dc_list_data *ld;
 	struct dc_chain_data *cd;
 	int i;
-	uint32_t ctl;
+	uint32_t ctl, isr;
 
 	DC_LOCK_ASSERT(sc);
 
@@ -3932,6 +3932,30 @@ dc_stop(struct dc_softc *sc)
 	ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
 
 	DC_CLRBIT(sc, DC_NETCFG, (DC_NETCFG_RX_ON | DC_NETCFG_TX_ON));
+
+	for (i = 0; i < DC_TIMEOUT; i++) {
+		isr = CSR_READ_4(sc, DC_ISR);
+		if ((isr & DC_ISR_TX_IDLE ||
+		    (isr & DC_ISR_TX_STATE) == DC_TXSTATE_RESET) &&
+		    (isr & DC_ISR_RX_STATE) == DC_RXSTATE_STOPPED)
+			break;
+		DELAY(10);
+	}
+
+	if (i == DC_TIMEOUT) {
+		if (!((isr & DC_ISR_TX_IDLE) ||
+		    (isr & DC_ISR_TX_STATE) == DC_TXSTATE_RESET) &&
+		    !DC_IS_ASIX(sc) && !DC_IS_DAVICOM(sc))
+			device_printf(sc->dc_dev,
+			    "%s: failed to force tx to idle state\n",
+			    __func__);
+		if (!((isr & DC_ISR_RX_STATE) == DC_RXSTATE_STOPPED) &&
+		    !DC_HAS_BROKEN_RXSTATE(sc))
+			device_printf(sc->dc_dev,
+			    "%s: failed to force rx to idle state\n",
+			    __func__);
+	}
+
 	CSR_WRITE_4(sc, DC_IMR, 0x00000000);
 	CSR_WRITE_4(sc, DC_TXADDR, 0x00000000);
 	CSR_WRITE_4(sc, DC_RXADDR, 0x00000000);