From owner-svn-src-all@FreeBSD.ORG  Tue Feb 17 15:47:15 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 12AEA1065812;
	Tue, 17 Feb 2009 15:47:15 +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 B273D8FC43;
	Tue, 17 Feb 2009 15:47:13 +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 n1HFlDoI019523;
	Tue, 17 Feb 2009 15:47:13 GMT (envelope-from raj@svn.freebsd.org)
Received: (from raj@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1HFlD1O019522;
	Tue, 17 Feb 2009 15:47:13 GMT (envelope-from raj@svn.freebsd.org)
Message-Id: <200902171547.n1HFlD1O019522@svn.freebsd.org>
From: Rafal Jaworowski <raj@FreeBSD.org>
Date: Tue, 17 Feb 2009 15:47:13 +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: r188715 - head/sys/dev/tsec
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Feb 2009 15:47:19 -0000

Author: raj
Date: Tue Feb 17 15:47:13 2009
New Revision: 188715
URL: http://svn.freebsd.org/changeset/base/188715

Log:
  tsec(4): do not clear interrupt events register before use.
  
  Prior to this fix, IEVENT register was always cleared before calling
  tsec_error_intr_locked(), which prevented error recovery actions from
  happening with polling enabled (and could lead to serious problems, including
  controller hang).
  
  Submitted by:	Marcin Ligenza marcinl ! pacomp dot com dot pl

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:41:41 2009	(r188714)
+++ head/sys/dev/tsec/if_tsec.c	Tue Feb 17 15:47:13 2009	(r188715)
@@ -870,11 +870,11 @@ tsec_poll(struct ifnet *ifp, enum poll_c
 	}
 
 	if (cmd == POLL_AND_CHECK_STATUS) {
-		ie = TSEC_READ(sc, TSEC_REG_IEVENT);
+		tsec_error_intr_locked(sc, count);
 
 		/* Clear all events reported */
+		ie = TSEC_READ(sc, TSEC_REG_IEVENT);
 		TSEC_WRITE(sc, TSEC_REG_IEVENT, ie);
-		tsec_error_intr_locked(sc, count);
 	}
 
 	tsec_transmit_intr_locked(sc);