From owner-svn-src-head@FreeBSD.ORG  Mon Nov 26 20:07:11 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5C2D03B6;
 Mon, 26 Nov 2012 20:07:11 +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 41BBA8FC15;
 Mon, 26 Nov 2012 20:07:11 +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 qAQK7B5c064110;
 Mon, 26 Nov 2012 20:07:11 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAQK7Bop064109;
 Mon, 26 Nov 2012 20:07:11 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201211262007.qAQK7Bop064109@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 26 Nov 2012 20:07:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243571 - head/sys/cam/ata
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Mon, 26 Nov 2012 20:07:11 -0000

Author: mav
Date: Mon Nov 26 20:07:10 2012
New Revision: 243571
URL: http://svnweb.freebsd.org/changeset/base/243571

Log:
  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.
  
  MFC after:	1 week

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

Modified: head/sys/cam/ata/ata_xpt.c
==============================================================================
--- head/sys/cam/ata/ata_xpt.c	Mon Nov 26 20:03:57 2012	(r243570)
+++ head/sys/cam/ata/ata_xpt.c	Mon Nov 26 20:07:10 2012	(r243571)
@@ -751,6 +751,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.