From owner-p4-projects@FreeBSD.ORG  Mon Dec 18 03:38:41 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 5E33316A40F; Mon, 18 Dec 2006 03:38:41 +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 1DE0C16A403
	for <perforce@freebsd.org>; Mon, 18 Dec 2006 03:38:41 +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 DE54F43C9F
	for <perforce@freebsd.org>; Mon, 18 Dec 2006 03:38:40 +0000 (GMT)
	(envelope-from mjacob@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 kBI3In0K006910
	for <perforce@freebsd.org>; Mon, 18 Dec 2006 03:18:49 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBI3InM9006907
	for perforce@freebsd.org; Mon, 18 Dec 2006 03:18:49 GMT
	(envelope-from mjacob@freebsd.org)
Date: Mon, 18 Dec 2006 03:18:49 GMT
Message-Id: <200612180318.kBI3InM9006907@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 111873 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: Mon, 18 Dec 2006 03:38:41 -0000

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

Change 111873 by mjacob@mjexp on 2006/12/18 03:18:20

	Add a longer timeout for the EXEC_A64_IOCB command and make it
	consistent across the 3 places that use it for the 24XX cards.

Affected files ...

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

Differences ...

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

@@ -2151,8 +2151,8 @@
 	mbs.param[3] = DMA_WD0(FCPARAM(isp)->isp_scdma);
 	mbs.param[6] = DMA_WD3(FCPARAM(isp)->isp_scdma);
 	mbs.param[7] = DMA_WD2(FCPARAM(isp)->isp_scdma);
+	mbs.timeout = 500000;
 	mbs.logval = MBLOGALL;
-	mbs.timeout = 250000;
 	MEMORYBARRIER(isp, SYNC_SFORDEV, 0, QENTRY_LEN);
 	isp_mboxcmd(isp, &mbs);
 	if (mbs.param[0] != MBOX_COMMAND_COMPLETE) {
@@ -3224,6 +3224,7 @@
 	mbs.param[3] = DMA_WD0(fcp->isp_scdma + CTXOFF);
 	mbs.param[6] = DMA_WD3(fcp->isp_scdma + CTXOFF);
 	mbs.param[7] = DMA_WD2(fcp->isp_scdma + CTXOFF);
+	mbs.timeout = 500000;
 	mbs.logval = MBLOGALL;
 	MEMORYBARRIER(isp, SYNC_SFORDEV, XTXOFF, 2 * QENTRY_LEN);
 	isp_mboxcmd(isp, &mbs);
@@ -3902,6 +3903,7 @@
 	mbs.param[3] = DMA_WD0(fcp->isp_scdma + CTXOFF);
 	mbs.param[6] = DMA_WD3(fcp->isp_scdma + CTXOFF);
 	mbs.param[7] = DMA_WD2(fcp->isp_scdma + CTXOFF);
+	mbs.timeout = 500000;
 	mbs.logval = MBLOGALL;
 	MEMORYBARRIER(isp, SYNC_SFORDEV, XTXOFF, 2 * QENTRY_LEN);
 	isp_mboxcmd(isp, &mbs);