Author: smh
Date: Fri Jun 7 12:42:49 2013
New Revision: 251493
URL: http://svnweb.freebsd.org/changeset/base/251493
Log:
MFC r251061:
More 4k quirks for SSD's
Modified:
stable/8/sys/cam/ata/ata_da.c
stable/8/sys/cam/scsi/scsi_da.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/cam/ (props changed)
Modified: stable/8/sys/cam/ata/ata_da.c
==============================================================================
--- stable/8/sys/cam/ata/ata_da.c Fri Jun 7 12:33:40 2013
(r251492)
+++ stable/8/sys/cam/ata/ata_da.c Fri Jun 7 12:42:49 2013
(r251493)
@@ -273,12 +273,11 @@ static struct ada_quirk_entry ada_quirk_
{ T_DIRECT, SIP_MEDIA_FIXED, "*", "WDC WD?????PVT*", "*" },
/*quirks*/ADA_Q_4K
},
+ /* SSDs */
{
/*
* Corsair Force 2 SSDs
* 4k optimised & trim only works in 4k requests + 4k aligned
- * Submitted by: Steven Hartland
<steven.hartl...@multiplay.co.uk>
- * PR: 169974
*/
{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair CSSD-F*", "*" },
/*quirks*/ADA_Q_4K
@@ -287,100 +286,136 @@ static struct ada_quirk_entry ada_quirk_
/*
* Corsair Force 3 SSDs
* 4k optimised & trim only works in 4k requests + 4k aligned
- * Submitted by: Steven Hartland
<steven.hartl...@multiplay.co.uk>
- * PR: 169974
*/
{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Force 3*", "*" },
/*quirks*/ADA_Q_4K
},
{
/*
- * OCZ Agility 3 SSDs
+ * Corsair Force GT SSDs
* 4k optimised & trim only works in 4k requests + 4k aligned
- * Submitted by: Steven Hartland
<steven.hartl...@multiplay.co.uk>
- * PR: 169974
*/
- { T_DIRECT, SIP_MEDIA_FIXED, "*", "OCZ-AGILITY3*", "*" },
+ { T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Force GT*", "*" },
/*quirks*/ADA_Q_4K
},
{
/*
- * OCZ Vertex 2 SSDs (inc pro series)
+ * Crucial M4 SSDs
* 4k optimised & trim only works in 4k requests + 4k aligned
- * Submitted by: Steven Hartland
<steven.hartl...@multiplay.co.uk>
- * PR: 169974
*/
- { T_DIRECT, SIP_MEDIA_FIXED, "*", "OCZ?VERTEX2*", "*" },
+ { T_DIRECT, SIP_MEDIA_FIXED, "*", "M4-CT???M4SSD2*", "*" },
/*quirks*/ADA_Q_4K
},
{
/*
- * OCZ Vertex 3 SSDs
+ * Crucial RealSSD C300 SSDs
+ * 4k optimised
+ */
+ { T_DIRECT, SIP_MEDIA_FIXED, "*", "C300-CTFDDAC???MAG*",
+ "*" }, /*quirks*/ADA_Q_4K
+ },
+ {
+ /*
+ * Intel 320 Series SSDs
* 4k optimised & trim only works in 4k requests + 4k aligned
- * Submitted by: Steven Hartland
<steven.hartl...@multiplay.co.uk>
- * PR: 169974
*/
- { T_DIRECT, SIP_MEDIA_FIXED, "*", "OCZ-VERTEX3*", "*" },
+ { T_DIRECT, SIP_MEDIA_FIXED, "*", "INTEL SSDSA2CW*", "*" },
/*quirks*/ADA_Q_4K
},
{
/*
- * SuperTalent TeraDrive CT SSDs
+ * Intel 330 Series SSDs
* 4k optimised & trim only works in 4k requests + 4k aligned
- * Submitted by: Steven Hartland
<steven.hartl...@multiplay.co.uk>
- * PR: 169974
*/
- { T_DIRECT, SIP_MEDIA_FIXED, "*", "FTM??CT25H*", "*" },
+ { T_DIRECT, SIP_MEDIA_FIXED, "*", "INTEL SSDSC2CT*", "*" },
/*quirks*/ADA_Q_4K
},
{
/*
- * Crucial RealSSD C300 SSDs
- * 4k optimised
- * Submitted by: Steven Hartland
<steven.hartl...@multiplay.co.uk>
- * PR: 169974
+ * Intel 510 Series SSDs
+ * 4k optimised & trim only works in 4k requests + 4k aligned
*/
- { T_DIRECT, SIP_MEDIA_FIXED, "*", "C300-CTFDDAC???MAG*",
- "*" }, /*quirks*/ADA_Q_4K
+ { T_DIRECT, SIP_MEDIA_FIXED, "*", "INTEL SSDSC2MH*", "*" },
+ /*quirks*/ADA_Q_4K
},
{
/*
- * XceedIOPS SATA SSDs
- * 4k optimised
- * Submitted by: Steven Hartland
<steven.hartl...@multiplay.co.uk>
- * PR: 169974
+ * Intel 520 Series SSDs
+ * 4k optimised & trim only works in 4k requests + 4k aligned
*/
- { T_DIRECT, SIP_MEDIA_FIXED, "*", "SG9XCS2D*", "*" },
+ { T_DIRECT, SIP_MEDIA_FIXED, "*", "INTEL SSDSC2BW*", "*" },
/*quirks*/ADA_Q_4K
},
{
/*
- * Intel 330 Series SSDs
+ * Kingston E100 Series SSDs
+ * 4k optimised & trim only works in 4k requests + 4k aligned
+ */
+ { T_DIRECT, SIP_MEDIA_FIXED, "*", "KINGSTON SE100S3*", "*" },
+ /*quirks*/ADA_Q_4K
+ },
+ {
+ /*
+ * Kingston HyperX 3k SSDs
+ * 4k optimised & trim only works in 4k requests + 4k aligned
+ */
+ { T_DIRECT, SIP_MEDIA_FIXED, "*", "KINGSTON SH103S3*", "*" },
+ /*quirks*/ADA_Q_4K
+ },
+ {
+ /*
+ * OCZ Agility 3 SSDs
* 4k optimised & trim only works in 4k requests + 4k aligned
- * Submitted by: Steven Hartland
<steven.hartl...@multiplay.co.uk>
- * PR: 169974
*/
- { T_DIRECT, SIP_MEDIA_FIXED, "*", "INTEL SSDSC2ct*", "*" },
+ { T_DIRECT, SIP_MEDIA_FIXED, "*", "OCZ-AGILITY3*", "*" },
/*quirks*/ADA_Q_4K
},
{
/*
* OCZ Deneva R Series SSDs
* 4k optimised & trim only works in 4k requests + 4k aligned
- * Submitted by: Steven Hartland
<steven.hartl...@multiplay.co.uk>
- * PR: 169974
*/
{ T_DIRECT, SIP_MEDIA_FIXED, "*", "DENRSTE251M45*", "*" },
/*quirks*/ADA_Q_4K
},
{
/*
- * Kingston HyperX 3k SSDs
+ * OCZ Vertex 2 SSDs (inc pro series)
* 4k optimised & trim only works in 4k requests + 4k aligned
- * Submitted by: Steven Hartland
<steven.hartl...@multiplay.co.uk>
- * PR: 169974
*/
- { T_DIRECT, SIP_MEDIA_FIXED, "*", "KINGSTON SH103S3*", "*" },
+ { 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, "*", "OCZ-VERTEX3*", "*" },
+ /*quirks*/ADA_Q_4K
+ },
+ {
+ /*
+ * Samsung 830 Series SSDs
+ * 4k optimised
+ */
+ { T_DIRECT, SIP_MEDIA_FIXED, "*", "SAMSUNG SSD 830 Series*",
"*" },
+ /*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
+ },
+ {
+ /*
+ * XceedIOPS SATA SSDs
+ * 4k optimised
+ */
+ { T_DIRECT, SIP_MEDIA_FIXED, "*", "SG9XCS2D*", "*" },
/*quirks*/ADA_Q_4K
},
{
Modified: stable/8/sys/cam/scsi/scsi_da.c
==============================================================================
--- stable/8/sys/cam/scsi/scsi_da.c Fri Jun 7 12:33:40 2013
(r251492)
+++ stable/8/sys/cam/scsi/scsi_da.c Fri Jun 7 12:42:49 2013
(r251493)
@@ -897,6 +897,151 @@ static struct da_quirk_entry da_quirk_ta
{T_DIRECT, SIP_MEDIA_FIXED, "SAMSUNG", "HM250JI", "*"},
/*quirks*/ DA_Q_NO_SYNC_CACHE
},
+ /* SATA SSDs */
+ {
+ /*
+ * 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
+ },
+ {
+ /*
+ * Corsair Force GT SSDs
+ * 4k optimised & trim only works in 4k requests + 4k aligned
+ */
+ { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Corsair Force GT*", "*" },
+ /*quirks*/DA_Q_4K
+ },
+ {
+ /*
+ * Crucial M4 SSDs
+ * 4k optimised & trim only works in 4k requests + 4k aligned
+ */
+ { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "M4-CT???M4SSD2*", "*" },
+ /*quirks*/DA_Q_4K
+ },
+ {
+ /*
+ * Crucial RealSSD C300 SSDs
+ * 4k optimised
+ */
+ { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "C300-CTFDDAC???MAG*",
+ "*" }, /*quirks*/DA_Q_4K
+ },
+ {
+ /*
+ * Intel 320 Series SSDs
+ * 4k optimised & trim only works in 4k requests + 4k aligned
+ */
+ { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "INTEL SSDSA2CW*", "*" },
+ /*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
+ },
+ {
+ /*
+ * Intel 510 Series SSDs
+ * 4k optimised & trim only works in 4k requests + 4k aligned
+ */
+ { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "INTEL SSDSC2MH*", "*" },
+ /*quirks*/DA_Q_4K
+ },
+ {
+ /*
+ * Intel 520 Series SSDs
+ * 4k optimised & trim only works in 4k requests + 4k aligned
+ */
+ { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "INTEL SSDSC2BW*", "*" },
+ /*quirks*/DA_Q_4K
+ },
+ {
+ /*
+ * Kingston E100 Series SSDs
+ * 4k optimised & trim only works in 4k requests + 4k aligned
+ */
+ { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "KINGSTON SE100S3*", "*" },
+ /*quirks*/DA_Q_4K
+ },
+ {
+ /*
+ * Kingston HyperX 3k SSDs
+ * 4k optimised & trim only works in 4k requests + 4k aligned
+ */
+ { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "KINGSTON SH103S3*", "*" },
+ /*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 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
+ },
+ {
+ /*
+ * 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
+ },
+ {
+ /*
+ * Samsung 830 Series SSDs
+ * 4k optimised & trim only works in 4k requests + 4k aligned
+ */
+ { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SAMSUNG SSD 830 Series*",
"*" },
+ /*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
+ },
+ {
+ /*
+ * XceedIOPS SATA SSDs
+ * 4k optimised
+ */
+ { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SG9XCS2D*", "*" },
+ /*quirks*/DA_Q_4K
+ },
};
static disk_strategy_t dastrategy;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
