From owner-p4-projects@FreeBSD.ORG  Tue Nov  7 01:34:50 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 E0BF216A47E; Tue,  7 Nov 2006 01:34:49 +0000 (UTC)
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 BB18916A412
	for <perforce@freebsd.org>; Tue,  7 Nov 2006 01:34:49 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 827CF43D45
	for <perforce@freebsd.org>; Tue,  7 Nov 2006 01:34:49 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA71YnAl090380
	for <perforce@freebsd.org>; Tue, 7 Nov 2006 01:34:49 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA71Yn88090377
	for perforce@freebsd.org; Tue, 7 Nov 2006 01:34:49 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 7 Nov 2006 01:34:49 GMT
Message-Id: <200611070134.kA71Yn88090377@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109410 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: Tue, 07 Nov 2006 01:34:50 -0000

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

Change 109410 by sam@sam_ebb on 2006/11/07 01:34:29

	Track npe msg handling changes: must now drop the softc
	lock around calls to collect status as otherwise we'd be
	holding the softc lock when ixpnpe_sendandrecvmsg sleeps.
	
	Note: we get input fifo polling timeouts when setting up
	      rx qids for traffic classes 4-7; will investigate
	      but things appear to otherwise work

Affected files ...

.. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#6 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#6 (text+ko) ====

@@ -654,7 +654,11 @@
 	struct npestats *ns = sc->sc_stats;
 
 	NPE_ASSERT_LOCKED(sc);
+
+	NPE_UNLOCK(sc);			/* XXX */
 	npe_updatestats(sc);		/* update + clear stats */
+	NPE_LOCK(sc);
+
 	bus_dmamap_sync(sc->sc_stats_tag, sc->sc_stats_map,
 		BUS_DMASYNC_POSTREAD);
 
@@ -688,9 +692,7 @@
 		+ be32toh(ns->RxUnderflowEntryDiscards)
 		;
 
-	/*
-	 * Schedule another timeout one second from now.
-	 */
+	/* schedule next poll */
 	callout_reset(&sc->tick_ch, hz, npe_tick, sc);
 #undef MIBADD
 }