svn commit: r270313 - in stable/10/sys/cam: ata scsi

[Steven Hartland]

Author: smh
Date: Thu Aug 21 22:47:03 2014
New Revision: 270313
URL: http://svnweb.freebsd.org/changeset/base/270313

Log:
  MFC r269974 - Added 4K quirks for Corsair Force GT and Samsung 840 SSDs
  
  Sponsored by:	Multiplay

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 Aug 21 22:44:08 2014	(r270312)
+++ stable/10/sys/cam/ata/ata_da.c	Thu Aug 21 22:47:03 2014	(r270313)
@@ -299,10 +299,10 @@ static struct ada_quirk_entry ada_quirk_
 	},
 	{
 		/*
-		 * Corsair Force GT SSDs
+		 * Corsair Force GT & GS SSDs
 		 * 4k optimised & trim only works in 4k requests + 4k aligned
 		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Force GT*", "*" },
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Force G*", "*" },
 		/*quirks*/ADA_Q_4K
 	},
 	{
@@ -443,6 +443,14 @@ static struct ada_quirk_entry ada_quirk_
 	},
 	{
 		/*
+		 * Samsung 840 SSDs
+		 * 4k optimised
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Samsung SSD 840*", "*" },
+		/*quirks*/ADA_Q_4K
+	},
+	{
+		/*
 		 * SuperTalent TeraDrive CT 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 Aug 21 22:44:08 2014	(r270312)
+++ stable/10/sys/cam/scsi/scsi_da.c	Thu Aug 21 22:47:03 2014	(r270313)
@@ -967,10 +967,10 @@ static struct da_quirk_entry da_quirk_ta
 	},
 	{
 		/*
-		 * Corsair Force GT SSDs
+		 * Corsair Force GT & GS SSDs
 		 * 4k optimised & trim only works in 4k requests + 4k aligned
 		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Corsair Force GT*", "*" },
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Corsair Force G*", "*" },
 		/*quirks*/DA_Q_4K
 	},
 	{
@@ -1111,6 +1111,14 @@ static struct da_quirk_entry da_quirk_ta
 	},
 	{
 		/*
+		 * Samsung 840 SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Samsung SSD 840*", "*" },
+		/*quirks*/DA_Q_4K
+	},
+	{
+		/*
 		 * SuperTalent TeraDrive CT SSDs
 		 * 4k optimised & trim only works in 4k requests + 4k aligned
 		 */