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...@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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
