svn commit: r244922 - stable/8/sys/dev/arcmsr

[Xin LI]

Author: delphij
Date: Tue Jan  1 07:04:25 2013
New Revision: 244922
URL: http://svnweb.freebsd.org/changeset/base/244922

Log:
  MFC r244369 (jimharris):
  
  Use CAM_DEV_NOT_THERE instead of CAM_SEL_TIMEOUT to report nonexistent
  LUNs for the virtual processor device.  This removes lots of CAM warnings,
  and follows similar recent changes to tws(4) and twa(4) drivers.
  
  Also fix case where CAM_REQ_CMP was getting OR'd with CAM_DEV_NOT_THERE
  in the nonexistent LUN case, resulting in different CAM status (CAM_UA_TERMIO)
  getting reported to CAM.  This issue existing previously, but was more subtle
  because it changed CAM_SEL_TIMEOUT to CAM_CMD_TIMEOUT.
  
  Sponsored by:		Intel
  Reported and tested by:	Willem Jan Withagen <wjw at digiware.nl>

Modified:
  stable/8/sys/dev/arcmsr/arcmsr.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/arcmsr/   (props changed)

Modified: stable/8/sys/dev/arcmsr/arcmsr.c
==============================================================================
--- stable/8/sys/dev/arcmsr/arcmsr.c	Tue Jan  1 07:02:33 2013	(r244921)
+++ stable/8/sys/dev/arcmsr/arcmsr.c	Tue Jan  1 07:04:25 2013	(r244922)
@@ -2432,14 +2432,13 @@ static void arcmsr_bus_reset(struct Adap
 static void arcmsr_handle_virtual_command(struct AdapterControlBlock *acb,
 		union ccb * pccb)
 {
-	pccb->ccb_h.status |= CAM_REQ_CMP;
 	switch (pccb->csio.cdb_io.cdb_bytes[0]) {
 	case INQUIRY: {
 		unsigned char inqdata[36];
 		char *buffer=pccb->csio.data_ptr;
 	
 		if (pccb->ccb_h.target_lun) {
-			pccb->ccb_h.status |= CAM_SEL_TIMEOUT;
+			pccb->ccb_h.status |= CAM_DEV_NOT_THERE;
 			xpt_done(pccb);
 			return;
 		}
@@ -2455,6 +2454,7 @@ static void arcmsr_handle_virtual_comman
 		strncpy(&inqdata[16], "RAID controller ", 16);	/* Product Identification */
 		strncpy(&inqdata[32], "R001", 4); /* Product Revision */
 		memcpy(buffer, inqdata, sizeof(inqdata));
+		pccb->ccb_h.status |= CAM_REQ_CMP;
 		xpt_done(pccb);
 	}
 	break;
@@ -2464,10 +2464,12 @@ static void arcmsr_handle_virtual_comman
 			pccb->ccb_h.status |= CAM_SCSI_STATUS_ERROR;
 			pccb->csio.scsi_status = SCSI_STATUS_CHECK_COND;
 		}
+		pccb->ccb_h.status |= CAM_REQ_CMP;
 		xpt_done(pccb);
 	}
 	break;
 	default:
+		pccb->ccb_h.status |= CAM_REQ_CMP;
 		xpt_done(pccb);
 	}
 }