From owner-svn-src-all@FreeBSD.ORG  Sat Apr 20 00:33:38 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 656C1537;
 Sat, 20 Apr 2013 00:33:38 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 570A97CF;
 Sat, 20 Apr 2013 00:33:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3K0Xb2M025898;
 Sat, 20 Apr 2013 00:33:37 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3K0XbG1025892;
 Sat, 20 Apr 2013 00:33:37 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201304200033.r3K0XbG1025892@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Sat, 20 Apr 2013 00:33:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249664 - in head/sys: cam conf
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: Sat, 20 Apr 2013 00:33:38 -0000

Author: sbruno
Date: Sat Apr 20 00:33:37 2013
New Revision: 249664
URL: http://svnweb.freebsd.org/changeset/base/249664

Log:
  Expose CAM_BOOT_DELAY as a kernel conf item now.
  
  This allows users who boot without loader to adjust their environments
  around slightly buggy or slow hardware.
  
  PR:	kern/161809
  Submitted by:	rozhuk.im@gmail.com
  MFC after:	2 weeks

Modified:
  head/sys/cam/cam_xpt.c
  head/sys/conf/options

Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c	Fri Apr 19 23:49:34 2013	(r249663)
+++ head/sys/cam/cam_xpt.c	Sat Apr 20 00:33:37 2013	(r249664)
@@ -878,6 +878,13 @@ xpt_init(void *dummy)
 	mtx_init(&xsoftc.xpt_lock, "XPT lock", NULL, MTX_DEF);
 	mtx_init(&xsoftc.xpt_topo_lock, "XPT topology lock", NULL, MTX_DEF);
 
+#ifdef CAM_BOOT_DELAY
+	/*
+	 * Override this value at compile time to assist our users
+	 * who don't use loader to boot a kernel.
+	 */
+	xsoftc.boot_delay = CAM_BOOT_DELAY;
+#endif
 	/*
 	 * The xpt layer is, itself, the equivelent of a SIM.
 	 * Allow 16 ccbs in the ccb pool for it.  This should

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Fri Apr 19 23:49:34 2013	(r249663)
+++ head/sys/conf/options	Sat Apr 20 00:33:37 2013	(r249664)
@@ -307,6 +307,7 @@ CAM_DEBUG_BUS		opt_cam.h
 CAM_DEBUG_TARGET	opt_cam.h
 CAM_DEBUG_LUN		opt_cam.h
 CAM_DEBUG_FLAGS		opt_cam.h
+CAM_BOOT_DELAY		opt_cam.h
 SCSI_DELAY		opt_scsi.h
 SCSI_NO_SENSE_STRINGS	opt_scsi.h
 SCSI_NO_OP_STRINGS	opt_scsi.h