From owner-p4-projects@FreeBSD.ORG  Mon Jun 15 06:27:28 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 592641065677; Mon, 15 Jun 2009 06:27:28 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 11A261065676
	for <perforce@freebsd.org>; Mon, 15 Jun 2009 06:27:28 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F37F38FC21
	for <perforce@freebsd.org>; Mon, 15 Jun 2009 06:27:27 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5F6RR6s072347
	for <perforce@freebsd.org>; Mon, 15 Jun 2009 06:27:27 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5F6RRA2072345
	for perforce@freebsd.org; Mon, 15 Jun 2009 06:27:27 GMT
	(envelope-from mav@freebsd.org)
Date: Mon, 15 Jun 2009 06:27:27 GMT
Message-Id: <200906150627.n5F6RRA2072345@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 164398 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Jun 2009 06:27:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=164398

Change 164398 by mav@mav_mavbook on 2009/06/15 06:27:23

	Add CAM_ATA_STATUS_ERROR error.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam.c#7 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam.h#5 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#28 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam.c#7 (text+ko) ====

@@ -81,6 +81,7 @@
 	{ CAM_UNREC_HBA_ERROR,	 "Unrecoverable Host Bus Adapter Error"	     },
 	{ CAM_REQ_TOO_BIG,	 "The request was too large for this host"   },
 	{ CAM_REQUEUE_REQ,	 "Unconditionally Re-queue Request",	     },
+	{ CAM_ATA_STATUS_ERROR,	 "ATA Status Error"			     },
 	{ CAM_IDE,		 "Initiator Detected Error Message Received" },
 	{ CAM_RESRC_UNAVAIL,	 "Resource Unavailable"			     },
 	{ CAM_UNACKED_EVENT,	 "Unacknowledged Event by Host"		     },

==== //depot/projects/scottl-camlock/src/sys/cam/cam.h#5 (text+ko) ====

@@ -129,6 +129,7 @@
 				 * requests for the target at the sim level
 				 * back into the XPT queue.
 				 */
+	CAM_ATA_STATUS_ERROR,	/* ATA error, look at error code in CCB */
 	CAM_SCSI_IT_NEXUS_LOST,	/* Initiator/Target Nexus lost. */
 	CAM_IDE = 0x33,		/* Initiator Detected Error */
 	CAM_RESRC_UNAVAIL,	/* Resource Unavailable */

==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#28 (text+ko) ====

@@ -1584,6 +1584,13 @@
 		xpt_print(ccb->ccb_h.path, "AutoSense Failed\n");
 		error = EIO;	/* we have to kill the command */
 		break;
+	case CAM_ATA_STATUS_ERROR:
+		if (bootverbose && printed == 0) {
+			xpt_print(ccb->ccb_h.path,
+			    "Request completed with CAM_ATA_STATUS_ERROR\n");
+			printed++;
+		}
+		/* FALLTHROUGH */
 	case CAM_REQ_CMP_ERR:
 		if (bootverbose && printed == 0) {
 			xpt_print(ccb->ccb_h.path,