From owner-svn-src-stable-10@FreeBSD.ORG  Thu Jan  9 10:49:15 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7F44A5E6;
 Thu,  9 Jan 2014 10:49:15 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6AD1A164D;
 Thu,  9 Jan 2014 10:49:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s09AnFFx084178;
 Thu, 9 Jan 2014 10:49:15 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s09AnF9Z084176;
 Thu, 9 Jan 2014 10:49:15 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201401091049.s09AnF9Z084176@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 9 Jan 2014 10:49:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r260475 - in stable/10/sys/cam: ata scsi
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Jan 2014 10:49:15 -0000

Author: mav
Date: Thu Jan  9 10:49:14 2014
New Revision: 260475
URL: http://svnweb.freebsd.org/changeset/base/260475

Log:
  MFC r256547 (by smh):
  Added 4K quirks for Corsair Neutron GTX SSD's

Modified:
  stable/10/sys/cam/ata/ata_da.c
  stable/10/sys/cam/scsi/scsi_da.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/ata/ata_da.c
==============================================================================
--- stable/10/sys/cam/ata/ata_da.c	Thu Jan  9 10:45:37 2014	(r260474)
+++ stable/10/sys/cam/ata/ata_da.c	Thu Jan  9 10:49:14 2014	(r260475)
@@ -291,6 +291,14 @@ static struct ada_quirk_entry ada_quirk_
 	},
 	{
 		/*
+		 * Corsair Neutron GTX SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Neutron GTX*", "*" },
+		/*quirks*/ADA_Q_4K
+	},
+	{
+		/*
 		 * Corsair Force GT SSDs
 		 * 4k optimised & trim only works in 4k requests + 4k aligned
 		 */

Modified: stable/10/sys/cam/scsi/scsi_da.c
==============================================================================
--- stable/10/sys/cam/scsi/scsi_da.c	Thu Jan  9 10:45:37 2014	(r260474)
+++ stable/10/sys/cam/scsi/scsi_da.c	Thu Jan  9 10:49:14 2014	(r260475)
@@ -947,6 +947,14 @@ static struct da_quirk_entry da_quirk_ta
 		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Corsair Force 3*", "*" },
 		/*quirks*/DA_Q_4K
 	},
+        {
+		/*
+		 * Corsair Neutron GTX SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Neutron GTX*", "*" },
+		/*quirks*/DA_Q_4K
+	},
 	{
 		/*
 		 * Corsair Force GT SSDs