From owner-p4-projects@FreeBSD.ORG  Wed Jun 29 02:15:21 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 655741065672; Wed, 29 Jun 2011 02:15:21 +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 285C0106566B
	for <perforce@freebsd.org>; Wed, 29 Jun 2011 02:15:21 +0000 (UTC)
	(envelope-from jceel@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 165268FC14
	for <perforce@freebsd.org>; Wed, 29 Jun 2011 02:15:21 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5T2FKXH000440
	for <perforce@freebsd.org>; Wed, 29 Jun 2011 02:15:20 GMT
	(envelope-from jceel@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5T2FKra000437
	for perforce@freebsd.org; Wed, 29 Jun 2011 02:15:20 GMT
	(envelope-from jceel@freebsd.org)
Date: Wed, 29 Jun 2011 02:15:20 GMT
Message-Id: <201106290215.p5T2FKra000437@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jceel@freebsd.org using -f
From: Jakub Wojciech Klama <jceel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 195492 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 29 Jun 2011 02:15:21 -0000

http://p4web.freebsd.org/@@195492?ac=10

Change 195492 by jceel@jceel_cyclone on 2011/06/29 02:14:41

	Fixes in ethernet driver.

Affected files ...

.. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/if_lpe.c#3 edit
.. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/if_lpereg.h#3 edit

Differences ...

==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/if_lpe.c#3 (text+ko) ====

@@ -479,6 +479,10 @@
 //	device_printf(sc->lpe_dev, "lpe_start_locked()\n");
 
 	while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) {
+		if (lpe_read_4(sc, LPE_TXDESC_PROD) ==
+		    lpe_read_4(sc, LPE_TXDESC_CONS) - 5)
+			break;
+
 		/* Dequeue first packet */
 		IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head);
 		if (!m_head)
@@ -541,7 +545,7 @@
 		if (i == nsegs - 1) {
 			hwd->lhr_control |= LPE_HWDESC_LASTFLAG;
 			hwd->lhr_control |= LPE_HWDESC_INTERRUPT;
-			hwd->lhr_control |= (1 << 28) | (1 << 29);
+			hwd->lhr_control |= (1 << 28) | (1 << 29); // XXX
 		}
 
 		LPE_INC(prod, LPE_TXDESC_NUM);

==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/if_lpereg.h#3 (text+ko) ====