From nobody@FreeBSD.org  Wed Jul 18 15:52:50 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 687AC106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 18 Jul 2012 15:52:50 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 498408FC21
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 18 Jul 2012 15:52:50 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q6IFqnQ8032509
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 18 Jul 2012 15:52:49 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q6IFqnGF032508;
	Wed, 18 Jul 2012 15:52:49 GMT
	(envelope-from nobody)
Message-Id: <201207181552.q6IFqnGF032508@red.freebsd.org>
Date: Wed, 18 Jul 2012 15:52:49 GMT
From: Steven Hartland <steven.hartland@multiplay.co.uk>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Patch to add Quirks for SSD that are 4k optimised
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         169974
>Category:       kern
>Synopsis:       [cam] [patch] add Quirks for SSD that are 4k optimised
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eadler
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 18 16:00:07 UTC 2012
>Closed-Date:    Fri Nov 09 01:37:47 UTC 2012
>Last-Modified:  Fri Nov 09 01:37:47 UTC 2012
>Originator:     Steven Hartland
>Release:        8.3-RELEASE
>Organization:
Multiplay
>Environment:
FreeBSD build 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #3: Tue Jul  3 13:16:31 UTC 2012     root@build:/usr/obj/usr/src/sys/MULTIPLAY  amd64
>Description:
Adds 4K quirks for the following SSD's which all perform better when 4K aligned
and only except 4K deletes (TRIM):-
* Corsair Force 2 & Force 3
* OCZ Agility 3
* OCZ Vertex 2 & Vertex 3
* SuperTalent TeraDrive CT
* Crucial RealSSD C300
* XceedIOPS SATA
* Intel 330 Series
* OCZ Deneva R Series
>How-To-Repeat:
N/A
>Fix:
Apply the attached patch

Patch attached with submission follows:

Adds 4K quirks for the following SSD's which all perform better when 4K aligned
and only except 4K deletes (TRIM):-
* Corsair Force 2 & Force 3
* OCZ Agility 3
* OCZ Vertex 2 & Vertex 3
* SuperTalent TeraDrive CT
* Crucial RealSSD C300
* XceedIOPS SATA
* Intel 330 Series
* OCZ Deneva R Series
--- ./sys/cam/scsi/scsi_da.c.orig	2012-07-13 18:54:45.525693438 +0000
+++ ./sys/cam/scsi/scsi_da.c	2012-07-13 18:55:06.959905372 +0000
@@ -807,6 +807,86 @@
 		{ T_DIRECT, SIP_MEDIA_FIXED, "WDC WD??", "???PVT*", "*" },
 		/*quirks*/DA_Q_4K
 	},
+	{
+		/*
+		 * Corsair Force 2 SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Corsair CSSD-F*", "*" },
+		/*quirks*/DA_Q_4K
+	},
+	{
+		/*
+		 * Corsair Force 3 SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Corsair Force 3*", "*" },
+		/*quirks*/DA_Q_4K
+	},
+	{
+		/*
+		 * OCZ Agility 3 SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "OCZ-AGILITY3*", "*" },
+		/*quirks*/DA_Q_4K
+	},
+	{
+		/*
+		 * OCZ Vertex 2 SSDs (inc pro series)
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "OCZ?VERTEX2*", "*" },
+		/*quirks*/DA_Q_4K
+	},
+	{
+		/*
+		 * OCZ Vertex 3 SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "OCZ-VERTEX3*", "*" },
+		/*quirks*/DA_Q_4K
+	},
+	{
+		/*
+		 * SuperTalent TeraDrive CT SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "FTM??CT25H*", "*" },
+		/*quirks*/DA_Q_4K
+	},
+	{
+		/*
+		 * Crucial RealSSD C300 SSDs
+		 * 4k optimised
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "C300-CTFDDAC???MAG*",
+		"*" }, /*quirks*/DA_Q_4K
+	},
+	{
+		/*
+		 * XceedIOPS SATA SSDs
+		 * 4k optimised
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SG9XCS2D*", "*" },
+		/*quirks*/DA_Q_4K
+	},
+	{
+		/*
+		 * Intel 330 Series SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "INTEL SSDSC2ct*", "*" },
+		/*quirks*/DA_Q_4K
+	},
+	{
+		/*
+		 * OCZ Deneva R Series SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "DENRSTE251M45*", "*" },
+		/*quirks*/DA_Q_4K
+	}
 };
 
 static	disk_strategy_t	dastrategy;
--- sys/cam/ata/ata_da.c	2012-07-13 16:41:49.838471171 +0000
+++ sys/cam/ata/ata_da.c	2012-07-18 12:14:49.189046166 +0000
@@ -268,6 +268,86 @@
 		/*quirks*/ADA_Q_4K
 	},
 	{
+		/*
+		 * Corsair Force 2 SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair CSSD-F*", "*" },
+		/*quirks*/ADA_Q_4K
+	},
+	{
+		/*
+		 * Corsair Force 3 SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Force 3*", "*" },
+		/*quirks*/ADA_Q_4K
+	},
+	{
+		/*
+		 * OCZ Agility 3 SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "OCZ-AGILITY3*", "*" },
+		/*quirks*/ADA_Q_4K
+	},
+	{
+		/*
+		 * OCZ Vertex 2 SSDs (inc pro series)
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "OCZ?VERTEX2*", "*" },
+		/*quirks*/ADA_Q_4K
+	},
+	{
+		/*
+		 * OCZ Vertex 3 SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "OCZ-VERTEX3*", "*" },
+		/*quirks*/ADA_Q_4K
+	},
+	{
+		/*
+		 * SuperTalent TeraDrive CT SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "FTM??CT25H*", "*" },
+		/*quirks*/ADA_Q_4K
+	},
+	{
+		/*
+		 * Crucial RealSSD C300 SSDs
+		 * 4k optimised
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "C300-CTFDDAC???MAG*",
+		"*" }, /*quirks*/ADA_Q_4K
+	},
+	{
+		/*
+		 * XceedIOPS SATA SSDs
+		 * 4k optimised
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "SG9XCS2D*", "*" },
+		/*quirks*/ADA_Q_4K
+	},
+	{
+		/*
+		 * Intel 330 Series SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "INTEL SSDSC2ct*", "*" },
+		/*quirks*/ADA_Q_4K
+	},
+	{
+		/*
+		 * OCZ Deneva R Series SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "DENRSTE251M45*", "*" },
+		/*quirks*/ADA_Q_4K
+	}
+	{
 		/* Default */
 		{
 		  T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED,


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-scsi 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Wed Jul 18 17:07:32 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer(s). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169974 

From: "Steven Hartland" <killing@multiplay.co.uk>
To: <bug-followup@freebsd.org>
Cc:  
Subject: Re: kern/169974: [cam] [patch] add Quirks for SSD that are 4k optimised
Date: Fri, 27 Jul 2012 10:13:14 +0100

 This is a multi-part message in MIME format.
 
 ------=_NextPart_000_12E9_01CD6BE0.6F334610
 Content-Type: text/plain;
 	format=flowed;
 	charset="Windows-1252";
 	reply-type=original
 Content-Transfer-Encoding: 7bit
 
 Updated patch attached
 
 ================================================
 This e.mail is private and confidential between Multiplay (UK) Ltd. and the person or entity to whom it is addressed. In the event of misdirection, the recipient is prohibited from using, copying, printing or otherwise disseminating it or any information contained in it. 
 
 In the event of misdirection, illegible or incomplete transmission please telephone +44 845 868 1337
 or return the E.mail to postmaster@multiplay.co.uk.
 ------=_NextPart_000_12E9_01CD6BE0.6F334610
 Content-Type: text/plain;
 	format=flowed;
 	name="ssd_quirks.txt";
 	reply-type=original
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment;
 	filename="ssd_quirks.txt"
 
 Adds 4K quirks for the following SSD's which all perform better when 4K =
 aligned=0A=
 and only except 4K deletes (TRIM):-=0A=
 * Corsair Force 2 & Force 3=0A=
 * OCZ Agility 3=0A=
 * OCZ Vertex 2 & Vertex 3=0A=
 * SuperTalent TeraDrive CT=0A=
 * Crucial RealSSD C300=0A=
 * XceedIOPS SATA=0A=
 * Intel 330 Series=0A=
 * OCZ Deneva R Series=0A=
 --- ./sys/cam/scsi/scsi_da.c.orig	2012-07-13 18:54:45.525693438 +0000=0A=
 +++ ./sys/cam/scsi/scsi_da.c	2012-07-13 18:55:06.959905372 +0000=0A=
 @@ -807,6 +807,86 @@=0A=
  		{ T_DIRECT, SIP_MEDIA_FIXED, "WDC WD??", "???PVT*", "*" },=0A=
  		/*quirks*/DA_Q_4K=0A=
  	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * Corsair Force 2 SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Corsair CSSD-F*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * Corsair Force 3 SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Corsair Force 3*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * OCZ Agility 3 SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "OCZ-AGILITY3*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * OCZ Vertex 2 SSDs (inc pro series)=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "OCZ?VERTEX2*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * OCZ Vertex 3 SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "OCZ-VERTEX3*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * SuperTalent TeraDrive CT SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "FTM??CT25H*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * Crucial RealSSD C300 SSDs=0A=
 +		 * 4k optimised=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "C300-CTFDDAC???MAG*",=0A=
 +		"*" }, /*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * XceedIOPS SATA SSDs=0A=
 +		 * 4k optimised=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SG9XCS2D*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * Intel 330 Series SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "INTEL SSDSC2ct*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * OCZ Deneva R Series SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "DENRSTE251M45*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	}=0A=
  };=0A=
  =0A=
  static	disk_strategy_t	dastrategy;=0A=
 --- sys/cam/ata/ata_da.c	2012-07-13 16:41:49.838471171 +0000=0A=
 +++ sys/cam/ata/ata_da.c	2012-07-18 12:14:49.189046166 +0000=0A=
 @@ -268,6 +268,86 @@=0A=
  		/*quirks*/ADA_Q_4K=0A=
  	},=0A=
  	{=0A=
 +		/*=0A=
 +		 * Corsair Force 2 SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair CSSD-F*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * Corsair Force 3 SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Force 3*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * OCZ Agility 3 SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "OCZ-AGILITY3*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * OCZ Vertex 2 SSDs (inc pro series)=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "OCZ?VERTEX2*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * OCZ Vertex 3 SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "OCZ-VERTEX3*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * SuperTalent TeraDrive CT SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "FTM??CT25H*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * Crucial RealSSD C300 SSDs=0A=
 +		 * 4k optimised=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "C300-CTFDDAC???MAG*",=0A=
 +		"*" }, /*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * XceedIOPS SATA SSDs=0A=
 +		 * 4k optimised=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "SG9XCS2D*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * Intel 330 Series SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "INTEL SSDSC2ct*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * OCZ Deneva R Series SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "DENRSTE251M45*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
  		/* Default */=0A=
  		{=0A=
  		  T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED,=0A=
 
 ------=_NextPart_000_12E9_01CD6BE0.6F334610--
 

From: "Steven Hartland" <killing@multiplay.co.uk>
To: <FreeBSD-gnats-submit@FreeBSD.org>,
	<freebsd-bugs@FreeBSD.org>
Cc:  
Subject: Re: kern/169974: Patch to add Quirks for SSD that are 4k optimised
Date: Mon, 30 Jul 2012 11:18:45 +0100

 This is a multi-part message in MIME format.
 
 ------=_NextPart_000_054F_01CD6E45.157ACAA0
 Content-Type: text/plain;
 	format=flowed;
 	charset="Windows-1252";
 	reply-type=original
 Content-Transfer-Encoding: 7bit
 
 Updated patch adding HyperX 3k, another set of sandforce based
 disks by Kingston.
 
     Regards
     Steve
 
 ================================================
 This e.mail is private and confidential between Multiplay (UK) Ltd. and the person or entity to whom it is addressed. In the event of misdirection, the recipient is prohibited from using, copying, printing or otherwise disseminating it or any information contained in it. 
 
 In the event of misdirection, illegible or incomplete transmission please telephone +44 845 868 1337
 or return the E.mail to postmaster@multiplay.co.uk.
 ------=_NextPart_000_054F_01CD6E45.157ACAA0
 Content-Type: text/plain;
 	format=flowed;
 	name="ssd_quirks.txt";
 	reply-type=original
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment;
 	filename="ssd_quirks.txt"
 
 Adds 4K quirks for the following SSD's which all perform better when 4K =
 aligned=0A=
 and only except 4K deletes (TRIM):-=0A=
 * Corsair Force 2 & Force 3=0A=
 * OCZ Agility 3=0A=
 * OCZ Vertex 2 & Vertex 3=0A=
 * SuperTalent TeraDrive CT=0A=
 * Crucial RealSSD C300=0A=
 * XceedIOPS SATA=0A=
 * Intel 330 Series=0A=
 * OCZ Deneva R Series=0A=
 * Kingston HyperX 3k=0A=
 --- sys/cam/ata/ata_da.c.orig	2012-07-18 12:11:26.036266229 +0000=0A=
 +++ sys/cam/ata/ata_da.c	2012-07-30 10:02:43.445141719 +0000=0A=
 @@ -268,6 +268,94 @@=0A=
  		/*quirks*/ADA_Q_4K=0A=
  	},=0A=
  	{=0A=
 +		/*=0A=
 +		 * Corsair Force 2 SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair CSSD-F*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * Corsair Force 3 SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Force 3*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * OCZ Agility 3 SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "OCZ-AGILITY3*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * OCZ Vertex 2 SSDs (inc pro series)=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "OCZ?VERTEX2*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * OCZ Vertex 3 SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "OCZ-VERTEX3*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * SuperTalent TeraDrive CT SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "FTM??CT25H*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * Crucial RealSSD C300 SSDs=0A=
 +		 * 4k optimised=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "C300-CTFDDAC???MAG*",=0A=
 +		"*" }, /*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * XceedIOPS SATA SSDs=0A=
 +		 * 4k optimised=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "SG9XCS2D*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * Intel 330 Series SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "INTEL SSDSC2ct*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * OCZ Deneva R Series SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "DENRSTE251M45*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * Kingston HyperX 3k SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "KINGSTON SH103S3*", "*" },=0A=
 +		/*quirks*/ADA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
  		/* Default */=0A=
  		{=0A=
  		  T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED,=0A=
 --- sys/cam/scsi/scsi_da.c.orig	2012-07-30 10:05:12.801568145 +0000=0A=
 +++ sys/cam/scsi/scsi_da.c	2012-07-30 10:02:00.416761382 +0000=0A=
 @@ -846,6 +846,94 @@=0A=
  		/* WDC Scorpio Blue Advanced Format (4k) drives */=0A=
  		{ T_DIRECT, SIP_MEDIA_FIXED, "WDC WD??", "???PVT*", "*" },=0A=
  		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * Corsair Force 2 SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Corsair CSSD-F*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * Corsair Force 3 SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Corsair Force 3*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * OCZ Agility 3 SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "OCZ-AGILITY3*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * OCZ Vertex 2 SSDs (inc pro series)=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "OCZ?VERTEX2*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * OCZ Vertex 3 SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "OCZ-VERTEX3*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * SuperTalent TeraDrive CT SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "FTM??CT25H*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * Crucial RealSSD C300 SSDs=0A=
 +		 * 4k optimised=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "C300-CTFDDAC???MAG*",=0A=
 +		"*" }, /*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * XceedIOPS SATA SSDs=0A=
 +		 * 4k optimised=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SG9XCS2D*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * Intel 330 Series SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "INTEL SSDSC2ct*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * OCZ Deneva R Series SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "DENRSTE251M45*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
 +	},=0A=
 +	{=0A=
 +		/*=0A=
 +		 * Kingston HyperX 3k SSDs=0A=
 +		 * 4k optimised & trim only works in 4k requests + 4k aligned=0A=
 +		 */=0A=
 +		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "KINGSTON SH103S3*", "*" },=0A=
 +		/*quirks*/DA_Q_4K=0A=
  	}=0A=
  };=0A=
  =0A=
 
 ------=_NextPart_000_054F_01CD6E45.157ACAA0--
 
Responsible-Changed-From-To: freebsd-scsi->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Tue Oct 16 19:19:39 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169974 
State-Changed-From-To: open->analyzed 
State-Changed-By: eadler 
State-Changed-When: Tue Oct 16 19:53:05 UTC 2012 
State-Changed-Why:  
awaiting approval or review prior to commit (no action needed from 
submitter) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169974 
State-Changed-From-To: analyzed->patched 
State-Changed-By: eadler 
State-Changed-When: Tue Oct 30 03:31:23 UTC 2012 
State-Changed-Why:  
committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169974 
State-Changed-From-To: patched->closed 
State-Changed-By: eadler 
State-Changed-When: Fri Nov 9 01:37:47 UTC 2012 
State-Changed-Why:  
MFCed/fixed by now or it will never be MFCed 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169974 
>Unformatted:
