From bb1329f4249de580e0205b3554d297bf16e9fe02 Mon Sep 17 00:00:00 2001 From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137> Date: Sat, 4 Nov 2017 22:49:56 +0000 Subject: [PATCH] Merge r4590 r4591 into 5.40-6.6 drivedb.h branches. git-svn-id: https://svn.code.sf.net/p/smartmontools/code/branches/RELEASE_6_0_DRIVEDB@4592 4ea69e1a-61f1-4043-bf83-b5c94c648137 --- smartmontools/drivedb.h | 54 ++++++++++++++++++++++----------- smartmontools/drivedb.h.raw.asc | 14 ++++----- 2 files changed, 44 insertions(+), 24 deletions(-) diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h index 4618c18d8..f17de238a 100644 --- a/smartmontools/drivedb.h +++ b/smartmontools/drivedb.h @@ -173,15 +173,15 @@ const drive_settings builtin_knowndrives[] = { "-v 241,raw48,Host_Writes_GiB " // ] guessed (ticket #655) "-v 242,raw48,Host_Reades_GiB " // ] }, - { "Apple SD/SM/TS...E/F SSDs", // SanDisk/Samsung/Toshiba? - "APPLE SSD (S[DM]|TS)0?(128|256|512|768)[EFG]", // tested with APPLE SSD SD256E/1021AP, SD0128F/A223321 - // APPLE SSD SM768E/CXM90A1Q, SM0512F/UXM2JA1Q, TS0256F/109L0704, SM0512G/BXW1SA0Q + { "Apple SD/SM/TS...E/F/G SSDs", // SanDisk/Samsung/Toshiba? + "APPLE SSD (S[DM]|TS)0?(128|256|512|768|1024)[EFG]", // tested with APPLE SSD SD256E/1021AP, SD0128F/A223321 + // APPLE SSD SM768E/CXM90A1Q, SM0512F/UXM2JA1Q, TS0256F/109L0704, SM0512G/BXW1SA0Q, SM1024G/BXW1SA0Q "", "", //"-v 1,raw48,Raw_Read_Error_Rate " //"-v 5,raw16(raw16),Reallocated_Sector_Ct " //"-v 9,raw24(raw8),Power_On_Hours " //"-v 12,raw48,Power_Cycle_Count " - //"-v 169,raw48,Unknown_Attribute " + "-v 169,raw48,Unknown_Apple_Attrib " "-v 173,raw48,Wear_Leveling_Count " // ] "-v 174,raw48,Host_Reads_MiB " // ] guessed (ticket #342), S[DM]*F only "-v 175,raw48,Host_Writes_MiB " // ] @@ -826,7 +826,7 @@ const drive_settings builtin_knowndrives[] = { "-v 242,raw48,Host_Reads_32MiB " "-v 245,raw48,Flash_Writes_32MiB" }, - { "Innodisk 3IE3/3ME3 SSDs", // tested with 2.5" SATA SSD 3ME3/S15A19, CFast 3ME3/S15A19 + { "Innodisk 3IE3/3ME3/3ME4 SSDs", // tested with 2.5" SATA SSD 3ME3/S15A19, CFast 3ME3/S15A19 // InnoDisk Corp. - mSATA 3ME3/S15A19, mSATA mini 3ME3/S15A19, M.2 (S42) 3ME3, // SATA Slim 3ME3/S15A19, SATADOM-MH 3ME3/S15A19, SATADOM-ML 3ME3/S15A19, // SATADOM-MV 3ME3/S15A19, SATADOM-SL 3ME3/S15A19, SATADOM-SV 3ME3/S15A19, @@ -834,8 +834,10 @@ const drive_settings builtin_knowndrives[] = { // InnoDisk Corp. - mSATA 3IE3/S15C14i, Mini PCIeDOM 1IE3/S15C14i, // mSATA mini 3IE3/S15C14i, M.2 (S42) 3IE3/S15C14i, SATA Slim 3IE3/S15C14i, // SATADOM-SH 3IE3 V2/S15C14i, SATADOM-SL 3IE3 V2/S15A19i, SATADOM-SV 3IE3 V2/S15C14i - "(2.5\" SATA SSD|CFast|InnoDisk Corp\\. - mSATA|Mini PCIeDOM|mSATA mini|" - "M\\.2 \\(S42\\)|SATA Slim|SATADOM-[MS][HLV]) 3[IM]E3( V2)?", + // mSATA 3ME4/L16711, M.2 (S42) 3ME4/L16711, SATADOM-MH 3ME4/L16B01, + // SATADOM-SH 3ME4/L16B01, SATADOM-SH Type C 3ME4/L16B01, SATADOM-SH Type D 3ME4/L16B01 + "(2.5\" SATA SSD|CFast|InnoDisk Corp\\. - mSATA|Mini PCIeDOM|mSATA( mini)?|" + "M\\.2 \\(S42\\)|SATA Slim|SATADOM-[MS][HLV]( Type [CD])?) 3([IM]E3|ME4)( V2)?", "", "", //"-v 1,raw48,Raw_Read_Error_Rate " //"-v 2,raw48,Throughput_Performance " @@ -1168,8 +1170,8 @@ const drive_settings builtin_knowndrives[] = { }, { "Intel 730 and DC S35x0/3610/3700 Series SSDs", // tested with INTEL SSDSC2BP480G4, SSDSC2BB120G4/D2010355, // INTEL SSDSC2BB800G4T, SSDSC2BA200G3/5DV10250, SSDSC2BB080G6/G2010130, SSDSC2BX200G4/G2010110, - // INTEL SSDSC2BB016T6/G2010140, SSDSC2BX016T4/G2010140 - "INTEL SSDSC(1N|2B)[ABPX]((080|100|120|160|200|240|300|400|480|600|800)G[346]T?|(012|016)T[46])", + // INTEL SSDSC2BB016T6/G2010140, SSDSC2BX016T4/G2010140, SSDSC2BB150G7/N2010101 + "INTEL SSDSC(1N|2B)[ABPX]((080|100|120|150|160|200|240|300|400|480|600|800)G[3467]T?|(012|016)T[46])", // A = S3700, B*4 = S3500, B*6 = S3510, P = 730, X = S3610 "", "", //"-v 3,raw16(avg16),Spin_Up_Time " @@ -2925,7 +2927,8 @@ const drive_settings builtin_knowndrives[] = { "", "", "" }, { "Toshiba 2.5\" HDD MQ01UBD... (USB 3.0)", // tested with TOSHIBA MQ01UBD050/AX001U (0x0480:0xa007), - // TOSHIBA MQ01UBD100/AX001U (0x0480:0x0201, 0x0480:0xa200) + // TOSHIBA MQ01UBD100/AX001U (0x0480:0x0201, 0x0480:0xa200), + // TOSHIBA MQ01UBD050/AX101U (0x0480:0xa202) "TOSHIBA MQ01UBD(050|075|100)", "", "", "" }, @@ -4009,8 +4012,9 @@ const drive_settings builtin_knowndrives[] = { "-d sat" }, { "USB: Toshiba Canvio; ", - "0x0480:0x(a(007|100|20[0c])|" // 0xa007 TOSHIBA MQ01UBD050, + "0x0480:0x(a(007|100|20[027c])|" // 0xa007 TOSHIBA MQ01UBD050, "b207)", // 0xa100: TOSHIBA MQ01UBB200, 0xa200: TOSHIBA MQ01UBD100, + // 0xa202: TOSHIBA MQ01UBD050, 0xa207: TOSHIBA MQ01ABD100, // 0xa20c: TOSHIBA MQ01ABB200, 0xb207: TOSHIBA MQ03UBB200 "", // 0x0001 (0xa007) "", @@ -4519,7 +4523,7 @@ const drive_settings builtin_knowndrives[] = { "-d sat" }, { "USB: Seagate Expansion Desktop; ", - "0x0bc2:0x33(00|1[2a]|2[012]|32)", // 1a=5TB, 21=4TB + "0x0bc2:0x33(00|1[2a]|2[012]|3[02])", // 1a=5TB, 21=4TB "", // 1a=0x0909 "", "-d sat" @@ -4566,10 +4570,11 @@ const drive_settings builtin_knowndrives[] = { "", "-d sat" }, - { "USB: Seagate FreeAgent GoFlex; ", + { "USB: Seagate FreeAgent / Maxtor D3; ", // 0x6121: Seagate FreeAgent GoFlex Pro for Mac (0x0148) + // 0x6123: Maxtor D3 Station 3TB (0x0209) // 0x6126: Maxtor D3 Station 5TB (0x0209) - "0x0bc2:0x612[16]", + "0x0bc2:0x612[136]", "", "", "-d sat" @@ -4599,10 +4604,11 @@ const drive_settings builtin_knowndrives[] = { "-d sat" }, { "USB: Seagate Backup Plus USB 3.0; ", + // 0xab1e: Seagate Backup Plus 4TB // 0xab24: Seagate Backup Plus Slim (0x0100) (ticket #443) // 0xab25: Seagate Backup Plus for Mac (0x0100) // 0xab38: Seagate Backup Plus 8TB (0x0100) (ticket #786) - "0x0bc2:0xab(2[01458]|38)", + "0x0bc2:0xab(1e|2[01458]|38)", "", "", "-d sat" @@ -4862,6 +4868,12 @@ const drive_settings builtin_knowndrives[] = { "", "-d sat" }, + { "USB: ; JMicron", + "0x152d:0x0579", // Intenso External + "", // 0x0100 + "", + "-d sat" + }, { "USB: OCZ THROTTLE OCZESATATHR8G; JMicron JMF601", "0x152d:0x0602", "", @@ -5149,7 +5161,7 @@ const drive_settings builtin_knowndrives[] = { "-d sat" // ATA output registers missing }, { "USB: Hitachi Touro Mobile; ", // 1TB - "0x4971:0x102[04]", + "0x4971:0x102[034]", "", // 0x0100 "", "-d sat" @@ -5180,9 +5192,17 @@ const drive_settings builtin_knowndrives[] = { "", "-d sat" }, + // JMicron II + { "USB: ; JMicron JMS566", + "0xa152:0xb566", + "", // 0x0223 + "", + "-d sat" + }, // 0xabcd (?) { "USB: ; ", - "0xabcd:0x6103", // LogiLink AU0028A V1.0 USB 3.0 to IDE & SATA Adapter + "0xabcd:0x610[34]", // 0x6103: LogiLink AU0028A V1.0 USB 3.0 to IDE & SATA Adapter + // 0x6104: LogiLink PCCloneEX Lite "", "", "-d sat" diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc index b28e75808..0323b66a9 100644 --- a/smartmontools/drivedb.h.raw.asc +++ b/smartmontools/drivedb.h.raw.asc @@ -1,10 +1,10 @@ -----BEGIN PGP SIGNATURE----- -iQEcBAABAgAGBQJZ8P3nAAoJEPOHY87f0iVZyRcIALB6pnmTMSJfgSgpGxce1M5G -+OzFqx9FmKGNpUnkwBm2B3mCGSR60yIwTconZkBNUM02KeTSH4q8kGWvLIEO6I34 -nqwLy8TSLxcdV0cOQ2AHBs7maVfsMwaeZOlP4uv7acmwYRzsYa2vmEHRFJhPDdAx -+tVdUr7edzIE9SgM3uGdmnBXOgQ0WLPMegu62BhQPSCBybNXwDUlQjxsrHxBj/Nc -bYrWVD8e4XS6FzkCsxBXbYukZAPcq2CZICKzPK/Vol/kZBdvB6mhV3HpOaOnywjw -mvlwjmAm3dx6xuIR8hmPrkKEUPziTxK30o22szbcn9x6Y4vKXcJC9+JwI8RgnYk= -=XM39 +iQEcBAABAgAGBQJZ/kOLAAoJEPOHY87f0iVZHrIH/00A5X7qWOO1wVJfkdYkyki2 +HDYuzg2705XGKjTORp82REBJ3+533kARyDLa5kfaiyUcG7qmfLoh2yhq2rc+k7kX +rynYtJ022gKP4HPOjrVRgFsPYKym2g1sB0PwLGeqi6ZQTFOlCduZXzfg+y4pkew/ +BMnbpvINygLhGdQkmPpQRXpnSIDbPbernetcwJvsEbqJGYX0s8RlSeW05knsNjOP +xULhD/q3DMt11jSt7LJZBfmDV6Nrip9KN68cpayHdtIqlHUBhr8CjR8fjWReyi/B +gXPZ2qT0eYKVAfK6kQNfY5APCSdYOkGnpuZEZCHrysg3ReLWPIjejrqesbao450= +=s6NW -----END PGP SIGNATURE----- -- GitLab