From 112351c3c4e1d98044186ff746cf36a238c467c8 Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Fri, 6 Oct 2017 19:33:11 +0000
Subject: [PATCH] Merge r4512 r4514 r4515 r4516 into 5.40-6.6 drivedb.h
 branches.

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

diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index 254e907b3..c7dc3b5cb 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -494,6 +494,23 @@ const drive_settings builtin_knowndrives[] = {
     "-v 241,raw48,Lifetime_Writes_GiB "
     "-v 242,raw48,Lifetime_Reads_GiB"
   },
+  {
+    "StorFly CFast SATA 6Gbps SSDs",
+    // http://datasheet.octopart.com/VSFCS2CC060G-100-Virtium-datasheet-82287733.pdf
+    // tested with StorFly VSFCS2CC060G-100/0409-000
+    "StorFly VSFCS2C[CI](016|030|060|120|240)G-...",
+    // C - commercial, I industrial
+    "", "",
+    "-v 192,raw48,Unsafe_Shutdown_Count "
+    "-v 160,raw48,Uncorrectable_Error_Cnt "
+    // 0729 - remaining in block life. In 0828  remaining is normalized to 100% then decreases
+    "-v 161,raw48,Spares_Remaining " 
+    "-v 241,raw48,Host_Writes_32MiB "
+    "-v 242,raw48,Host_Reads_32MiB "
+    "-v 169,raw48,Lifetime_Remaining% "
+    "-v 248,raw48,Lifetime_Remaining% " //  later then 0409 FW.
+    "-v 249,raw48,Spares_Remaining_Perc " //  later then 0409 FW.
+  },
   { "Phison Driven SSDs", // see MKP_521_Phison_SMART_attribute.pdf
     "KINGSTON SUV300S37A(120|240|480)G|" // UV300 SSD, tested with KINGSTON SUV300S37A120G/SAFM11.K
     "KINGSTON SKC310S3B?7A960G|" // SSDNow KC310, KINGSTON SKC310S37A960G/SAFM00.r
@@ -1545,6 +1562,39 @@ const drive_settings builtin_knowndrives[] = {
     "-v 246,raw48,SLC_Writes_32MiB "
     "-v 247,raw48,Raid_Recoverty_Ct"
   },
+  { "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
+    "-v 1,raw48,Uncorrectable_ECC_Cnt "
+  //"-v 5,raw16(raw16),Reallocated_Sector_Ct "
+    "-v 9,raw48,Power_On_Hours " // override default raw24(raw8) format
+  //"-v 12,raw48,Power_Cycle_Count "
+    "-v 14,raw48,Device_Capacity_LBAs "
+    "-v 15,raw48,User_Capacity_LBAs " // spec DecID is wrong, HexID is right
+    "-v 16,raw48,Init_Spare_Blocks_Avail " // spec DecID is wrong, HexID is right
+    "-v 17,raw48,Spare_Blocks_Remaining " // spec DecID is wrong, HexID is right
+    "-v 100,raw48,Total_Erase_Count "
+    "-v 168,raw48,SATA_PHY_Err_Ct "
+    "-v 170,raw48,Initial_Bad_Block_Count "
+    "-v 172,raw48,Erase_Fail_Count "
+    "-v 173,raw48,Max_Erase_Count "
+    "-v 174,raw48,Unexpect_Power_Loss_Ct "
+    "-v 175,raw48,Average_Erase_Count "
+  //"-v 181,raw48,Program_Fail_Cnt_Total "
+  //"-v 187,raw48,Reported_Uncorrect "
+  //"-v 194,tempminmax,Temperature_Celsius "
+    "-v 197,raw48,Not_In_Use "
+    "-v 198,raw48,Not_In_Use "
+    "-v 199,raw48,SATA_CRC_Error_Count "
+    "-v 202,raw48,Perc_Rated_Life_Used "
+    "-v 231,raw48,Perc_Rated_Life_Remain "
+    "-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"
+    //  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
     "SMART A25FD-(32|64|128)GI32N", // tested with SMART A25FD-128GI32N/B9F23D4K
     "",
@@ -2656,13 +2706,14 @@ const drive_settings builtin_knowndrives[] = {
     "Hitachi HDS722020ALA330",
     "", "", ""
   },
-  // Hitachi HDS723030BLE640
-  { "Hitachi Deskstar 7K3000", // tested with HDS723030ALA640/MKAOA3B0
+  { "Hitachi Deskstar 7K3000", // tested with Hitachi HDS723030ALA640/MKAOA3B0,
+      // Hitachi HDS723030BLE640/MX6OAAB0
     "Hitachi HDS7230((15|20)BLA642|30ALA640|30BLE640)",
     "", "", ""
   },
-  { "Hitachi/HGST Deskstar 7K4000", // tested with Hitachi HDS724040ALE640/MJAOA250
-    "(Hitachi )?HDS724040ALE640",
+  { "Hitachi/HGST Deskstar 7K4000", // tested with Hitachi HDS724040ALE640/MJAOA250,
+      // HGST HDS724040ALE640/MJAOA580
+    "(Hitachi|HGST) HDS724040ALE640",
     "", "", ""
   },
   { "HGST Deskstar NAS", // tested with HGST HDN724040ALE640/MJAOA5E0,
@@ -3241,7 +3292,7 @@ const drive_settings builtin_knowndrives[] = {
     "", "", ""
   },
   { "Seagate Barracuda 2.5 5400", // ST2000LM015-2E8174/SDM1
-    "ST(100|500|2000)LM0(15|48|30)",
+    "ST(100|500|2000)LM0(15|48|30)-.*",
     "", "", ""
   },
   { "Seagate Barracuda ES.2", // fixed firmware
diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc
index a2f6b5da2..ed54307d6 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQEcBAABAgAGBQJZ1pWNAAoJEPOHY87f0iVZrYwIAK0FRULeUgcyD32Ak+iHz74X
-2f9gDOnhANo+Focc5bagmH6fBlK08yeGiXrw4bCT/vYpgUBauWPdYeSH0DazGQlY
-kkrV+VX/lzw7Sndu9/Q6v1x9DsGfGRMo3aCBjb6/JGicYEr78JvSfAYTDnzPjrcR
-d0otWjNTB4+HHfqUJZV5/RXdfrI1tDOyQC1uAVTJ+TJ99BIWVdAUEoRueANf94oy
-ug80pvS/74hUSb6nHRD6aj2bF0FYFT7EDAB44hPqgEHwK1z80dgQr6mWHulIftoQ
-Au77NVbTyGd5++4glo+mmvZXb4FSKiXHKxlwH9/Lt6QNoAQYiLzmcx7dO0P/jeE=
-=jui9
+iQEcBAABAgAGBQJZ19oKAAoJEPOHY87f0iVZzRcH/R9xfuuUPXfWE5VPZnxNKPsj
+5VOy8T3a8W3DPLvRbkUywwtKHPLc4EX5ODMGqNUSnahD7FDr2kofSb71mFjHL8Gx
+AntTjkwiOWoFKxC1gUgvxZN/UyZ58fpHvwGZrVFyNPwrAI18KQ1/i38Db3L7c3Q8
+HF02Bkv3BfCj4OdNXJRU2hgWt3uFmfiWve5INw6SM5vbiNcifW4wLJAXu7yUQYuK
+UUGTexG7Mjcx79I5sMrkQsH+gO7RZMRipvh71l2TlwIGn6WhSEDbGvlaF+I5vT2G
+hqwB5q8aF2d3fAhaOEQ0JUKXy9/XEeCUcyENhQe/o1hoqgUKb5xA1kv1g8h8GlY=
+=wDx7
 -----END PGP SIGNATURE-----
-- 
GitLab