From owner-p4-projects@FreeBSD.ORG  Sun Jul 29 06:38:44 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2F22816A418; Sun, 29 Jul 2007 06:38:44 +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 DCDC416A46B
	for <perforce@freebsd.org>; Sun, 29 Jul 2007 06:38:43 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CFFB613C45E
	for <perforce@freebsd.org>; Sun, 29 Jul 2007 06:38:43 +0000 (UTC)
	(envelope-from peter@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 l6T6chaU063967
	for <perforce@freebsd.org>; Sun, 29 Jul 2007 06:38:43 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6T6chwU063964
	for perforce@freebsd.org; Sun, 29 Jul 2007 06:38:43 GMT
	(envelope-from peter@freebsd.org)
Date: Sun, 29 Jul 2007 06:38:43 GMT
Message-Id: <200707290638.l6T6chwU063964@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 124299 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, 29 Jul 2007 06:38:44 -0000

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

Change 124299 by peter@peter_overcee on 2007/07/29 06:38:33

	Increase timeout from 1/1000th of a second to 1/4 second.  1 tick was
	almost fine at 100hz, but is way too short at 1000hz.  1/4 second is far
	more reasonable since it is a catastrophic failure of the card (firmware
	crashed or something).
	
	If the timeout fires, it actually causes the driver to break.  So an
	accidental misfire is a Bad Thing(TM).

Affected files ...

.. //depot/projects/hammer/sys/dev/si/si.c#23 edit

Differences ...

==== //depot/projects/hammer/sys/dev/si/si.c#23 (text+ko) ====

@@ -1547,7 +1547,9 @@
 			x != IDLE_BREAK &&
 			x != cmd) {
 		if (ttysleep(pp->sp_tty, (caddr_t)&pp->sp_state, TTIPRI|PCATCH,
-				"sicmd1", 1)) {
+				"sicmd1", hz/4)) {
+			/* This is very very bad.  The card has crashed. */
+			/* XXX the driver breaks at this point */
 			splx(oldspl);
 			return;
 		}