From owner-p4-projects@FreeBSD.ORG  Sat Aug 22 18:29:32 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 709E71065691; Sat, 22 Aug 2009 18:29:32 +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 35451106568C
	for <perforce@freebsd.org>; Sat, 22 Aug 2009 18:29:32 +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 248948FC0A
	for <perforce@freebsd.org>; Sat, 22 Aug 2009 18:29:32 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7MITVgp020967
	for <perforce@freebsd.org>; Sat, 22 Aug 2009 18:29:31 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7MITVio020965
	for perforce@freebsd.org; Sat, 22 Aug 2009 18:29:31 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 22 Aug 2009 18:29:31 GMT
Message-Id: <200908221829.n7MITVio020965@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 167622 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: Sat, 22 Aug 2009 18:29:32 -0000

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

Change 167622 by mav@mav_mavbook on 2009/08/22 18:29:14

	Improve error reporting in ATA_CAM wrapper.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#24 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#24 (text+ko) ====

@@ -1246,13 +1246,35 @@
 
 //device_printf(dev, "%s\n", __func__);
 	ccb->ccb_h.status &= ~CAM_STATUS_MASK;
-	if (request->result == 0)
+	if (request->flags & ATA_R_TIMEOUT)
+			ccb->ccb_h.status |= CAM_CMD_TIMEOUT;
+	else if (request->status & ATA_S_ERROR) {
+		if (ccb->ccb_h.func_code == XPT_ATA_IO) {
+			ccb->ccb_h.status |= CAM_ATA_STATUS_ERROR;
+		} else {
+			ccb->ccb_h.status |= CAM_SCSI_STATUS_ERROR;
+			ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND;
+		}
+	} else if (request->result != 0)
+		ccb->ccb_h.status |= CAM_REQ_CMP_ERR;
+	else
 		ccb->ccb_h.status |= CAM_REQ_CMP;
-	else if (ccb->ccb_h.func_code == XPT_SCSI_IO) {
-		ccb->ccb_h.status |= CAM_SCSI_STATUS_ERROR;
-		ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND;
-	} else
-		ccb->ccb_h.status |= CAM_REQ_CMP_ERR;
+	if (ccb->ccb_h.func_code == XPT_ATA_IO &&
+	    ((request->status & ATA_S_ERROR) ||
+	    (ccb->ataio.cmd.flags & CAM_ATAIO_NEEDRESULT))) {
+		struct ata_res *res = &ccb->ataio.res;
+		res->status = request->status;
+		res->error = request->error;
+		res->lba_low = request->u.ata.lba;
+		res->lba_mid = request->u.ata.lba >> 8;
+		res->lba_high = request->u.ata.lba >> 16;
+		res->device = request->u.ata.lba >> 24;
+		res->lba_low_exp = request->u.ata.lba >> 24;
+		res->lba_mid_exp = request->u.ata.lba >> 32;
+		res->lba_high_exp = request->u.ata.lba >> 40;
+		res->sector_count = request->u.ata.count;
+		res->sector_count_exp = request->u.ata.count >> 8;
+	}
 	ata_free_request(request);
 	xpt_done(ccb);
 }