From owner-svn-src-head@FreeBSD.ORG Tue Feb 17 15:59:27 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EB6DA106566C; Tue, 17 Feb 2009 15:59:27 +0000 (UTC) (envelope-from raj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D93E98FC12; Tue, 17 Feb 2009 15:59:27 +0000 (UTC) (envelope-from raj@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1HFxR6l020125; Tue, 17 Feb 2009 15:59:27 GMT (envelope-from raj@svn.freebsd.org) Received: (from raj@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1HFxRvo020124; Tue, 17 Feb 2009 15:59:27 GMT (envelope-from raj@svn.freebsd.org) Message-Id: <200902171559.n1HFxRvo020124@svn.freebsd.org> From: Rafal Jaworowski Date: Tue, 17 Feb 2009 15:59:27 +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: r188718 - head/sys/dev/tsec X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Feb 2009 15:59:29 -0000 Author: raj Date: Tue Feb 17 15:59:27 2009 New Revision: 188718 URL: http://svn.freebsd.org/changeset/base/188718 Log: tsec(4): Always try to resume the receiver. This helps recover from RX stall under heavy loads. Submitted by: Piotr Ziecik kosmo ! semihalf dot com Modified: head/sys/dev/tsec/if_tsec.c Modified: head/sys/dev/tsec/if_tsec.c ============================================================================== --- head/sys/dev/tsec/if_tsec.c Tue Feb 17 15:58:42 2009 (r188717) +++ head/sys/dev/tsec/if_tsec.c Tue Feb 17 15:59:27 2009 (r188718) @@ -1363,6 +1363,16 @@ tsec_receive_intr_locked(struct tsec_sof bus_dmamap_sync(sc->tsec_rx_dtag, sc->tsec_rx_dmap, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + + /* + * Make sure TSEC receiver is not halted. + * + * Various conditions can stop the TSEC receiver, but not all are + * signaled and handled by error interrupt, so make sure the receiver + * is running. Writing to TSEC_REG_RSTAT restarts the receiver when + * halted, and is harmless if already running. + */ + TSEC_WRITE(sc, TSEC_REG_RSTAT, TSEC_RSTAT_QHLT); } void @@ -1507,9 +1517,6 @@ tsec_error_intr_locked(struct tsec_softc /* Get data from RX buffers */ tsec_receive_intr_locked(sc, count); - - /* Make receiver again active */ - TSEC_WRITE(sc, TSEC_REG_RSTAT, TSEC_RSTAT_QHLT); } if (ifp->if_flags & IFF_DEBUG)