diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index 498822364b330ebdc5c324f282fdcb4980f70146..95103da75c9186dd0a23d073fa89ca8b70d2b5a1 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -352,8 +352,9 @@ const drive_settings builtin_knowndrives[] = {
},
{ "Crucial/Micron MX500 SSDs",
"CT(250|500|1000|2000)MX500SSD[14]", // tested with CT500MX500SSD1/M3CR020,
- // .../M3CR022, .../M3CR023, CT1000MX500SSD1/M3CR010
- "M3CR0([01][0-9]|2[0-3])", // Assume FW <= M3CR023 have bogus attribute 197 (see ticket #1227, #1311)
+ // .../M3CR022, .../M3CR023, CT1000MX500SSD1/M3CR010, .../M3CR032
+ "M3CR0([012][0-9]|3[0-2])", // Assume FW <= M3CR032 have bogus attribute 197
+ // (tickets #1227, #1311, #1336)
"This firmware returns bogus raw values in attribute 197",
//"-v 1,raw48,Raw_Read_Error_Rate "
"-v 5,raw48,Reallocate_NAND_Blk_Cnt "
@@ -448,10 +449,11 @@ const drive_settings builtin_knowndrives[] = {
// Reference: https://www.micron.com/resource-details/feec878a-265e-49a7-8086-15137c5f9011
// TN-FD-34: 5100 SSD SMART Implementation
{
- "Micron 5100 Pro / 5200 SSDs",
+ "Micron 5100 Pro / 5200 / 5300 SSDs",
"(Micron_5100_)?(EE|MT)FDDA[KV](240|480|960|1T9|3T8|7T6)T(BY|CB|CC)|" // Matches both stock and Dell OEM
// tested with Micron_5100_MTFDDAK3T8TCB/D0MU410, MTFDDAK3T8TCB/D0MU410
- "(Micron_5200_)?MTFDDAK(480|960|1T9|3T8|7T6)TD(C|D|N)", // tested with Micron_5200_MTFDDAK3T8TDD/D1MU505
+ "(Micron_5200_)?MTFDDAK(480|960|1T9|3T8|7T6)TD(C|D|N)|" // tested with Micron_5200_MTFDDAK3T8TDD/D1MU505
+ "Micron_5300_MTFDDA[KV](240|480|960|1T9|3T8|7T6)TDS", // tested with Micron_5300_MTFDDAK1T9TDS/D3MU001
"", "",
//"-v 1,raw48,Raw_Read_Error_Rate "
//"-v 5,raw48,Reallocated_Block_Count "
@@ -479,6 +481,7 @@ const drive_settings builtin_knowndrives[] = {
"-v 211,raw48,Integ_Scan_Complete_Cnt " // Number of periodic data integrity scans completed
"-v 212,raw48,Integ_Scan_Folding_Cnt " // Number of blocks reallocated by integrity scans
"-v 213,raw48,Integ_Scan_Progress " // Current is percentage, raw is absolute number of superblocks scanned by the current integrity scan
+ "-v 246,raw48,Unknown_Micron_Attrib " // 5300/D3MU001
"-v 247,raw48,Host_Program_Page_Count "
"-v 248,raw48,Bckgnd_Program_Page_Cnt"
},
@@ -677,6 +680,7 @@ const drive_settings builtin_knowndrives[] = {
},
{ "Phison Driven SSDs", // see MKP_521_Phison_SMART_attribute.pdf
"BP4 mSATA SSD|" // MyDigital BP4, tested with BP4 mSATA SSD/S8FM06.9
+ "Corsair Force LE200 SSD|" // tested with Corsair Force LE200 SSD/SBFM10, .../SBFM60.9
"GIGABYTE GP-GSTFS31((120|240|256|480)G|100T)NTD|" // tested with GIGABYTE GP-GSTFS31120GNTD/SBFM61.3
"GOODRAM IRIDIUM PRO|" // tested with GOODRAM IRIDIUM PRO/SAFM01.5
"IR-SSDPR-S25A-(120|240|480|960)|" // Goodram IRIDM, tested with IR-SSDPR-S25A-120/SBFM91.3,
@@ -1675,7 +1679,7 @@ const drive_settings builtin_knowndrives[] = {
"-v 234,raw24/raw24:w01234,Avg/Max_Erase_Count "
"-v 235,raw24/raw24:w01z23,Good/Sys_Block_Count"
},
- { "JMicron based SSDs", // JMicron JMF61x, JMF66x, JMF670
+ { "JMicron/Maxiotek based SSDs", // JMicron JMF61x, JMF66x, JMF670
"ADATA S596 Turbo|" // tested with ADATA S596 Turbo 256GB SATA SSD (JMicron JMF616)
"ADATA SP310|" // Premier Pro SP310 mSATA, JMF667, tested with ADATA SP310/3.04
"ADATA SP600(NS34)?|" // tested with ADATA SP600/2.4 (JMicron JMF661)
@@ -1691,6 +1695,7 @@ const drive_settings builtin_knowndrives[] = {
"KINGSTON SVP?100S2B?(64|96|128|256|512)G|" // SSDNow V100/V+100 Series,
// tested with KINGSTON SVP100S296G/CJR10202, KINGSTON SV100S2256G/D110225a
"KINGSTON SV200S3(64|128|256)G|" // SSDNow V200 Series, tested with KINGSTON SV200S3128G/E120506a
+ "NT-(64|128|256|512|[12]T)|" // KingSpec NT, MAS0902A-B2C or CS1802A-B2C, tested with NT-512/T191212
"TOSHIBA THNS128GG4BBAA|" // Toshiba / Super Talent UltraDrive DX,
// tested with Toshiba 128GB 2.5" SSD (built in MacBooks)
"TOSHIBA THNSNC128GMLJ|" // tested with THNSNC128GMLJ/CJTA0202 (built in Toshiba Protege/Dynabook)
@@ -1731,8 +1736,8 @@ const drive_settings builtin_knowndrives[] = {
// tested with PLEXTOR PX-128M3/1.01, PX-128M3P/1.04, PX-256M3/1.05, PX-128M5S/1.02, PX-256M5S/1.03,
// PX-128M5M/1.05, PX-128M5S/1.05, PX-128M5Pro/1.05, PX-512M5Pro/1.06, PX-256M5P/1.01, PX-128M6S/1.03
// (1.04/5 Firmware self-test log lifetime unit is bogus, possibly 1/256 hours)
- // PLEXTOR PX-256M6S+/1.00, PLEXTOR PX-128M3/1.00, PLEXTOR PX-128M3/1.07
- "PLEXTOR ?PX-(64|128|256|512|768)M(3P?|5[MPS]|5Pro|6[MS])\\+?",
+ // PLEXTOR PX-256M6S+/1.00, PLEXTOR PX-128M3/1.00, PLEXTOR PX-128M3/1.07, PLEXTOR PX-128M6V/1.04
+ "PLEXTOR ?PX-(64|128|256|512|768)M(3P?|5[MPS]|5Pro|6[MSV])\\+?",
"", "",
//"-v 1,raw48,Raw_Read_Error_Rate "
//"-v 5,raw16(raw16),Reallocated_Sector_Ct "
@@ -4112,7 +4117,7 @@ const drive_settings builtin_knowndrives[] = {
},
{ "Seagate IronWolf", // tested with ST6000VN0033-2EE110/SC60,
// ST6000VN0041-2EL11C/SC61, ST12000VN0007-2GS116/SC60, ST12000VN0008-2JH101/SC60
- "ST(1|2|3|4|6|8|10|12)000VN00(0?[2478]|22|33|41)-.*",
+ "ST(1|2|3|4|6|8|10|12)000VN00(0?[2478]|1|22|33|41)-.*",
"", "", ""
},
{ "Seagate IronWolf Pro", // tested with ST4000NE0025-2EW107/EN02,
@@ -4270,15 +4275,17 @@ const drive_settings builtin_knowndrives[] = {
"-v 242,raw48,Lifetime_Rds_Frm_Hst_GB "
"-v 243,hex48,Free_Space "
},
- { "WD Blue and Green SSDs", // tested with WDC WDS250G1B0A-00H9H0/X41000WD,
+ { "WD Blue / Red / Green SSDs", // tested with WDC WDS250G1B0A-00H9H0/X41000WD,
// WDC WDS250G1B0A-00H9H0/X41100WD, WDC WDS100T1B0A-00H9H0,
// WDC WDS120G2G0A-00JH30/UE360000, WDC WDS240G2G0A-00JH30/UF300000,
// WDC WDS500G2B0A-00SM50/X61130WD, WDC WDS200T2B0A-00SM50/X61130WD,
// WDC WDS200T2B0A/X61190WD, WDC WDS120G1G0A-00SS50/Z3311000
// WDC WDS500G2B0A-00SM50/401000WD,
- // WDC WDBNCE2500PNC/X61130WD, WDC WDBNCE0010PNC-WRSN/X41110WD
+ // WDC WDBNCE2500PNC/X61130WD, WDC WDBNCE0010PNC-WRSN/X41110WD,
+ // WDC WDS200T1R0A-68A4W0/411000WR
"WDC WDBNCE(250|500|00[124])0PNC(-.*)?|" // Blue 3D
- "WDC ?WDS((120|240|250|480|500)G|[12]00T)(1B|2B|1G|2G)0[AB](-.*)?", // *B* = Blue, *G* = Green, *2B* = Blue 3D NAND
+ "WDC ?WDS((120|240|250|480|500)G|[12]00T)(1B|2B|1G|2G|1R)0[AB](-.*)?",
+ // *B* = Blue, *G* = Green, *2B* = Blue 3D NAND, *1R* = Red SA500
"", "",
//"-v 5,raw48,Reallocated_Sector_Ct " // Reassigned Block Count
//"-v 9,raw48,Power_On_Hours "
@@ -4599,7 +4606,7 @@ const drive_settings builtin_knowndrives[] = {
{ "Western Digital Blue Mobile", // tested with WDC WD5000LPVX-08V0TT2/03.01A03,
// WDC WD10JPVX-75JC3T0/0301A03, WDC WD10JPVX-22JC3T0/01.01A01,
// WDC WD20NPVZ-00WFZT0/01.01A01
- "WDC WD(3200LPCX|5000[BL]P[CV]X|7500BPVX|10JPVX|(15|20)NPVZ)-.*",
+ "WDC WD(3200LPCX|5000[BL]P[CV]X|7500BPVX|10JP[VZ]X|(15|20)NPVZ)-.*",
"", "", ""
},
{ "Western Digital Blue Mobile (SMR)", // ticket #1313, tested with
@@ -5778,6 +5785,12 @@ const drive_settings builtin_knowndrives[] = {
"",
"-d sat"
},
+ { "USB: OWC Mercury Elite Pro Quad; ",
+ "0x1e91:0xa4a7",
+ "", // 0x0100
+ "",
+ "-d sat"
+ },
// Innostor
{ "USB: ; Innostor IS611", // USB3->SATA+PATA
"0x1f75:0x0611", // SMART access via PATA does not work
diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc
index 8efba23f9b23a550ff9baed9df648803ac0e4c12..ec2ee238a297192b4b65c368b4dd2dee9b124978 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,10 +1,10 @@
-----BEGIN PGP SIGNATURE-----
-iQEcBAABAgAGBQJeypbAAAoJEPOHY87f0iVZf5UH/32T7nx4YYbfROZJ9bCofqFQ
-FzlBGIZizhNyTm42z5geI0ebwiv5ca/yxLzDMxWb2n0vS+lyMY5ArXMGgZGq9kbw
-etJ3SUR4mZIsZdebW2dR1kydTpd/1y8XWYtlSuHx0X3mp3w86D/slCjCk1+jCMfL
-WMpYtxbgXytUJRNuRqNkdZBTu8BzhXTfU+gnkwi1tDI4uXDfKKXNdnzleCDZ8HKy
-iYRjT27SaIME2Bz2b6vUhf+NXQIQtQP4BKo6uZqcSlkr+X9y+RrcuOn2mX+Z8bmq
-T2bUmJV2KRWlKxMC+dh4I6TusOU/3VVIwzEWBzx4IC3Nm21Yq0q/QBGJfNZpJgo=
-=cC2N
+iQEcBAABAgAGBQJe1SUwAAoJEPOHY87f0iVZm80H/1iNl10uata2lI6joYqOJcYq
+jAhTrsTJkdT6lqaABEH5VmmeZmcVNOikcCGzktqfdInycyH6lYm8PDygyY7V0Hsw
+ileGPI0mZ38fWFUo9UwMqeqpmopIlgC9iU3Gw0ZbakJnwHD8wLKjdy3Zd9pX+vCO
+n1++9OyAolAtZ7kInZTRnj1eYN8xcZvkuSURZFBFPHIfTfoCl5QucBePlHY8Fu5d
+lIUBgeXYN4rj3lhH3MvUBJcZf0FejtNO6RyYG/R+09Srox3wZRjcYHyJ84dzCNlD
+9wHpk6JOY8VeH1b/n+9bp4tDcWxv19ahmjKbczWlwDmXV4G1a5fd1lR2szOyQQQ=
+=6bR2
-----END PGP SIGNATURE-----