From owner-svn-src-stable@FreeBSD.ORG  Sat Dec  8 07:37:12 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D299D801;
 Sat,  8 Dec 2012 07:37:12 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B4A538FC0C;
 Sat,  8 Dec 2012 07:37:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB87bCiv093448;
 Sat, 8 Dec 2012 07:37:12 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB87bCn5093446;
 Sat, 8 Dec 2012 07:37:12 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212080737.qB87bCn5093446@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 8 Dec 2012 07:37:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r244020 - stable/9/sys/cam/ata
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Dec 2012 07:37:13 -0000

Author: mav
Date: Sat Dec  8 07:37:12 2012
New Revision: 244020
URL: http://svnweb.freebsd.org/changeset/base/244020

Log:
  MFC r243571:
  Fix problem with the Samsung 840 PRO series SSD detection.
  The device reports support for SATA Asynchronous Notification in its
  IDENTIFY data, but returns error on attempt to enable that feature.
  Make SATA XPT of CAM only report these errors, but not fail the device.

Modified:
  stable/9/sys/cam/ata/ata_xpt.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/ata/ata_xpt.c
==============================================================================
--- stable/9/sys/cam/ata/ata_xpt.c	Sat Dec  8 07:34:57 2012	(r244019)
+++ stable/9/sys/cam/ata/ata_xpt.c	Sat Dec  8 07:37:12 2012	(r244020)
@@ -745,6 +745,14 @@ probedone(struct cam_periph *periph, uni
 			goto noerror;
 
 		/*
+		 * Some Samsung SSDs report supported Asynchronous Notification,
+		 * but return ABORT on attempt to enable it.
+		 */
+		} else if (softc->action == PROBE_SETAN &&
+		    status == CAM_ATA_STATUS_ERROR) {
+			goto noerror;
+
+		/*
 		 * SES and SAF-TE SEPs have different IDENTIFY commands,
 		 * but SATA specification doesn't tell how to identify them.
 		 * Until better way found, just try another if first fail.