Author: dumbbell
Date: Tue Mar 29 06:56:46 2016
New Revision: 297370
URL: https://svnweb.freebsd.org/changeset/base/297370

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.
  
  Reviewed by:  Kevin Bowling <kevin.bowl...@kev009.com>,
                Jason Wolfe <j...@nitrology.com>
  Approved by:  Kevin Bowling <kevin.bowl...@kev009.com>,
                Jason Wolfe <j...@nitrology.com>
  MFC after:    1 week
  Differential Revision:        https://reviews.freebsd.org/D5753

Modified:
  head/sys/cam/ata/ata_da.c
  head/sys/cam/scsi/scsi_da.c

Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c   Tue Mar 29 01:41:07 2016        (r297369)
+++ head/sys/cam/ata/ata_da.c   Tue Mar 29 06:56:46 2016        (r297370)
@@ -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,18 +474,13 @@ static struct ada_quirk_entry ada_quirk_
        },
        {
                /*
-                * 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
        },
        {

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c Tue Mar 29 01:41:07 2016        (r297369)
+++ head/sys/cam/scsi/scsi_da.c Tue Mar 29 06:56:46 2016        (r297370)
@@ -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,18 +1146,13 @@ static struct da_quirk_entry da_quirk_ta
        },
        {
                /*
-                * 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
        },
        {
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to