svn commit: r207433 - head/sys/cam

[Alexander Motin]

Author: mav
Date: Fri Apr 30 08:57:03 2010
New Revision: 207433
URL: http://svn.freebsd.org/changeset/base/207433

Log:
  Revert r198705.
  As scottl@ noticed, max_target/max_lun was intended to be only a hint for
  existing bus scanner. Some FC/SAS SIMs report fake values there, that are
  smaller then maximum supported IDs. In that case this check makes impossible
  manual scan outside hinted range.
  
  For ATA/SATA SIMs respective check was instead implemented at SIM level.
  Newer SCSI SIMs expected to have these checks at driver or firmware level.
  Some older SCSI SIMs have no this check and the issues will get back there.

Modified:
  head/sys/cam/cam_xpt.c

Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c	Fri Apr 30 08:37:00 2010	(r207432)
+++ head/sys/cam/cam_xpt.c	Fri Apr 30 08:57:03 2010	(r207433)
@@ -467,34 +467,7 @@ xptioctl(struct cdev *dev, u_long cmd, c
 			ccb = xpt_alloc_ccb();
 
 			CAM_SIM_LOCK(bus->sim);
-			/* Ensure passed in target/lun supported on this bus. */
-			if ((inccb->ccb_h.target_id != CAM_TARGET_WILDCARD) ||
-			    (inccb->ccb_h.target_lun != CAM_LUN_WILDCARD)) {
-				if (xpt_create_path(&ccb->ccb_h.path,
-					    xpt_periph,
-					    inccb->ccb_h.path_id,
-					    CAM_TARGET_WILDCARD,
-					    CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
-					error = EINVAL;
-					CAM_SIM_UNLOCK(bus->sim);
-					xpt_free_ccb(ccb);
-					break;
-				}
-				xpt_setup_ccb(&ccb->ccb_h, ccb->ccb_h.path,
-				    inccb->ccb_h.pinfo.priority);
-				ccb->ccb_h.func_code = XPT_PATH_INQ;
-				xpt_action(ccb);
-				xpt_free_path(ccb->ccb_h.path);
-				if ((inccb->ccb_h.target_id != CAM_TARGET_WILDCARD &&
-				    inccb->ccb_h.target_id > ccb->cpi.max_target) ||
-				    (inccb->ccb_h.target_lun != CAM_LUN_WILDCARD &&
-				    inccb->ccb_h.target_lun > ccb->cpi.max_lun)) {
-					error = EINVAL;
-					CAM_SIM_UNLOCK(bus->sim);
-					xpt_free_ccb(ccb);
-					break;
-				}
-			}
+
 			/*
 			 * Create a path using the bus, target, and lun the
 			 * user passed in.