From owner-p4-projects@FreeBSD.ORG  Sat May  5 05:12:18 2007
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 4ED2E16A406; Sat,  5 May 2007 05:12:18 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2D49916A401
	for <perforce@freebsd.org>; Sat,  5 May 2007 05:12:18 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D4EC13C457
	for <perforce@freebsd.org>; Sat,  5 May 2007 05:12:18 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l455CH3n098838
	for <perforce@freebsd.org>; Sat, 5 May 2007 05:12:17 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l455CHel098835
	for perforce@freebsd.org; Sat, 5 May 2007 05:12:17 GMT
	(envelope-from mjacob@freebsd.org)
Date: Sat, 5 May 2007 05:12:17 GMT
Message-Id: <200705050512.l455CHel098835@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 119266 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: Sat, 05 May 2007 05:12:18 -0000

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

Change 119266 by mjacob@mjexp on 2007/05/05 05:11:37

	First part of this- don't call isp_reinit from interrupt context.

Affected files ...

.. //depot/projects/mjexp/sys/dev/isp/isp.c#20 edit

Differences ...

==== //depot/projects/mjexp/sys/dev/isp/isp.c#20 (text+ko) ====

@@ -5121,20 +5121,11 @@
 			isp->isp_mboxtmp[0] = MBOX_HOST_INTERFACE_ERROR;
 			MBOX_NOTIFY_COMPLETE(isp);
 		}
-#ifdef	ISP_FW_CRASH_DUMP
 		/*
-		 * If we have crash dumps enabled, it's up to the handler
-		 * for isp_async to reinit stuff and restart the firmware
-		 * after performing the crash dump. The reason we do things
-		 * this way is that we may need to activate a kernel thread
-		 * to do all the crash dump goop.
+		 * It's up to the handler for isp_async to reinit stuff and
+		 * restart the firmware
 		 */
 		isp_async(isp, ISPASYNC_FW_CRASH, NULL);
-#else
-		isp_async(isp, ISPASYNC_FW_CRASH, NULL);
-		isp_reinit(isp);
-		isp_async(isp, ISPASYNC_FW_RESTARTED, NULL);
-#endif
 		rval = -1;
 		break;
 
@@ -5401,13 +5392,7 @@
 			break;
 		case ISP_CONN_FATAL:
 			isp_prt(isp, ISP_LOGERR, "FATAL CONNECTION ERROR");
-#ifdef	ISP_FW_CRASH_DUMP
 			isp_async(isp, ISPASYNC_FW_CRASH, NULL);
-#else
-			isp_async(isp, ISPASYNC_FW_CRASH, NULL);
-			isp_reinit(isp);
-			isp_async(isp, ISPASYNC_FW_RESTARTED, NULL);
-#endif
 			return (-1);
 		case ISP_CONN_LOOPBACK:
 			isp_prt(isp, ISP_LOGWARN,