From owner-p4-projects@FreeBSD.ORG  Fri Mar 10 00:43:41 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 922AE16A423; Fri, 10 Mar 2006 00:43:40 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 52CFE16A420
	for <perforce@freebsd.org>; Fri, 10 Mar 2006 00:43:40 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2075743D45
	for <perforce@freebsd.org>; Fri, 10 Mar 2006 00:43:40 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2A0hd1p041757
	for <perforce@freebsd.org>; Fri, 10 Mar 2006 00:43:39 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2A0hdPR041754
	for perforce@freebsd.org; Fri, 10 Mar 2006 00:43:39 GMT
	(envelope-from cognet@freebsd.org)
Date: Fri, 10 Mar 2006 00:43:39 GMT
Message-Id: <200603100043.k2A0hdPR041754@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 93084 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Mar 2006 00:43:41 -0000

http://perforce.freebsd.org/chv.cgi?CH=93084

Change 93084 by cognet@cognet on 2006/03/10 00:42:46

	Try to get non-cached memory for rx descriptors.

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/if_ate.c#37 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#37 (text+ko) ====

@@ -341,8 +341,8 @@
 	    &sc->sc_mtx, &sc->rx_desc_tag);
 	if (err != 0)
 		goto errout;
-	if (bus_dmamem_alloc(sc->rx_desc_tag, (void **)&sc->rx_descs, M_WAITOK,
-	    &sc->rx_desc_map) != 0)
+	if (bus_dmamem_alloc(sc->rx_desc_tag, (void **)&sc->rx_descs,
+	    BUS_DMA_NOWAIT | BUS_DMA_COHERENT, &sc->rx_desc_map) != 0)
 		goto errout;
 	if (bus_dmamap_load(sc->rx_desc_tag, sc->rx_desc_map, 
 	    sc->rx_descs, ATE_MAX_RX_BUFFERS * sizeof(eth_rx_desc_t),
@@ -801,7 +801,7 @@
 
 	if (bus_dmamap_load_mbuf_sg(sc->mtag, sc->tx_map[sc->txcur], m, segs,
 	    &nseg, 0) != 0) {
-		m_free(m);
+		m_freem(m);
 		goto outloop;
 	}
 	bus_dmamap_sync(sc->mtag, sc->tx_map[sc->txcur], BUS_DMASYNC_PREWRITE);