From owner-svn-src-head@FreeBSD.ORG  Wed Jan 26 06:57:48 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D2F831065672;
	Wed, 26 Jan 2011 06:57:48 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C289B8FC08;
	Wed, 26 Jan 2011 06:57:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0Q6vmiJ066550;
	Wed, 26 Jan 2011 06:57:48 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0Q6vmAM066548;
	Wed, 26 Jan 2011 06:57:48 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201101260657.p0Q6vmAM066548@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 26 Jan 2011 06:57:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217875 - head/sys/cam/ata
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Jan 2011 06:57:48 -0000

Author: mav
Date: Wed Jan 26 06:57:48 2011
New Revision: 217875
URL: http://svn.freebsd.org/changeset/base/217875

Log:
  In addition to r217444 ignore also ATA status errors on DMA Auto-Activation
  enabling request. Some HP disks reported to return ABORT error there while
  declaring support for this feature.

Modified:
  head/sys/cam/ata/ata_xpt.c

Modified: head/sys/cam/ata/ata_xpt.c
==============================================================================
--- head/sys/cam/ata/ata_xpt.c	Wed Jan 26 06:37:51 2011	(r217874)
+++ head/sys/cam/ata/ata_xpt.c	Wed Jan 26 06:57:48 2011	(r217875)
@@ -778,6 +778,14 @@ probedone(struct cam_periph *periph, uni
 		} else if (softc->action == PROBE_SETPM &&
 		    status == CAM_ATA_STATUS_ERROR) {
 			goto noerror;
+
+		/*
+		 * Some HP SATA disks report supported DMA Auto-Activation,
+		 * but return ABORT on attempt to enable it.
+		 */
+		} else if (softc->action == PROBE_SETDMAAA &&
+		    status == CAM_ATA_STATUS_ERROR) {
+			goto noerror;
 		}
 
 		/*