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. Reviewed by: Kevin Bowling <[email protected]>, Jason Wolfe <[email protected]> Approved by: Kevin Bowling <[email protected]>, Jason Wolfe <[email protected]> MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D5753
saurindashadia · Mar 29, 2016 · 8a637d8 · 8a637d8
1 parent 0e3e40e
commit 8a637d8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 36 deletions.
diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c
@@ -466,14 +466,6 @@ static struct ada_quirk_entry ada_quirk_table[] =
 	},
 	{
 		/*
-		 * Samsung 843T Series SSDs
-		 * 4k optimised
-		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "SAMSUNG MZ7WD*", "*" },
-		/*quirks*/ADA_Q_4K
-	},
- 	{
- 		/*
 		 * Samsung 850 SSDs
 		 * 4k optimised
 		 */
@@ -482,18 +474,13 @@ static struct ada_quirk_entry ada_quirk_table[] =
 	},
 	{
 		/*
-		 * Samsung PM853T Series SSDs
-		 * 4k optimised
-		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "SAMSUNG MZ7GE*", "*" },
-		/*quirks*/ADA_Q_4K
-	},
-	{
-		/*
-		 * Samsung SM863 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 MZ7KM*", "*" },
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "SAMSUNG MZ7*", "*" },
 		/*quirks*/ADA_Q_4K
 	},
 	{

diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
@@ -1138,14 +1138,6 @@ static struct da_quirk_entry da_quirk_table[] =
 	},
 	{
 		/*
-		 * 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,18 +1146,13 @@ static struct da_quirk_entry da_quirk_table[] =
 	},
 	{
 		/*
-		 * Samsung PM853T Series SSDs
-		 * 4k optimised
-		 */
-		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SAMSUNG MZ7GE*", "*" },
-		/*quirks*/DA_Q_4K
-	},
-	{
-		/*
-		 * Samsung SM863 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 MZ7KM*", "*" },
+		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SAMSUNG MZ7*", "*" },
 		/*quirks*/DA_Q_4K
 	},
 	{