Merge r5130 r5132 r5133 r5134 r5135 r5136 into 5.41-7.0 drivedb.h branches.

git-svn-id: https://svn.code.sf.net/p/smartmontools/code/branches/RELEASE_5_41_DRIVEDB@5137 4ea69e1a-61f1-4043-bf83-b5c94c648137

smartmontools/drivedb.h

@@ -477,8 +477,7 @@ const drive_settings builtin_knowndrives[] = {
   },
   // Reference: https://www.micron.com/resource-details/feec878a-265e-49a7-8086-15137c5f9011
   // TN-FD-34: 5100 SSD SMART Implementation
-  {
-    "Micron 5100 Pro / 52x0 / 5300 SSDs",
+  { "Micron 5100 Pro / 52x0 / 5300 SSDs",
     "(Micron_5100_)?(EE|MT)FDDA[KV](240|480|960|1T9|3T8|7T6)T(BY|CB|CC)|" // Matches both stock and Dell OEM
       // tested with Micron_5100_MTFDDAK3T8TCB/D0MU410, MTFDDAK3T8TCB/D0MU410
     "(Micron_5200_)?MTFDDAK(480|960|1T9|3T8|7T6)TD(C|D|N)|" // tested with Micron_5200_MTFDDAK3T8TDD/D1MU505
@@ -691,8 +690,7 @@ const drive_settings builtin_knowndrives[] = {
     "-v 241,raw48,Lifetime_Writes_GiB "
     "-v 242,raw48,Lifetime_Reads_GiB"
   },
-  {
-    "StorFly CFast SATA 6Gbps SSDs",
+  { "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-...",
@@ -953,8 +951,7 @@ const drive_settings builtin_knowndrives[] = {
     "-v 249,raw48,Total_NAND_Prog_Ct_GiB "
     "-v 251,raw48,Total_NAND_Read_Ct_GiB"
   },
-  {
-    "OCZ/Toshiba Trion SSDs",
+  { "OCZ/Toshiba Trion SSDs",
     "OCZ-TRION1[05]0|" // tested with OCZ-TRION100/SAFM11.2A, TRION150/SAFZ72.2
     "TOSHIBA-TR150|" // tested with TOSHIBA-TR150/SAFZ12.3
     "TOSHIBA Q300( Pro\\.)?", // tested with TOSHIBA Q300 Pro./JYRA0101
@@ -1139,8 +1136,9 @@ const drive_settings builtin_knowndrives[] = {
     "-v 241,raw48,Host_Writes_32MiB "
     "-v 242,raw48,Host_Reads_32MiB"
   },
-  { "Intel X25-E SSDs",
-    "SSDSA2SH(032|064)G1.* INTEL",  // G1 = first generation
+  { "Intel X25-E SSDs", // tested with
+      // INTELSSDSA2SH064G1IB 43W7659 44E9163IBM/447C8860
+    "(INTEL)?SSDSA2SH(032|064)G1.* (.*IBM|INTEL)", // G1 = first generation
     "", "",
   //"-v 3,raw16(avg16),Spin_Up_Time "
   //"-v 4,raw48,Start_Stop_Count "
@@ -2742,7 +2740,6 @@ const drive_settings builtin_knowndrives[] = {
     "ST(500|1000|2000)LX0(01|15|25)-.*",
     "", "", "-v 240,msec24hour32 "
   },
-  // ST1000DX002/CC41
   { "Seagate FireCuda 3.5", // ST2000DX002-2DV164/CC41
     "ST[12]000DX002-.*",
     "", "", "-v 240,msec24hour32 "
@@ -4044,9 +4041,12 @@ const drive_settings builtin_knowndrives[] = {
   },
   { "Seagate BarraCuda 3.5", // tested with ST1000DM010-2EP102/Z9ACZM97,
       // ST2000DM008-2FR102/0001, ST3000DM008-2DM166/CC26, ST4000DM005-2DP166/0001,
-      // ST4000DM006-2G5107/DN02, ST8000DM004-2CX188/0001, ST10000DM0004-1ZC101/DN01
-    "ST(500DM009|1000DM010|2000DM00[5-9]|3000DM00[789]|4000DM00[456]|6000DM00[34]|8000DM00[45]|10000DM0004)-.*",
+      // ST4000DM006-2G5107/DN02, ST8000DM004-2CX188/0001, ST10000DM0004-1ZC101/DN01,
+      // ST12000DM0007-2GR116/DN01
+    "ST(500DM009|1000DM010|2000DM00[5-9]|3000DM00[789]|4000DM00[456]|6000DM00[34]|"
+       "8000DM00[45]|10000DM0004|12000DM0007)-.*",
     "", "",
+    "-v 200,raw48,Pressure_Limit "
     "-v 188,raw16 -v 240,msec24hour32"
   },
   { "Seagate Desktop HDD.15", // tested with ST4000DM000-1CD168/CC43, ST5000DM000-1FK178/CC44,
@@ -4174,6 +4174,7 @@ const drive_settings builtin_knowndrives[] = {
       // ST10000NM0156-2AA111/SS05
     "ST([1234568]|10)000NM0[01][0-68][456]-.*", // *[069]4 = 4Kn
     "", "", 
+    "-v 200,raw48,Pressure_Limit "
     "-v 188,raw16 -v 240,msec24hour32"
   },
   { "Seagate Enterprise Capacity 3.5 HDD", // V5.1, ms in attribute 9
@@ -4189,20 +4190,23 @@ const drive_settings builtin_knowndrives[] = {
   { "Seagate Exos X12", // tested with ST12000NM0007-2A1101/SN02
     "ST12000NM00[01]7-.*", // *17 = SED
     "", "",
+    "-v 200,raw48,Pressure_Limit "
     "-v 240,msec24hour32"
   },
   { "Seagate Exos X14", // tested with ST12000NM0008-2H3101/SN02,
       // ST12000NM0538-2K2101/CMA2 (OEM?)
     "ST(14000NM04[24]8|14000NM0(01|25)8|12000NM0(00|24|53)8|10000NM0(47|56)8)-.*",
     "", "",
-    "-v 18,raw48,Unknown_Seagate_Attrib "
+    "-v 18,raw48,Head_Health "
+    "-v 200,raw48,Pressure_Limit "
     "-v 240,msec24hour32"
   },
-  { "Seagate Exos X16", // tested with X16 ST14000NM001G-2KJ103/SN02,
-      // ST16000NM001G-2KK103/SN02
-    "ST1[46]000NM00[13]G-.*",
+  { "Seagate Exos X16", // tested with ST10000NM001G-2MW103/SN02
+      // ST14000NM001G-2KJ103/SN02, ST16000NM001G-2KK103/SN02, ST16000NM001G-2KK103/SN03
+    "ST1[0246]000NM00[13]G-.*",
     "", "",
-    "-v 18,raw48,Unknown_Seagate_Attrib "
+    "-v 18,raw48,Head_Health "
+    "-v 200,raw48,Pressure_Limit "
     "-v 240,msec24hour32"
   },
   // new models: ST8000VN0002, ST6000VN0021, ST4000VN000
@@ -4224,16 +4228,19 @@ const drive_settings builtin_knowndrives[] = {
       // ST6000VN0033-2EE110/SC60, ST6000VN0041-2EL11C/SC61, ST8000VN0022-2EL112/SC61,
       // ST10000VN0004-1ZD101/SC60, ST12000VN0007-2GS116/SC60, ST12000VN0008-2JH101/SC60
     "ST(1|2|3|4|6|8|10|12)000VN00(0?[2478]|1|22|33|41)-.*",
-    "", "", ""
+    "", "",
+    "-v 18,raw48,Head_Health "
+    "-v 200,raw48,Pressure_Limit"
   },
   { "Seagate IronWolf Pro", // tested with ST4000NE0025-2EW107/EN02,
       // ST8000NE0004-1ZF11G/EN01, ST8000NE0021-2EN112/EN02, ST16000NE000-2RW103/EN02
     "ST([24]000NE0025|4000NE001|6000NE0023|8000NE00(04|08|21)|(10|12|14)000NE000[478]|16000NE000)-.*",
     "", "",
-    "-v 18,raw48,Unknown_Seagate_Attrib " // ST16000NE000
+    "-v 18,raw48,Head_Health " // ST16000NE000
+    "-v 200,raw48,Pressure_Limit "
     "-v 240,msec24hour32"
   },
-  { "Seagate Archive HDD", // tested with ST8000AS0002-1NA17Z/AR13
+  { "Seagate Archive HDD (SMR)", // tested with ST8000AS0002-1NA17Z/AR13
     "ST[568]000AS00[01][12]-.*",
     "", "", ""
   },
@@ -4352,6 +4359,33 @@ const drive_settings builtin_knowndrives[] = {
     "-v 242,raw48,Lifetime_Rds_Frm_Hst_GB "
     "-v 243,hex48,Free_Space "
   },
+  { "Seagate IronWolf Pro 125 SSDs", // IronWolf_Pro_125_SSD_Product_Manual_100866982_A.pdf
+    "Seagate IronWolfPro ZA(240|480|960|1920|3840)NX10001-.*", // tested with
+      // Seagate IronWolfPro ZA3840NX10001-2ZH104/SU4SC01B
+    "", "",
+  //"-v 1,raw48,Raw_Read_Error_Rate "
+  //"-v 9,raw24(raw8),Power_On_Hours "
+  //"-v 12,raw48,Power_Cycle_Count "
+    "-v 16,raw48,Spare_Blocks_Available "
+    "-v 17,raw48,Spare_Blocks_Remaining "
+    "-v 168,raw48,SATA_PHY_Error_Count "
+    "-v 170,raw16,Early/Later_Bad_Blck_Ct "
+    "-v 173,raw16,Max/Avg/Min_Erase_Ct "
+    "-v 174,raw48,Unexpect_Power_Loss_Ct "
+    "-v 177,raw16,Wear_Range_Delta "
+  //"-v 192,Power-Off_Retract_Count "
+  //"-v 194,tempminmax,Temperature_Celsius "
+    "-v 218,raw48,SATA_CRC_Error_Count "
+    "-v 231,raw48,SSD_Life_Left "
+    "-v 232,hex48,Read_Failure_Blk_Ct "
+    "-v 233,raw48,Flash_Writes_GiB "
+    "-v 234,raw48,NAND_Reads_Sectors "
+    "-v 235,raw48,Flash_Writes_Sectors "
+    "-v 241,raw48,Host_Writes_GiB "
+    "-v 242,raw48,Host_Reads_GiB "
+    "-v 246,hex64,Write_Protect_Detail " // prevents interpretation of bogus threshold 255 (ticket #1396)
+    "-v 247,raw48,Health_Check_Timer "
+  },
   { "Seagate Nytro SATA SSD", //Written to Seagate documentation
     // tested with XA960LE10063, XA960LE10063
     "XA(240|480|960|1920|3840)[LM]E10(00|02|04|06|08|10)3",
@@ -5027,6 +5061,12 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  { "USB: Sony HD-E1; ",
+    "0x054c:0x05bf", //  Sony HD-E1B - 1TB USB3.0
+    "", // 0x6610
+    "",
+    "-d sat"
+  },
   // Sunplus
   { "USB: ; SunPlus",
     "0x04fc:0x0c05",

smartmontools/drivedb.h.raw.asc

 -----BEGIN PGP SIGNATURE-----
 
-iQEcBAABAgAGBQJfnty6AAoJEPOHY87f0iVZvRkIAJUQ3rP2DinVLGz8Qh4VPFRW
-qAdbAl+pv04nYcVm98qCHVksFFNsAgkWaqGpO3Lkc+F5GhMGBq5klI/H08Eqg9XG
-FuHNZJhHa6lxIafZOAK2/DFvBNwxCkZRrzrfvSA1nsXruLIdcjLFasi0SDp/tfcj
-4kbK5YEuEnpobEvniYHDbgfkOgYJCS4PIqhB+OId1bm6JBpr4i4vcATqQwAWnuwV
-klq1MMcH/ttSWpUlsuX/r0eKKn2W+eHLjtsXMQsKnctBojVduarc3HpV/T94BVt/
-ChZFhHrmI7zvsa7hXmKSF6TxiktxNYcyrpAmIL8MfryEkiknL/Q8jsFkLeg4byI=
-=hPO6
+iQEcBAABAgAGBQJf33MvAAoJEPOHY87f0iVZMAcH/A9740CWmzbfrlGDDhdtXRyb
+qMTGPvA9wlx8erjJaMNY0QUnQGClSXncYTup5M6rBu9kk7o6I5epO7eq7keD375V
+abd8fSusd7YwyfoWDuOJEDbtx4R9jTdr5S81ncUwI9QxYBHBA5OzFvCK6zb8BmTx
+MZ0skX6RDOR77XCuD6hsECtwstreNr3tcCwkrxtlnvHpY6kcUA/vyCjJAcAn6Jpm
+1tgO/b8RDOxM8jDepfQendocltNtt50f0J4nyGZTdei1zo5RqWiZwAJT3ZfKBe6W
+gYfQnKn2QHFhWTjMt154nKCYaJglv21flKRLGyTnAmbrxCcFaeKdDyQBf7FYhhk=
+=m4Kt
 -----END PGP SIGNATURE-----