svn commit: r326119 - in stable/11/sys/cam: ata scsi

[Baptiste Daroussin]

Author: bapt
Date: Thu Nov 23 09:35:01 2017
New Revision: 326119
URL: https://svnweb.freebsd.org/changeset/base/326119

Log:
  MFC r325888:
  
  Add some 4k quirks for Samsung pm863a SSDs
  
  Submitted by:	Nikita Kozlov <nikita.kozlov at blade-group.com>
  Sponsored by:	blade
  Differential Revision:	https://reviews.freebsd.org/D13093

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

Modified: stable/11/sys/cam/ata/ata_da.c
==============================================================================
--- stable/11/sys/cam/ata/ata_da.c	Thu Nov 23 08:02:02 2017	(r326118)
+++ stable/11/sys/cam/ata/ata_da.c	Thu Nov 23 09:35:01 2017	(r326119)
@@ -660,6 +660,14 @@ static struct ada_quirk_entry ada_quirk_table[] =
 	},
 	{
 		/*
+		 * Same as for SAMSUNG MZ7* but enable the quirks for SSD
+		 * starting with MZ7* too
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "MZ7*", "*" },
+		/*quirks*/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN
+	},
+	{
+		/*
 		 * Samsung PM851 Series SSDs Dell OEM
 		 * device model          "SAMSUNG SSD PM851 mSATA 256GB"
 		 * 4k optimised, NCQ broken

Modified: stable/11/sys/cam/scsi/scsi_da.c
==============================================================================
--- stable/11/sys/cam/scsi/scsi_da.c	Thu Nov 23 08:02:02 2017	(r326118)
+++ stable/11/sys/cam/scsi/scsi_da.c	Thu Nov 23 09:35:01 2017	(r326119)
@@ -1271,6 +1271,14 @@ static struct da_quirk_entry da_quirk_table[] =
 	},
 	{
 		/*
+		 * Same as for SAMSUNG MZ7* but enable the quirks for SSD
+		 * starting with MZ7* too
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "MZ7*", "*" },
+		/*quirks*/DA_Q_4K
+	},
+	{
+		/*
 		 * SuperTalent TeraDrive CT SSDs
 		 * 4k optimised & trim only works in 4k requests + 4k aligned
 		 */