diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index 5e333f9e818208515b90e9eca05a7ced6d5bd1bc..9f6faaa81bd4191584cf4dd86a3e07738c12bf35 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -298,8 +298,8 @@ const drive_settings builtin_knowndrives[] = {
"CT(120|240|480)BX300SSD1|" // Silicon Motion SM2258, same attributes as Marvell-based Crucial SSDs,
// tested with CT240BX300SSD1/M2CR010
"CT(120|240|480|960)BX500SSD1|" // Silicon Motion SM2258XT, tested with CT120BX500SSD1/M6CR013
- "CT(250|500|1000|2000)MX500SSD1|" // Silicon Motion SM2258, tested with CT250MX500SSD1/M3CR010
- // CT500MX500SSD1/M3CR010, CT1000MX500SSD1/M3CR010, CT2000MX500SSD1/M3CR010
+ "CT(250|500|1000|2000)MX500SSD[14]|" // Silicon Motion SM2258, tested with CT250MX500SSD1/M3CR010
+ // CT500MX500SSD1/M3CR010, CT1000MX500SSD1/M3CR010, CT2000MX500SSD1/M3CR010, CT250MX500SSD4/M3CR022
"Micron_M500_MTFDDA[KTV](120|240|480|960)MAV|"// tested with Micron_M500_MTFDDAK960MAV/MU05
"Micron_M500DC_(EE|MT)FDDA[AK](120|240|480|800)MBB|" // tested with Micron_M500DC_EEFDDAA120MBB/129,
// Micron_M500DC_MTFDDAK800MBB/0129
@@ -1478,10 +1478,13 @@ const drive_settings builtin_knowndrives[] = {
},
{ "Samsung based SSDs",
"SAMSUNG SSD PM800 .*GB|" // SAMSUNG PM800 SSDs, tested with SAMSUNG SSD PM800 TH 64GB/VBM25D1Q
- "SAMSUNG SSD PM810 .*GB|" // SAMSUNG PM810 (470 series) SSDs, tested with SAMSUNG SSD PM810 2.5" 128GB/AXM06D1Q
+ "SAMSUNG SSD PM810 .*GB|" // SAMSUNG PM810 (470 series) SSDs, tested with
+ // SAMSUNG SSD PM810 2.5" 128GB/AXM06D1Q
+ "SAMSUNG SSD SM841N? (2\\.5\"? 7mm |mSATA )?(128|256|512)GB( SED)?|" // tested with
+ // SAMSUNG SSD SM841 2.5" 7mm 256GB/DXM02D0Q, SAMSUNG SSD SM841 mSATA 512GB/DXM44D0Q,
+ // SAMSUNG SSD SM841N 2.5 7mm 128GB/DXM03D0Q, SAMSUNG SSD SM841N mSATA 256GB SED/DXM45D6Q
"SAMSUNG SSD PM851 (mSATA |M\\.2 )?(2280 )?(128|256|512)GB|" // tested with SAMSUNG SSD PM851 mSATA 128GB,
// SAMSUNG SSD PM851 M.2 2280 256GB/EXT25D0Q
- "SAMSUNG SSD SM841N (mSATA )?(128|256|512)GB|" // tested with SAMSUNG SSD SM841N mSATA 256GB
"SAMSUNG 470 Series SSD|" // tested with SAMSUNG 470 Series SSD 64GB/AXM09B1Q
"Samsung SSD 750 EVO (120|250|500)GB|" // tested with Samsung SSD 750 EVO 250GB/MAT01B6Q
"SAMSUNG SSD 830 Series|" // tested with SAMSUNG SSD 830 Series 64GB/CXM03B1Q
@@ -1489,19 +1492,22 @@ const drive_settings builtin_knowndrives[] = {
"MZ7PC(512|256|128|064)HA(GH|FU|DR)-000.*|" // probably PM830, tested with SAMSUNG MZ7PC128HAFU-000L1/CXM04L1Q
"Samsung SSD 840 (PRO )?Series|" // tested with Samsung SSD 840 PRO Series 128GB/DXM04B0Q,
// Samsung SSD 840 Series/DXT06B0Q
- "Samsung SSD 8[45]0 EVO .*|" // tested with
+ "Samsung SSD 8[456]0 EVO (mSATA |M\\.2 )?((120|250|500|750)G|[12]T)B|" // tested with
// Samsung SSD 840 EVO (120|250|500|750)GB/EXT0AB0Q,
// Samsung SSD 840 EVO (120|250)GB/EXT0BB6Q, 1TB/EXT0BB0Q, 120GB mSATA/EXT41B6Q,
- // Samsung SSD 850 EVO 250GB/EMT01B6Q
- // Samsung SSD 850 EVO M.2 250GB/EMT21B6Q
- // Samsung SSD 850 EVO mSATA 120GB/EMT41B6Q
- // Samsung SSD 850 EVO 2TB/EMT02B6Q
- "Samsung SSD 850 PRO ((128|256|512)G|1T)B|" // tested with Samsung SSD 850 PRO 128GB/EXM01B6Q,
- // Samsung SSD 850 PRO 1TB/EXM01B6Q
+ // Samsung SSD 850 EVO 250GB/EMT01B6Q, Samsung SSD 850 EVO M.2 250GB/EMT21B6Q,
+ // Samsung SSD 850 EVO mSATA 120GB/EMT41B6Q, Samsung SSD 850 EVO 2TB/EMT02B6Q,
+ // Samsung SSD 860 EVO 250GB/RVT01B6Q, Samsung SSD 860 EVO mSATA 250GB/RVT41B6Q,
+ // Samsung SSD 860 EVO 500GB/RVT01B6Q, Samsung SSD 860 EVO mSATA 500GB/RVT41B6Q,
+ // Samsung SSD 860 EVO mSATA 1TB/RVT41B6Q, Samsung SSD 860 EVO 2TB/RVT01B6Q
+ "Samsung SSD 8[56]0 PRO ((128|256|512)G|1T)B|" // tested with Samsung SSD 850 PRO 128GB/EXM01B6Q,
+ // Samsung SSD 850 PRO 1TB/EXM01B6Q, Samsung SSD 860 PRO 256GB/RVM01B6Q,
+ // Samsung SSD 860 PRO 512GB/RVM01B6Q, Samsung SSD 860 PRO 1TB/RVM01B6Q
"SAMSUNG MZ7PA256HMDR-.*|" // PM810 (470 Series), tested with SAMSUNG MZ7PA256HMDR-010H1/AXM07H1Q
"Samsung SSD 845DC EVO .*|" // Samsung SSD 845DC EVO 960GB/EXT03X3Q
"SAMSUNG MZ[7M]PC(032|064|128|256|512)HBCD-.*|" // PM830, tested with SAMSUNG MZMPC032HBCD-000L1/CXM12L1Q
"SAMSUNG MZ7TD(128|256)HAFV-.*|" // 840 Series, tested with SAMSUNG MZ7TD256HAFV-000L7/DXT06L6Q
+ "SAMSUNG MZMTD(128|256|512)HAGL-.*|" // PM841, tested with SAMSUNG MZMTD512HAGL-00000/DXT4200Q
"SAMSUNG MZ7WD((120|240)H[AC]FV|480HAGM|960HAGP)-00003|" // SM843T Series, tested with
// SAMSUNG MZ7WD120HAFV-00003/DXM85W3Q, SAMSUNG MZ7WD120HCFV-00003/DXM9203Q
"SAMSUNG MZ[7N]TE(128|256|512)HMHP-.*|" // PM851, tested with SAMSUNG MZ7TE256HMHP-000L7/EXT09L6Q,
@@ -1522,7 +1528,8 @@ const drive_settings builtin_knowndrives[] = {
// SAMSUNG MZNLN256HMHQ-000H1/MAV21H3Q
"SAMSUNG SSD PM871 .*|" // SAMSUNG SSD PM871 2.5 7mm 256GB/EMT02D0Q
// SAMSUNG MZ7LN256HMJP-00000/MAV0100Q, SAMSUNG MZ7LN512HMJP-00000/MAV0100Q
- "SAMSUNG MZHPV(128|256|512)HDGL-.*", // SM951, tested with SAMSUNG MZHPV512HDGL-00000/BXW2500Q
+ "SAMSUNG MZHPV(128|256|512)HDGL-.*|" // SM951, tested with SAMSUNG MZHPV512HDGL-00000/BXW2500Q
+ "Samsung Portable SSD T5", // tested with Samsung Portable SSD T5 (0x04e8:0x61f5)
"", "",
//"-v 5,raw16(raw16),Reallocated_Sector_Ct "
//"-v 9,raw24(raw8),Power_On_Hours "
@@ -4306,6 +4313,12 @@ const drive_settings builtin_knowndrives[] = {
"",
"-d sat"
},
+ { "USB: Samsung Portable SSD T5; ",
+ "0x04e8:0x61f5",
+ "", // 0x0100
+ "",
+ "-d sat"
+ },
// Sunplus
{ "USB: ; SunPlus",
"0x04fc:0x0c05",
diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc
index 3a7797d685bb4aa147c2628195ba773169a8efe0..8c04c584c207aa10500109cd4bb5853aa7b8cf12 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,10 +1,10 @@
-----BEGIN PGP SIGNATURE-----
-iQEcBAABAgAGBQJbvPKjAAoJEPOHY87f0iVZkLQIAKwUWSsGDAZAW6eKpoCEkpiJ
-X1cung4cCJrqcFbCcnhzPtHUnssscpBq7SSCH5rSFESObSCD65Swuu1beRcWmTTY
-xAhAfTO27L1nUUQkUUzqYJRj+WBsvPl16mShqVY4Ijz6gu1Hjekn7+xHQfbCde5Q
-dJIEx7fqXc1+hH0DDDpgMCSllJvblySH4t0xjhI0DjuQdzFWlzVue+OKxCTLj3oX
-qSsN5tL+EdJ5RCV6na5VNGSWwyd7L9802lAFza3Mf/gD8C4cLS7lenDJboaHSIc5
-YjIMIWGm51/bt/ZICAjs8oWHCTOGuK6jZN+TnJvEeCNQJr8PBOE0wpn/VsfTA9Q=
-=CWlA
+iQEcBAABAgAGBQJbw37qAAoJEPOHY87f0iVZgEYH/R56g0NHcHoakW58ySkxlFpw
+3lwvXrdOdJnLeoPnm5pTUszLWJPT8n+b+xr5dEMzcPZZYy2SOJ9nxkGL2R/eyedm
+uju8CVPxlluvaTTBijjCBpgJRU/bRelnDp+xX/0q/mpS8oqrqToiGg67CrccYGg8
+zVMyAyuUvx9dqFnkjQ8tlK5ZxtrRHOyETTo9QZXB5KHmeiQTCnEOCo4S3Z1QRAuO
+Mc4dgqtkjSEa5wvwl+8IV6s8bYeVANfv5XswEt8aYYS8wtDoi6uGWgIdvRLllggu
+VMLtrmsGmsz3YuoqbyjwnO/VeqIVae9SuFG4+9T5CjCMubXpHUlpb6lI5HT6wJE=
+=y2id
-----END PGP SIGNATURE-----