From owner-p4-projects@FreeBSD.ORG  Sun Oct 22 05:04:44 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 1D6EB16A40F; Sun, 22 Oct 2006 05:04:44 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D538716A403
	for <perforce@freebsd.org>; Sun, 22 Oct 2006 05:04:43 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 925E743D4C
	for <perforce@freebsd.org>; Sun, 22 Oct 2006 05:04:43 +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 k9M54hTm086649
	for <perforce@freebsd.org>; Sun, 22 Oct 2006 05:04:43 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9M54hmv086646
	for perforce@freebsd.org; Sun, 22 Oct 2006 05:04:43 GMT
	(envelope-from mjacob@freebsd.org)
Date: Sun, 22 Oct 2006 05:04:43 GMT
Message-Id: <200610220504.k9M54hmv086646@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 108257 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, 22 Oct 2006 05:04:44 -0000

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

Change 108257 by mjacob@newisp on 2006/10/22 05:04:14

	Be generous for timeouts with INIT_FIRMWARE- we might
	actually have to wait R_A_TOV.

Affected files ...

.. //depot/projects/newisp/dev/isp/isp.c#22 edit

Differences ...

==== //depot/projects/newisp/dev/isp/isp.c#22 (text+ko) ====

@@ -1763,6 +1763,7 @@
 	mbs.param[6] = DMA_WD3(fcp->isp_scdma);
 	mbs.param[7] = DMA_WD2(fcp->isp_scdma);
 	mbs.logval = MBLOGALL;
+	mbs.timeout = 30 * 1000000;
 	isp_prt(isp, ISP_LOGDEBUG0, "INIT F/W from %p (%08x%08x)",
 	    fcp->isp_scratch, (uint32_t) ((uint64_t)fcp->isp_scdma >> 32),
 	    (uint32_t) fcp->isp_scdma);
@@ -2020,6 +2021,7 @@
 	mbs.param[6] = DMA_WD3(fcp->isp_scdma);
 	mbs.param[7] = DMA_WD2(fcp->isp_scdma);
 	mbs.logval = MBLOGALL;
+	mbs.timeout = 30 * 1000000;
 	isp_prt(isp, ISP_LOGDEBUG0, "INIT F/W from %04x%04x%04x%04x",
 	    DMA_WD3(fcp->isp_scdma), DMA_WD2(fcp->isp_scdma),
 	    DMA_WD1(fcp->isp_scdma), DMA_WD0(fcp->isp_scdma));