From owner-p4-projects@FreeBSD.ORG  Sun Apr  6 14:42:18 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E585F1065674; Sun,  6 Apr 2008 14:42:17 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ABA891065672
	for <perforce@FreeBSD.org>; Sun,  6 Apr 2008 14:42:17 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 907318FC23
	for <perforce@FreeBSD.org>; Sun,  6 Apr 2008 14:42:17 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m36EgHYS079487
	for <perforce@FreeBSD.org>; Sun, 6 Apr 2008 14:42:17 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m36EgHsD079485
	for perforce@freebsd.org; Sun, 6 Apr 2008 14:42:17 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Sun, 6 Apr 2008 14:42:17 GMT
Message-Id: <200804061442.m36EgHsD079485@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 139455 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: Sun, 06 Apr 2008 14:42:18 -0000

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

Change 139455 by gonzo@gonzo_jeeves on 2008/04/06 14:41:17

	o ACK TX interrupt by writing to Status register of DMA channel 1 (tx)
	o sync TX descriptors after all operations has been performed on them
	o We should care only about F and E interrupts for TX descriptor.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/if_kr.c#3 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/if_kr.c#3 (text+ko) ====

@@ -1425,6 +1425,9 @@
 	}
 
 	sc->kr_cdata.kr_tx_cons = cons;
+
+	bus_dmamap_sync(sc->kr_cdata.kr_tx_ring_tag,
+	    sc->kr_cdata.kr_tx_ring_map, BUS_DMASYNC_PREWRITE);
 }
 
 
@@ -1574,9 +1577,11 @@
 			device_printf(sc->kr_dev, "DMA error\n");
 	}
 
-	/* Enable F, H, E interrupts */
+	KR_DMA_WRITE_REG(KR_DMA_TXCHAN, DMA_S, ~status);
+
+	/* Enable F, E interrupts */
 	KR_DMA_CLEARBITS_REG(KR_DMA_TXCHAN, DMA_SM, 
-	    DMA_SM_D | DMA_SM_H | DMA_SM_E);
+	    DMA_SM_F | DMA_SM_E);
 
 	KR_UNLOCK(sc);