From owner-svn-src-head@FreeBSD.ORG  Sun Oct 19 16:46:37 2014
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:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 570B915A;
 Sun, 19 Oct 2014 16:46:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4289DB2A;
 Sun, 19 Oct 2014 16:46:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9JGkbaC039875;
 Sun, 19 Oct 2014 16:46:37 GMT (envelope-from gnn@FreeBSD.org)
Received: (from gnn@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9JGkanV039873;
 Sun, 19 Oct 2014 16:46:36 GMT (envelope-from gnn@FreeBSD.org)
Message-Id: <201410191646.s9JGkanV039873@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gnn set sender to gnn@FreeBSD.org
 using -f
From: "George V. Neville-Neil" <gnn@FreeBSD.org>
Date: Sun, 19 Oct 2014 16:46:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273279 - in head/sys/cam: ata scsi
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.18-1
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: Sun, 19 Oct 2014 16:46:37 -0000

Author: gnn
Date: Sun Oct 19 16:46:36 2014
New Revision: 273279
URL: https://svnweb.freebsd.org/changeset/base/273279

Log:
  Add new quirks for the latest Samsung SSD, model 850.
  
  Submitted by:	sbruno
  MFC after:	2 weeks

Modified:
  head/sys/cam/ata/ata_da.c
  head/sys/cam/scsi/scsi_da.c

Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c	Sun Oct 19 16:26:49 2014	(r273278)
+++ head/sys/cam/ata/ata_da.c	Sun Oct 19 16:46:36 2014	(r273279)
@@ -457,6 +457,14 @@ static struct ada_quirk_entry ada_quirk_
 		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "SAMSUNG MZ7WD*", "*" },
 		/*quirks*/ADA_Q_4K
 	},
+ 	{
+ 		/*
+		 * Samsung 850 SSDs
+		 * 4k optimised
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Samsung SSD 850*", "*" },
+		/*quirks*/ADA_Q_4K
+	},
 	{
 		/*
 		 * Samsung PM853T Series SSDs

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Sun Oct 19 16:26:49 2014	(r273278)
+++ head/sys/cam/scsi/scsi_da.c	Sun Oct 19 16:46:36 2014	(r273279)
@@ -1132,6 +1132,14 @@ static struct da_quirk_entry da_quirk_ta
 		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SAMSUNG MZ7WD*", "*" },
 		/*quirks*/DA_Q_4K
 	},
+ 	{
+ 		/*
+		 * Samsung 850 SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Samsung SSD 850*", "*" },
+		/*quirks*/DA_Q_4K
+	},
 	{
 		/*
 		 * Samsung PM853T Series SSDs