From 41a8c16bcc9dd49066827ed4f534378754da3c68 Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Sat, 28 Sep 2019 17:48:37 +0000
Subject: [PATCH] Merge r4954 r4955 into 5.41-7.0 drivedb.h branches.
git-svn-id: https://svn.code.sf.net/p/smartmontools/code/branches/RELEASE_6_0_DRIVEDB@4956 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
smartmontools/drivedb.h | 83 +++++++++++++++++++++++++++------
smartmontools/drivedb.h.raw.asc | 26 +++++------
2 files changed, 83 insertions(+), 26 deletions(-)
diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index a91ef9209..bceb15915 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -634,6 +634,10 @@ const drive_settings builtin_knowndrives[] = {
"-v 249,raw48,Spares_Remaining_Perc " // later then 0409 FW.
},
{ "Phison Driven SSDs", // see MKP_521_Phison_SMART_attribute.pdf
+ "BP4 mSATA SSD|" // MyDigital BP4, tested with BP4 mSATA SSD/S8FM06.9
+ "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,
+ // IR-SSDPR-S25A-240/SBFM91.2
"KINGSTON SEDC400S37(400|480|800|960|1600|1800)G|" // DC400, tested with
// KINGSTON SEDC400S37480G/SAFM02.[GH], KINGSTON SEDC400S37960G/SAFM32.I
"KINGSTON SEDC500[MR](480|960|1920|3840)G|" // DC500M/R, tested with
@@ -642,14 +646,17 @@ const drive_settings builtin_knowndrives[] = {
"KINGSTON SKC310S3B?7A960G|" // SSDNow KC310, KINGSTON SKC310S37A960G/SAFM00.r
"KINGSTON SKC400S37(128G|256G|512G|1T)|" // SSDNow KC400, KINGSTON SKC400S37128G
"KINGSTON SV310S3(7A|D7|N7A|B7A)960G|" // SSDNow V310
- "PNY CS(13|22)11 (120|240|480|960)GB SSD|" // tested with PNY CS1311 120GB SSD/CS131122,
- // PNY CS2211 240GB SSD/CS221016
- "SSD Smartbuy (60|120|240)GB|" // SSD Smartbuy 240GB/SBFM91.1
"KINGSTON SHSS3B?7A(120|240|480|960)G|" // HyperX Savage
- "KINGSTON ?SA400S37(120|240|480|960)G", // Kingston A400 SSD, Phison S11 or
+ "KINGSTON ?SA400S37(120|240|480|960)G|" // Kingston A400 SSD, Phison S11 or
// Silicon Motion controller (see ticket #801), tested with
// KINGSTON SA400S37240G/SBFK10D7, KINGSTON SA400S37120G/SBFK71E0, */SBFKB1D1
// KINGSTON SA400S37480G/SBFK10D7 (two spaces)
+ "PNY CS(13|22)11 (120|240|480|960)GB SSD|" // tested with PNY CS1311 120GB SSD/CS131122,
+ // PNY CS2211 240GB SSD/CS221016
+ "SSD Smartbuy (60|120|240)GB|" // SSD Smartbuy 240GB/SBFM91.1
+ "SSD PHISON 256GB PS3110-S10C|" // tested with SSD PHISON 256GB PS3110-S10C/SAFM12.2
+ "SSDPR-CX400-(128|256|512|1024)|" // Goodram CX400, tested with SSDPR-CX400-512/SBFM61.3
+ "SSM28(128|256|512)GPTCB3B-S11[24]61[123]", // tested with SSM28256GPTCB3B-S112612/SBFM61.2
"", "",
//"-v 1,raw48,Raw_Read_Error_Rate "
"-v 2,raw48,Not_In_Use "
@@ -698,9 +705,11 @@ const drive_settings builtin_knowndrives[] = {
"GOODRAM|" // tested with GOODRAM CX200 (GOODRAM/SAFM12.2)
"Hoodisk SSD|" // tested with Hoodisk SSD/SBFM01.3
"INTENSO|" // tested with Intenso SSD SATA III Top (INTENSO/S9FM02.6, .../SAFM01.6)
- "SATA SSD", // tested with Supermicro SSD-DM032-PHI (SATA SSD/S9FM02.1),
+ "INTENSO SATA III SSD|" // tested with INTENSO SATA III SSD/SBFM11.2, .../SBFM81.3
+ "SATA SSD|" // tested with Supermicro SSD-DM032-PHI (SATA SSD/S9FM02.1),
// PC Engines msata16d (SATA SSD/S9FM02.3), FoxLine flssd240x4s(SATA SSD/SBFM10.5)
- "S9FM02\\.[136]|SAFM01\\.6|SAFM12\\.2|SBFM01\\.3|SBFM10\\.5|SBFM91\\.2",
+ "SPCC Solid State Disk", // Silicon Power A55, tested with SPCC Solid State Disk/SBFM61.2
+ "S[89AB]FM[0-9][0-9]\\.[0-9]",
"",
//"-v 1,raw48,Raw_Read_Error_Rate "
"-v 2,raw48,Not_In_Use "
@@ -1904,16 +1913,28 @@ const drive_settings builtin_knowndrives[] = {
"-v 233,raw48,Number_Of_Write_Ct "
"-v 245,raw48,DriveLife_Used% "
},
- { "SiliconMotion based SSDs", // SM2246EN (Transcend TS6500)
+ { "Silicon Motion based SSDs",
"ADATA (SP550|SU[89]00)|" // tested with ADATA SP550/O0803B5a, ADATA SU800/Q0913A, ADATA SU800/R0427A,
// ADATA SU800/R0918B, ADATA SU900/Q0125A, ADATA SU900/Q0710B
- "R3SL(120|240|480|960)G|" // AMD Radeon Solid State Drives,
+ "CHN mSATAM3 (128|256|512)|" // Zheino M3, tested with CHN mSATAM3 128/Q1124A0
+ "CIS 2S M305 (16|32|64|128|256)GB|" // Ceroz M305, tested with CIS 2S M305 64GB/P0316B
"CT(120|250|500|1000)BX100SSD1|" // Crucial BX100, tested with CT250BX100SSD1/MU02,
// CT500BX100SSD1/MU02, CT1000BX100SSD1/MU02
"CT(240|480|960)BX200SSD1|" // Crucial BX200 Solid State Drive, tested with CT480BX200SSD1/MU02.6
- "KingDian S400 (120|240|480)GB|" // SM2256EN, tested with KingDian S400 120GB/Q0607A
+ "DREVO X1 SSD|" // tested with DREVO X1 SSD/Q0111A
+ "Drevo X1 pro (64|128|256)G|" // tested with Drevo X1 pro 64G/Q0303B
+ "JAJS500M(120|240|480|960)C-1|" // J&A LEVEN JS500, tested with JAJS500M120C-1/P0614D
+ "KingDian S(280|400) (120|240|480)GB|" // SM2256EN, tested with KingDian S280 120GB/Q0526A,
+ // KingDian S400 120GB/Q0607A
"KingSpec KSD-[PS]A25\\.[1-9]-(016|032|064|128)(MS|SJ)|" // tested with KingSpec KSD-PA25.6-064MS/20140803
+ "LITEON LMH-(128|256|512)V2M-.*|" // tested with LITEON LMH-256V2M-11 MSATA 256GB/FM8110C
+ "MKNSSDRE(1TB|2TB|512GB|500GB|256GB|250GB)|" // tested with MKNSSDRE256GB/N1007C
+ "MKNSSDTR(240|500|250|120|480|240)GB(-LT)?|" // tested with MKNSSDTR500GB/O1126A
+ "OWC Envoy Pro|" // tested with OWC Envoy Pro/R0522A0 (0x1e91:0xa2a5)
+ "R3SL(120|240|480|960)G|" // AMD Radeon SSDs, tested with R3SL240G/P0422C
+ "Ramsta SSD S800 (120|240|480)GB|" // SM2258G, tested with Ramsta SSD S800 480GB/RS81V0
"T60|" // KingSpec T60, tested with T60/20151120
+ "TCSUNBOW M3 (60|240)GB|" // TC-Sunbow M3, tested with TCSUNBOW M3 240GB/R0327B0
"TEAML5Lite3D(120G|240G|480G|1T)|" // Team Group L5Lite 3D, tested with TEAML5Lite3D240G/R0302A0
"TS((16|32|64|128|256|512)G|1T)(SSD|MSA)(370S?|420[IK]?)|" // Transcend SSD370/420 SATA/mSATA, TS6500,
// tested with TS32GMSA370/20140402, TS16GMSA370/20140516, TS64GSSD370/20140516,
@@ -1927,11 +1948,8 @@ const drive_settings builtin_knowndrives[] = {
"TS(16|32|64)GMSA630|" // MSA630 mSATA SSD, tested with TS32GMSA630/N0113E1
"TS(32|64|128)GPSD330|" // Transcend PSD SSD, tested with TS64GPSD330/20140121
"TS(16|32|64|96|128|256)GSSD630|" // Transcend 630, tested with TS16GSSD630/N0113E1
- "TS(128G|256G|512G|1T)ESD400K|" // Transcend ESD400 Portable, tested with
+ "TS(128G|256G|512G|1T)ESD400K", // Transcend ESD400 Portable, tested with
// TS256GESD400K/R0605AS (0x2174:0x2000)
- "MKNSSDRE(1TB|2TB|512GB|500GB|256GB|250GB)|" // MKNSSDRE256GB/N1007C
- "MKNSSDTR(240|500|250|120|480|240)GB(-LT)?|" // MKNSSDTR500GB/O1126A
- "LITEON LMH-(128|256|512)V2M-.*", // LITEON LMH-256V2M-11 MSATA 256GB/FM8110C
"", "",
//"-v 1,raw48,Raw_Read_Error_Rate "
//"-v 2,raw48,Throughput_Performance "
@@ -1976,6 +1994,38 @@ const drive_settings builtin_knowndrives[] = {
//"-v 250,raw48,Read_Error_Retry_Rate " // ADATA SU800/Q0913A
"-v 251,raw48,Unkn_SiliconMotion_Attr" // ADATA SU800/Q0913A
},
+ { "Silicon Motion based OEM SSDs", // Like 'Silicon Motion based SSDs' but with FW detection
+ "Intenso SSD|" // tested with Intenso SSD/Q1107A0
+ "Intenso SSD Sata III|" // Sata III High, tested with Intenso SSD Sata III/P0510E
+ "KingFast|" // KingFast F6M, tested with KingFast/P0725A
+ "SPCC M\\.2 SSD|" // Silicon Power 2280 M55, tested with SPCC M.2 SSD/Q0627A0
+ "SuperMicro SSD", // Supermicro SSD-DM032-SMCMVN1, tested with SuperMicro SSD/SOB20R
+ "P0510E|P0725A|Q0627A0|Q1107A0|SOB20R",
+ "",
+ "-v 148,raw48,Total_SLC_Erase_Ct "
+ "-v 149,raw48,Max_SLC_Erase_Ct "
+ "-v 150,raw48,Min_SLC_Erase_Ct "
+ "-v 151,raw48,Average_SLC_Erase_Ct "
+ "-v 159,raw48,Unkn_SiliconMotion_Attr "
+ "-v 160,raw48,Uncorrectable_Error_Cnt "
+ "-v 161,raw48,Valid_Spare_Block_Cnt "
+ "-v 163,raw48,Initial_Bad_Block_Count "
+ "-v 164,raw48,Total_Erase_Count "
+ "-v 165,raw48,Max_Erase_Count "
+ "-v 166,raw48,Min_Erase_Count "
+ "-v 167,raw48,Average_Erase_Count "
+ "-v 168,raw48,Max_Erase_Count_of_Spec "
+ "-v 169,raw48,Remaining_Lifetime_Perc "
+ "-v 178,raw48,Runtime_Invalid_Blk_Cnt "
+ "-v 225,raw48,Host_Writes_32MiB "
+ "-v 241,raw48,Host_Writes_32MiB "
+ "-v 242,raw48,Host_Reads_32MiB "
+ "-v 245,raw48,TLC_Writes_32MiB "
+ "-v 246,raw48,SLC_Writes_32MiB "
+ "-v 247,raw48,Raid_Recoverty_Ct "
+ "-v 248,raw48,Unkn_SiliconMotion_Attr "
+ "-v 251,raw48,Unkn_SiliconMotion_Attr"
+ },
{ "SMART Modular Technologies mSATA XL+ SLC SSDs", // tested with SH9MST6D16GJSI01
"SH9MST6D[0-9]*GJSI?[0-9]*", // based on http://www.smartm.com/salesLiterature/embedded/mSATA_overview.pdf
"", "", // attributes info from http://www.mouser.com/ds/2/723/smartmodular_09302015_SH9MST6DxxxGJSxxx_rA[1]-770719.pdf
@@ -5541,6 +5591,13 @@ const drive_settings builtin_knowndrives[] = {
"",
"-d sat"
},
+ // 0x1e91 (?)
+ { "USB: OWC Envoy Pro; ",
+ "0x1e91:0xa2a5",
+ "", // 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 621575f84..c418bd169 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNATURE-----
-iQIcBAABAgAGBQJdjiAfAAoJEOp0qyVyEELF494P/joNRH+bQ28jNyn6PRWWOJPs
-A5hFhVeh0Cz0zuwyCUVB3zDvtyyyWVoA8yXokC56J3kfvALj8jswyDtP+IjUVk2r
-2asy5g1Kj37ZbT1n8PsBVREd6Mui1Sj3G3vm4RMlB4UYHLUDLaA9hruVjDD7Tzue
-78Ej6XbnRCYF66OtK8XMSFpOK5se0jSX4DFAuwljyw34loKRqzxZaOVYN0oAnWJb
-qLnWyyXPm3r5VHR0Gfp+aXrEMBjs9EildEt3o2SoEaR84qqEEEaFqFfMGECUrFBv
-UdpGXAXxKTUqYR48nQrrVWQ+Z2Cm0jsxxDx3ezNs8x18kOjD46mL0PfLJvUnSgkP
-Xbn6R+8nY6JfL43RrIQGieYuvYbWwO7/T3zISHU3DH4qKjspx1wKGmrEKVFW/0+d
-UJRD4V6DfZuBj/V3ARqy8fo/zN4dWnvAhMOKQ9S0wxdYIiAiotZbKawmt+ZspgML
-CeYVzNTeRn9mVIP6oNpBVo0HtbNkxwjiiyddPoR9Fh+CmGmV3uFftblx0LzSKuuW
-Kv8RY7OW7HBu0yodBFRvw0r7/USmg8Pg4l2/6Xdb2kxEROeItglHj6toVcvzgN1I
-9+DtPqRqslDPs0FE16FMVmur8jg89MaQcITRKYEJoRSDH8ULRBoUBrBy5RTzsM4o
-t0Vs9Qt2D7Miqkjj7BHf
-=JJlb
+iQIcBAABAgAGBQJdj5yOAAoJEOp0qyVyEELFkB0QALDlFPJipW00D42exF+kg1AT
+MFlI8O9+c+aMAa+Y0rYmUf8Upnj3yF/qG8AGiUmWCiiJo0DOsUrkpCfzUIlq0r0q
+ijp79/KpsZauFQtejcArGE6n9xzLNQKSOvjyoM6u+5optMVxVBjlLkoOdvBuAhGj
+uZsFqFgBCJ+bZx6cNia8viWVC7rSUmf5TYm6COLBEklncG1E7ZGq0lLVISDw6Vvg
+oDkZ7/ZYrqnz0VLqDcpLSxbk/zxFLaR01eJhgS7mLoACCkjw3m4z3nzFzMJR4tuz
+8W9kTagLY/eBcQBVIU5qUoPhAoMjMD/Cj3rGGl0ALYz5BrvrzC0mhiEmZBLFbA10
+XRuIqpGw+YjDiOh/IznhicSEKGmpXldFCKRSRMqEu8yqjglZrs2L7QH98D5jlvKN
+Ju55F962o1a7Th5jZRM+eimD6eBUhorMh/7sM3NKHvgoDh87J9env1Fn7+Mc5JAS
+L0NbA7RsPdnECdvYUYKmlfkd5Y1xxq8Ggl6Ik1bI8EU2VXQw2h2yx+k4BZxkiqKl
+T2nFyW69Jqqvn+3sCJasvsCJWavwvpcgDucKn7gd555IYJsIGdZzCq5ofMlj9s9o
+AP3hUZH/wPskDqAMuhScDjHlTeoTS340UaTXHcj5vZjqJQEMvGlR0bSkJ8PfBsZI
+Qn6YUZMjOONskpmbQEZj
+=YqD/
-----END PGP SIGNATURE-----
--
GitLab