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

[Jean-Sébastien Pédron]

Author: dumbbell
Date: Tue Apr  5 08:37:21 2016
New Revision: 297575
URL: https://svnweb.freebsd.org/changeset/base/297575

Log:
  CAM: Generalize 4k quirk to all Samsung MZ7* SSDs
  
  This adds Samsung PM851 to the list. It can be found in Lenovo Thinkpad
  T440 for instance.
  
  MFC of:		r297370
  Reviewed by:	Kevin Bowling <kevin.bowling at kev009.com>,
  		Jason Wolfe <j at nitrology.com>
  Approved by:	Kevin Bowling <kevin.bowling at kev009.com>,
  		Jason Wolfe <j at nitrology.com>
  Differential Revision:	https://reviews.freebsd.org/D5753

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	Tue Apr  5 06:37:58 2016	(r297574)
+++ stable/10/sys/cam/ata/ata_da.c	Tue Apr  5 08:37:21 2016	(r297575)
@@ -466,14 +466,6 @@ static struct ada_quirk_entry ada_quirk_
 	},
 	{
 		/*
-		 * Samsung 843T Series SSDs
-		 * 4k optimised
-		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "SAMSUNG MZ7WD*", "*" },
-		/*quirks*/ADA_Q_4K
-	},
- 	{
- 		/*
 		 * Samsung 850 SSDs
 		 * 4k optimised
 		 */
@@ -482,10 +474,13 @@ static struct ada_quirk_entry ada_quirk_
 	},
 	{
 		/*
-		 * Samsung PM853T Series SSDs
+		 * Samsung 843T Series SSDs (MZ7WD*)
+		 * Samsung PM851 Series SSDs (MZ7TE*)
+		 * Samsung PM853T Series SSDs (MZ7GE*)
+		 * Samsung SM863 Series SSDs (MZ7KM*)
 		 * 4k optimised
 		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "SAMSUNG MZ7GE*", "*" },
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "SAMSUNG MZ7*", "*" },
 		/*quirks*/ADA_Q_4K
 	},
 	{

Modified: stable/10/sys/cam/scsi/scsi_da.c
==============================================================================
--- stable/10/sys/cam/scsi/scsi_da.c	Tue Apr  5 06:37:58 2016	(r297574)
+++ stable/10/sys/cam/scsi/scsi_da.c	Tue Apr  5 08:37:21 2016	(r297575)
@@ -1138,14 +1138,6 @@ static struct da_quirk_entry da_quirk_ta
 	},
 	{
 		/*
-		 * Samsung 843T Series SSDs
-		 * 4k optimised
-		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SAMSUNG MZ7WD*", "*" },
-		/*quirks*/DA_Q_4K
-	},
- 	{
- 		/*
 		 * Samsung 850 SSDs
 		 * 4k optimised & trim only works in 4k requests + 4k aligned
 		 */
@@ -1154,10 +1146,13 @@ static struct da_quirk_entry da_quirk_ta
 	},
 	{
 		/*
-		 * Samsung PM853T Series SSDs
+		 * Samsung 843T Series SSDs (MZ7WD*)
+		 * Samsung PM851 Series SSDs (MZ7TE*)
+		 * Samsung PM853T Series SSDs (MZ7GE*)
+		 * Samsung SM863 Series SSDs (MZ7KM*)
 		 * 4k optimised
 		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SAMSUNG MZ7GE*", "*" },
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SAMSUNG MZ7*", "*" },
 		/*quirks*/DA_Q_4K
 	},
 	{