From 3f8cfeafc6a558d14ef33bc40787b0db15402ea3 Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Tue, 20 Aug 2019 20:05:58 +0000
Subject: [PATCH] Merge r4949 into 5.41-7.0 drivedb.h branches.

git-svn-id: https://svn.code.sf.net/p/smartmontools/code/branches/RELEASE_6_0_DRIVEDB@4950 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
 smartmontools/drivedb.h         | 26 ++++++++++++++++++++++----
 smartmontools/drivedb.h.raw.asc | 26 +++++++++++++-------------
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index a8c2acc64..245defd05 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -1898,6 +1898,8 @@ const drive_settings builtin_knowndrives[] = {
    "-v 245,raw48,DriveLife_Used% "
  },
   { "SiliconMotion based SSDs", // SM2246EN (Transcend TS6500)
+    "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,
     "CT(120|250|500|1000)BX100SSD1|" // Crucial BX100, tested with CT250BX100SSD1/MU02,
       // CT500BX100SSD1/MU02, CT1000BX100SSD1/MU02
@@ -1910,7 +1912,7 @@ const drive_settings builtin_knowndrives[] = {
       // tested with TS32GMSA370/20140402, TS16GMSA370/20140516, TS64GSSD370/20140516,
       // TS256GSSD370/N0815B, TS256GSSD370S/N1114H, TS512GSSD370S/N1114H, TS32GSSD420I/N1114H,
       // TS32GSSD420K/P1225CE
-    "TS(16|32|64|128|512|256)GMTS400S?|" // TS256GMTS400
+    "TS(16|32|64|128|512|256)GMTS4[03]0S?|" // TS256GMTS400, TS256GMTS430S/S0423A
     "TS(120|240)GMTS420|" // Transcend MTS420
     "TS(128G|256G|512G|1T)SSD230S|" // TS128GSSD230S/P1025F8
     "TS(120|240|480|960)GSSD220S|" // TS480GSSD220S/P0520AA
@@ -1922,8 +1924,7 @@ const drive_settings builtin_knowndrives[] = {
       // 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
-    "ADATA SP550", // ADATA SP550/O0803B5a
+    "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 "
@@ -1933,6 +1934,7 @@ const drive_settings builtin_knowndrives[] = {
     "-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 " // SU800/R0427A, SU900/Q0710B, TS256GMTS430S/S0423A
     "-v 160,raw48,Uncorrectable_Error_Cnt "
     "-v 161,raw48,Valid_Spare_Block_Cnt "
     "-v 163,raw48,Initial_Bad_Block_Count "
@@ -1962,7 +1964,10 @@ const drive_settings builtin_knowndrives[] = {
     "-v 242,raw48,Host_Reads_32MiB "
     "-v 245,raw48,TLC_Writes_32MiB " // FW N0815B, N1114H
     "-v 246,raw48,SLC_Writes_32MiB "
-    "-v 247,raw48,Raid_Recoverty_Ct"
+    "-v 247,raw48,Raid_Recoverty_Ct "
+    "-v 248,raw48,Unkn_SiliconMotion_Attr " // ADATA SU900/Q0125A
+  //"-v 250,raw48,Read_Error_Retry_Rate " // ADATA SU800/Q0913A
+    "-v 251,raw48,Unkn_SiliconMotion_Attr" // ADATA SU800/Q0913A
   },
   { "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
@@ -5310,6 +5315,12 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  { "USB: ; JMicron JMS576", // USB3.1->SATA
+    "0x152d:0x1576",
+    "", // 0x0204, ICY BOX IB-223U3a-B
+    "",
+    "-d sat"
+  },
   { "USB: ; JMicron JM20329", // USB->SATA
     "0x152d:0x2329",
     "", // 0x0100
@@ -5400,6 +5411,13 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  // PNY
+  { "USB: ; PNY",
+    "0x154b:0x5678",
+    "", // 0x5408
+    "",
+    "-d sat"
+  },
   // ASMedia
   { "USB: ; ASMedia",
     "0x174c:0x....",
diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc
index bbf4c1c0a..132c2e41d 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAABAgAGBQJdUyBPAAoJEOp0qyVyEELFCukQAJiuQy8ZYULY6gczV2AmUafE
-h2H2cWb0sTHQzFALFnByu44XuxAvESSsALmASSQQRouOQalmpUGIBWTXzjbC8pL/
-MwDKbskldpSun+va57XRh9Siw9gTVwXJel7vNxa2iqrDJmTGIzW3iUGg5JC5n/p2
-SckKS5bWuV5EbrfJWUiiL3QaCba6hon7PHWjLeQQo7Xp/t1z1mP58Z6IlgHxb5iu
-awHXxvNc4x02FnPwpi8psg49smS4De1Bxxx1xmOdbUnTXG0tOgE/LsinE8PZYYDP
-G++h8VUjoJIUWgm0KVrqqqN4wsuBBtpFFXBk/Pe5j59A7Ks9GoX0faT+hTTrDlyA
-rAnE1BRorwEwKcuOoz1Ex6f8EfxZJGiCT8pTIx3ffRftth+GlxnXs/xilibqwfmK
-P5DyOrRnheWYJC/nGHUbbUAQYYydwCzUQLGo0IzKXI9/YvM7cf3M7XTPs0DGHFVd
-Iug/j1edBizkjjb4fPBN7YKGqvPd3E1Fbo373w2BCbz3XzwRyXbBcBPKEJqKpnNV
-/6mI1pP9+lLpDoFlr+iMaG6qrHy1GvK3AifY8qd4J1kiOCvS+ADC3FeGU5RB8zxn
-FHapka77HRRj/CJ13P5w8nNF9XFhrh5lxmN1eFCa1UHMwlkKz1ZEaNQwiS5eRywt
-Bd35PyM87v4eY5W34lHD
-=Kakg
+iQIcBAABAgAGBQJdXFF3AAoJEOp0qyVyEELF3O4P/2Rd9qOHbJ6j9+UVNSGZ+oEz
+7Eydy1OAU9kBCiw6qy6PTiKXsI0RkBQYniF1diHXQCsURAZVjZPfZM8jG3xZt5eM
+63p/CQYEBHmI77/jJe143Di2owEqxCTTQhu1I2dESEM3WTMUjHLlN8JWao7dTnS8
+D0i1OtSSb/mmwuPC1tXLMxubFGraLVbW2VMilnK0PPnc9GOQtTl9stFU676i/8XK
+EeuGE1aDsjU1L+K7oTzytq9o9xh3FkhsiPWQOnq2C+ENB/FzSi6bSVFGYh538tWw
+QH9eyfn29oHmJuqGlzDMuiCs6fwL4uJu/OON2CJVgESf3JByAogqAX8B5v453HCY
+EcGR5nN+NHCd+2ElgMYSjkJQgrgcpdTSncmAQm5I+eUFOZej+SS71ffJtDJbVQWE
+O0xJJsPOIOqgHuONOQfysNBsWUyAe8IlVlcqi+WrUrEVC7LlV/Ws0fGCrnCAE8ci
+kirqNSmWWlWYwVcHQhV2YgK1ivjegd08ERe2fpXJCGgnu+Pm1096NtgSA2JLmqRq
+T0zcNBSFg/N8D/AZUrVWZd0ChnwYf/gIxdlZ0ogpMZwDQ2DVyMvEk0ExI3UunP71
+itzsAodmKtVvm/oiFgjDkw+uwnWDv21ACE1gqPg4gb0nLzIZ3WBBpszqipt3p1Pe
+6T9NKCZHzJFSdJpnBVbS
+=TKNJ
 -----END PGP SIGNATURE-----
-- 
GitLab