From owner-svn-src-all@FreeBSD.ORG  Sun Oct 14 08:50:06 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 16292B0E;
 Sun, 14 Oct 2012 08:50:06 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id F24508FC0C;
 Sun, 14 Oct 2012 08:50:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9E8o580026779;
 Sun, 14 Oct 2012 08:50:05 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9E8o523026777;
 Sun, 14 Oct 2012 08:50:05 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201210140850.q9E8o523026777@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 14 Oct 2012 08:50:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241536 - head/sys/cam
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sun, 14 Oct 2012 08:50:06 -0000

Author: mav
Date: Sun Oct 14 08:50:05 2012
New Revision: 241536
URL: http://svn.freebsd.org/changeset/base/241536

Log:
  Add explicit check for not set time inside cam_periph_freeze_after_event().
  
  System time is set later on boot process then initial bus scan by CAM.
  Until that moment microtime() is equal to microuptime(), and if system
  boots quickly, the value can be close to zero. That causes settle time
  waiting even for buses that don't use reset during probe.
  
  On my test system this reduces boot time by 1 second if USB enabled, or
  by 4 seconds if USB disabled.  CAM waited for ctl2cam0 bus "settle".

Modified:
  head/sys/cam/cam_periph.c

Modified: head/sys/cam/cam_periph.c
==============================================================================
--- head/sys/cam/cam_periph.c	Sun Oct 14 07:55:14 2012	(r241535)
+++ head/sys/cam/cam_periph.c	Sun Oct 14 08:50:05 2012	(r241536)
@@ -1250,6 +1250,9 @@ cam_periph_freeze_after_event(struct cam
 	struct timeval delta;
 	struct timeval duration_tv;
 
+	if (!timevalisset(event_time))
+		return;
+
 	microtime(&delta);
 	timevalsub(&delta, event_time);
 	duration_tv.tv_sec = duration_ms / 1000;