From 34fc4e33ce9ecb75e07c2c3cf960e3584851e9a8 Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Wed, 19 Jun 2019 19:39:36 +0000
Subject: [PATCH] Merge r4921 r4922 r4923 into 5.41-7.0 drivedb.h branches.

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

diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index d908b8b5d..5918d0ab6 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -384,7 +384,7 @@ const drive_settings builtin_knowndrives[] = {
     "-v 202,raw48,Percent_Lifetime_Remain "
     "-v 206,raw48,Write_Error_Rate "
     "-v 210,raw48,Success_RAIN_Recov_Cnt "
-    "-v 246,raw48,Total_Host_Sector_Write "
+    "-v 246,raw48,Total_LBAs_Written "
     "-v 247,raw48,Host_Program_Page_Count "
     "-v 248,raw48,FTL_Program_Page_Count"
   },
@@ -1568,8 +1568,9 @@ const drive_settings builtin_knowndrives[] = {
     "TOSHIBA THNSNC128GMLJ|" // tested with THNSNC128GMLJ/CJTA0202 (built in Toshiba Protege/Dynabook)
     "TS(8|16|32|64|128|192|256|512)GSSD25S?-(MD?|S)|" // Transcend IDE and SATA, JMF612, tested with
       // TS256GSSD25S-M/101028, TS32GSSD25-M/20101227
-    "TS(32|64|128|256)G(SSD|MSA)340", // Transcend SSD340 SATA/mSATA, JMF667/670, tested with
-      // TS256GSSD340/SVN263, TS256GSSD340/SVN423b, TS256GMSA340/SVN263
+    "TS(32|64|128|256)G(SSD|MSA)[37]40K?", // Transcend SSD340/340K/740 SATA/mSATA, JMF667/670, tested with
+      // TS256GSSD340/SVN263, TS256GSSD340/SVN423b, TS256GMSA340/SVN263,
+      // TS128GSSD340K/SVN216,TS64GSSD740/SVN167d
     "", "",
   //"-v 1,raw48,Raw_Read_Error_Rate "
   //"-v 2,raw48,Throughput_Performance "
@@ -1586,9 +1587,12 @@ const drive_settings builtin_knowndrives[] = {
     "-v 170,raw16,Bad_Block_Count "
     "-v 173,raw16,Erase_Count " // JMF661: different?
     "-v 175,raw48,Bad_Cluster_Table_Count "
+    "-v 180,raw48,Unknown_JMF_Attribute "
+    "-v 187,raw48,Unknown_JMF_Attribute "
     "-v 192,raw48,Unexpect_Power_Loss_Ct "
   //"-v 194,tempminmax,Temperature_Celsius "
   //"-v 197,raw48,Current_Pending_Sector "
+    "-v 231,raw48,Unknown_JMF_Attribute "
     "-v 233,raw48,Unknown_JMF_Attribute " // FW SVN423b
     "-v 234,raw48,Unknown_JMF_Attribute " // FW SVN423b
     "-v 240,raw48,Unknown_JMF_Attribute "
@@ -1674,8 +1678,8 @@ const drive_settings builtin_knowndrives[] = {
       // SAMSUNG MZ7GE240HMGR-00003/EXT0303Q
     "SAMSUNG MZ7LM(120|240|480|960|1T9|3T8)HC(JM|HP|GR|FD)-.*|" // PM863 Series, tested with
       // SAMSUNG MZ7LM960HCHP-0E003/GXT3003Q
-    "SAMSUNG MZ7LM(240|480|960|1T9|3T8)HM(JP|HQ|LP)-.*|" // PM863a Series, tested with
-      // SAMSUNG MZ7LM3T8HMLP-00005/GXT5104Q
+    "(SAMSUNG )?MZ7LM(240|480|960|1T9|3T8)HM(JP|HQ|LP)(-.*|0D3)|" // PM863a Series, tested with
+      // SAMSUNG MZ7LM3T8HMLP-00005/GXT5104Q, MZ7LM240HMHQ0D3/GC5B (Dell)
     "(SAMSUNG )?MZ7KM(120|240|480|960|1T9)H[AM](FD|GR|H[PQ]|J[MP])(-.*|0D3)|" // SM863(a), tested with
       // SAMSUNG MZ7KM480HAHP-0E005/GXM1003Q, SAMSUNG MZ7KM480HMHQ-00005/GXM5104Q,
       // SAMSUNG MZ7KM960HMJP-00005/GXM5304Q, MZ7KM960HMJP0D3/GD53 (Dell)
@@ -1960,8 +1964,8 @@ const drive_settings builtin_knowndrives[] = {
     "-v 232,raw48,Read_Fail_Count "
     "-v 234,raw48,Flash_Reads_LBAs "
     "-v 235,raw48,Flash_Writes_LBAs "
-    "-v 241,raw48,Host_Writes_LBAs "
-    "-v 242,raw48,Host_Reads_LBAs"
+  //"-v 241,raw48,Total_LBAs_Written "
+  //"-v 242,raw48,Total_LBAs_Read "
     //  247-248 Missing in specification from April 2015
   },
   { "Smart Storage Systems Xcel-10 SSDs",  // based on http://www.smartm.com/files/salesLiterature/storage/xcel10.pdf
@@ -3351,6 +3355,17 @@ const drive_settings builtin_knowndrives[] = {
     "TOSHIBA MG04ACA[23456]00[AE].?",
     "", "", ""
   },
+  { "Toshiba MG06ACA... Enterprise Capacity HDD", // tested with TOSHIBA MG06ACA800E/4303,
+      // TOSHIBA MG06ACA10TE/0103
+    "TOSHIBA MG06ACA([68]00|10T)[AE]Y?",
+    "", "", ""
+  },
+  { "Toshiba MG07ACA... Enterprise Capacity HDD", // tested with TOSHIBA MG07ACA14TE/0101
+    "TOSHIBA MG07ACA1[24]T[AE]Y?",
+    "", "",
+    "-v 23,raw48,Helium_Condition_Lower "
+    "-v 24,raw48,Helium_Condition_Upper"
+  },
   { "Toshiba 3.5\" DT01ABA... Desktop HDD", // tested with TOSHIBA DT01ABA300/MZ6OABB0
     "TOSHIBA DT01ABA(100|150|200|300)",
     "", "", ""
@@ -4041,8 +4056,9 @@ const drive_settings builtin_knowndrives[] = {
   { "WD Blue and 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 WDS((120|240|250|480|500)G|[12]00T)(1B|2B|2G)0[AB]-.*", // *1B* = Blue, *2G* = Green, *2B* = Blue 3D NAND
+      // WDC WDS500G2B0A-00SM50/X61130WD, WDC WDS200T2B0A-00SM50/X61130WD,
+      // WDC WDS200T2B0A/X61190WD
+    "WDC WDS((120|240|250|480|500)G|[12]00T)(1B|2B|2G)0[AB](-.*)?", // *1B* = Blue, *2G* = Green, *2B* = Blue 3D NAND
     "", "",
   //"-v 5,raw48,Reallocated_Sector_Ct " // Reassigned Block Count
   //"-v 9,raw48,Power_On_Hours "
@@ -4066,8 +4082,8 @@ const drive_settings builtin_knowndrives[] = {
   //"-v 232,raw48,Available_Reserve_Space"
     "-v 233,raw48,NAND_GB_Written_TLC "
     "-v 234,raw48,NAND_GB_Written_SLC "
-    "-v 241,raw48,Total_Host_GB_Written "
-    "-v 242,raw48,Total_Host_GB_Read "
+    "-v 241,raw48,Host_Writes_GiB "
+    "-v 242,raw48,Host_Reads_GiB "
     "-v 244,raw48,Temp_Throttle_Status "
   },
   { "Western Digital Protege",
@@ -5244,7 +5260,7 @@ const drive_settings builtin_knowndrives[] = {
     "0x152d:0x0583",
     "",
     "",
-    "" // smartmontools >= r4850: -d sntjmicron#please_try
+    "" // smartmontools >= r4850: -d sntjmicron[#please_try]
   },
   { "USB: OCZ THROTTLE OCZESATATHR8G; JMicron JMF601",
     "0x152d:0x0602",
@@ -5563,6 +5579,13 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  // Transcend
+  { "USB: ; ",
+    "0x8564:0x7000",
+    "", // 0x8000
+    "",
+    "-d sat"
+  },
   // JMicron II
   { "USB: ; JMicron JMS566",
     "0xa152:0xb566",
diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc
index a1621d8cb..88b91a879 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAABAgAGBQJc5Fu8AAoJEOp0qyVyEELFktYP/A6vZx7RFZ7wubThSpoqwS+w
-Iywt3ZfB0rHAeAYkEbQUI9Cy6SO3rzEnhamMwNwFplNiJ2bEpzFOApCaJNSxe59U
-rbZfcL1/UAootNFIXw3V31F019YNCOWJrkIGt55ILUbc+YfleIC5rNHH0IIlPDK5
-Ck6DE6gZInQ+tAK8pmOzQEhtoY1hb6rPkVl/zASbYCr7CQL5mTcRMdOSa4BnJMIa
-awNVRx1czu2awLooby5r+TsBJkPEV5SNcDjj2yVWqxO7MvNatLGS3ELNU8W0nV8P
-dBSbVdM6W5FHsF/x9gIP26rXlUCstBvMmLB2v2Wno9XKP2D7pvGNBR9Asj1YGPzT
-YZrFnEdp6QYUMTOJ6YlDWjgzcCJ32hqkx3vgYEZmnBF6fkg4NbiROz6xi08bTYsA
-xYXP3X03a968i4csSzj9yZe3KOQ55IQO4lnXVs1V399khPFUZtMjlNCJmn/5MpIP
-/ZiLkFsBzyjxqw2QpG0DXaggwY73IS+P8Mjea/Ry7JisIaXD/WWLXF/PqQ6OonOo
-iQyG+IC8iSEPlswyp6TXMEgtANWJhZLgWrx/viMlQ78OZdbdYNi7o7y7PZTZ5eYE
-+H3qgvu5kgGuarDS6d4I1h/5WDf4LSQa5S56BiNLQlV7YUx+Ld7jwyASQWsiZuHG
-c/OZlJgjZVIXKw3yRoNh
-=+V6v
+iQIcBAABAgAGBQJdCo8WAAoJEOp0qyVyEELFhHcP/j8LyqkM8ef9ynqjVhKXooIM
+GM/4/fHpK4eHEjtg0oaFLOM3EmlEgZUulxHJLXqo+6f1jTHSuu6dCYNX+tSaja1m
+nqYOm4y/E/9CuzG7tQAghjNPJdsSgTU5Or+EfGE8mWAjvORPJBGERhcG+DAGOgqB
+ptTyml0Rj2+KCsUfFC9h9Uv4lpDASspVVetcCMM0s/UvFgyGcQ/8KCkgZZJOtW0N
+R0AIILrnCDpzta6EFWpx5KjObOibtGi9EZi/9db0rNFDY+8Yn0av9ljhionGGBZW
+4nLKm7h9q81snK16PEvk/00Jh/M3ioUnbNaE+Nhly/VyMA05dYkUQxc8FEyeMXKe
+qkMeA61KqLOfuwbUHAYuOgp5A+AxBCltT/RK1fa+mfup72/thMi/786Uy0JR+I32
+HjEJY7xKmIAD0U14VohGeyZT6dun4gA4R+cXZY7aEPA0p29TdZbU3xgN3gzdFB6X
+6pBl+9NvQUN2uTOOTX17sgReA9xLwI1+ZTaF/thi+6TEkGuEHYPwr+HEC2Q05zal
+FI9pNOBvJMQoavaOv06/iDf3g7qd/hLhs9VumpCcaHOEDOHkcHAlDrCgqIBJSKvt
+iRKl8hI6rUpgn1YK9iyTrFBWGchYV20f2OHLb6HohncA4rdBhKduuRYINsjpvb//
+504iTQzR2GeduLuXEv4l
+=JAdc
 -----END PGP SIGNATURE-----
-- 
GitLab