#1 Use smartd_warning plugin to notify users (bug #1647534)
Opened 3 years ago by orion. Modified 3 years ago
rpms/ orion/smartmontools notify  into  rawhide

file modified
+358 -331
@@ -4,16 +4,9 @@ 

   * Home page of code is: http://www.smartmontools.org

   *

   * Copyright (C) 2003-11 Philip Williams, Bruce Allen

-  * Copyright (C) 2008-17 Christian Franke

-  *

-  * This program is free software; you can redistribute it and/or modify

-  * it under the terms of the GNU General Public License as published by

-  * the Free Software Foundation; either version 2, or (at your option)

-  * any later version.

-  *

-  * You should have received a copy of the GNU General Public License

-  * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.

+  * Copyright (C) 2008-18 Christian Franke

   *

+  * SPDX-License-Identifier: GPL-2.0-or-later

   */

  

  /*
@@ -75,7 +68,7 @@ 

  /*

  const drive_settings builtin_knowndrives[] = {

   */

-   { "$Id: drivedb.h 4591 2017-11-04 22:40:53Z chrfranke $",

+   { "$Id: drivedb.h 4813 2018-10-14 17:34:43Z chrfranke $",

      "-", "-",

      "This is a dummy entry to hold the SVN-Id of drivedb.h",

      ""
@@ -155,6 +148,19 @@ 

      //  251-253 Unknown_Attribute

      "-v 254,raw48,Free_Fall_Sensor,HDD"

    },

+   { "Swissbit C440 Industrial CompactFlash Card",

+     // spec v1.23 found at http://www.farnell.com/datasheets/1821167.pdf

+     // tested with SFCF4096H2BU4TO-I-MS-527-STD

+     "SFCF(2048|4096|8192|16GB|32GB|64GB)H[0-9]BU[24]TO-(C|I)-(MS|QT|NU)-5[0-9]7-STD",

+     "", "",

+     "-v 196,raw24/raw24,Spare_Blocks "

+     "-v 213,raw24/raw24,Spare_Blocks_Worst_Chip "

+     "-v 229,raw48,Erase_Count "

+     "-v 203,raw48,Total_ECC_Errors "

+     "-v 232,raw48,Total_Number_of_Reads "

+     "-v 214,raw48,Reserved_Attribute " // Spec says "to be determined"

+     "-v 215,raw48,Current_TRIM_Percent "

+   },

    { "Apacer SSD",

      "(2|4|8|16|32)GB SATA Flash Drive", // tested with APSDM002G15AN-CT/SFDDA01C and SFI2101D, APSDM004G13AN-AT/SFDE001A

      "SF(DDA01C|I2101D|DE001A)", "", // spec found at http://wfcache.advantech.com/www/certified-peripherals/documents/96fmcff-04g-cs-ap_Datasheet.pdf
@@ -264,10 +270,9 @@ 

        // M4-CT064M4SSD2/0009, M4-CT256M4SSD3/000F

      "",

      "This drive may hang after 5184 hours of power-on time:\n"

-     "http://www.tomshardware.com/news/Crucial-m4-Firmware-BSOD,14544.html\n"

-     "See the following web pages for firmware updates:\n"

-     "http://www.crucial.com/support/firmware.aspx\n"

-     "http://www.micron.com/products/solid-state-storage/client-ssd#software",

+     "https://www.tomshardware.com/news/Crucial-m4-Firmware-BSOD,14544.html\n"

+     "See the following web page for firmware updates:\n"

+     "http://www.crucial.com/usa/en/support-ssd",

      "-v 170,raw48,Grown_Failing_Block_Ct "

      "-v 171,raw48,Program_Fail_Count "

      "-v 172,raw48,Erase_Fail_Count "
@@ -279,26 +284,34 @@ 

      "-v 202,raw48,Perc_Rated_Life_Used "

      "-v 206,raw48,Write_Error_Rate"

    },

-   { "Crucial/Micron MX1/2/300, M5/600, 1100 Client SSDs",

+   { "Crucial/Micron BX/MX1/2/3/500, M5/600, 1100 SSDs",

      "Crucial_CT(128|256|512)MX100SSD1|"// Marvell 88SS9189, tested with Crucial_CT256MX100SSD1/MU01

      "Crucial_CT(200|250|256|500|512|1000|1024)MX200SSD[1346]|" // Marvell 88SS9189, tested with

        // Crucial_CT500MX200SSD1/MU01, Crucial_CT1024MX200SSD1/MU01, Crucial_CT250MX200SSD3/MU01,

        // Crucial_CT250MX200SSD1/MU03

-     "Crucial_CT(275|525|1050|2050)MX300SSD[14]|" // Marvell 88SS1074, tested with

-       // Crucial_CT525MX300SSD1/M0CR021, Crucial_CT2050MX300SSD1/M0CR031, Crucial_CT275MX300SSD1/M0CR040

+     "Crucial_CT(275|525|750|1050|2050)MX300SSD[14]|" // Marvell 88SS1074, tested with

+       // Crucial_CT275MX300SSD1/M0CR040, Crucial_CT525MX300SSD1/M0CR021, Crucial_CT750MX300SSD1/M0CR011,

+       // Crucial_CT2050MX300SSD1/M0CR031

      "Crucial_CT(120|240|480|960)M500SSD[134]|" // Marvell 88SS9187, tested with

        // Crucial_CT120M500SSD1/MU02, Crucial_CT120M500SSD3/MU02, Crucial_CT240M500SSD1/MU03,

        // Crucial_CT480M500SSD1/MU03, Crucial_CT960M500SSD1/MU03, Crucial_CT240M500SSD4/MU05

      "Crucial_CT(128|256|512|1024)M550SSD[134]|" // tested with Crucial_CT512M550SSD3/MU01,

        // Crucial_CT1024M550SSD1/MU01, Crucial_CT128M550SSD4/MU02

+     "CT(120|240|480)BX300SSD1|" // Silicon Motion SM2258, same attributes as Marvell-based Crucial SSDs,

+       // tested with CT240BX300SSD1/M2CR010

+     "CT(120|240|480|960)BX500SSD1|" // Silicon Motion SM2258XT, tested with CT120BX500SSD1/M6CR013

+     "CT(250|500|1000|2000)MX500SSD[14]|" // Silicon Motion SM2258, tested with CT250MX500SSD1/M3CR010

+       // CT500MX500SSD1/M3CR010, CT1000MX500SSD1/M3CR010, CT2000MX500SSD1/M3CR010, CT250MX500SSD4/M3CR022

      "Micron_M500_MTFDDA[KTV](120|240|480|960)MAV|"// tested with Micron_M500_MTFDDAK960MAV/MU05

+     "Micron_M500DC_(EE|MT)FDDA[AK](120|240|480|800)MBB|" // tested with Micron_M500DC_EEFDDAA120MBB/129,

+       // Micron_M500DC_MTFDDAK800MBB/0129

+     "(Micron[_ ])?M500IT[_ ]MTFDDA[KTY](032|050|060|064|120|128|240|256)[MS]BD|" // tested with M500IT_MTFDDAK240MBD/MG02

      "(Micron_)?M510[_-]MTFDDA[KTV](128|256)MAZ|" // tested with M510-MTFDDAK256MAZ/MU01

+     "MICRON_M510DC_(EE|MT)FDDAK(120|240|480|800|960)MBP|" // tested with Micron_M510DC_MTFDDAK240MBP/0005

      "(Micron_)?M550[_-]MTFDDA[KTV](064|128|256|512|1T0)MAY|" // tested with M550-MTFDDAK256MAY/MU01

      "Micron_M600_(EE|MT)FDDA[KTV](128|256|512|1T0)MBF[25Z]?|" // tested with Micron_M600_MTFDDAK1T0MBF/MU01

-     "Micron_M500DC_(EE|MT)FDDA[AK](120|240|480|800)MBB|" // tested with Micron_M500DC_EEFDDAA120MBB/129, Micron_M500DC_MTFDDAK800MBB/0129

-     "Micron_1100_MTFDDA[KV](256|512|1T0|2T0)TBN|" // Marvell 88SS1074, tested Micron_1100_MTFDDAK256TBN/M0MU020

-     "MICRON_M510DC_(EE|MT)FDDAK(120|240|480|800|960)MBP|" // Micron_M510DC_MTFDDAK240MBP/0005

-     "Micron_5100_(EE|MT)FDDA[KV](240|480|960|1T9|3T8|7T6)T(BY|CB|CC)", // tested with Micron_5100_MTFDDAK1T9TBY

+     "(Micron_1100_)?MTFDDA[KV](256|512|1T0|2T0)TBN", // Marvell 88SS1074, tested with

+       // Micron_1100_MTFDDAK256TBN/M0MU020, MTFDDAK256TBN/M0MA020 (OEM)

      "", "",

    //"-v 1,raw48,Raw_Read_Error_Rate "

      "-v 5,raw48,Reallocate_NAND_Blk_Cnt "
@@ -312,18 +325,52 @@ 

      "-v 180,raw48,Unused_Reserve_NAND_Blk "

      "-v 183,raw48,SATA_Interfac_Downshift "

      "-v 184,raw48,Error_Correction_Count "

-     "-v 195,raw48,Cumulativ_Corrected_ECC "

    //"-v 187,raw48,Reported_Uncorrect "

    //"-v 194,tempminmax,Temperature_Celsius "

+     "-v 195,raw48,Cumulativ_Corrected_ECC "

    //"-v 196,raw16(raw16),Reallocated_Event_Count "

    //"-v 197,raw48,Current_Pending_Sector "

    //"-v 198,raw48,Offline_Uncorrectable "

    //"-v 199,raw48,UDMA_CRC_Error_Count "

-     "-v 202,raw48,Percent_Lifetime_Used "

+     "-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 247,raw48,Host_Program_Page_Count "

+     "-v 248,raw48,FTL_Program_Page_Count"

+   },

+   // Reference: https://www.micron.com/resource-details/feec878a-265e-49a7-8086-15137c5f9011

+   // TN-FD-34: 5100 SSD SMART Implementation

+   {

+     "Micron 5100 Pro / 5200 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

+     "", "",

+   //"-v 1,raw48,Raw_Read_Error_Rate "

+   //"-v 5,raw48,Reallocated_Block_Count "

+   //"-v 9,raw24(raw8),Power_On_Hours "  // raw24(raw8)??

+   //"-v 12,raw48,Power_Cycle_Count "

+     "-v 170,raw48,Reserved_Block_Pct " // Percentage of remaining reserved blocks available

+     "-v 171,raw48,Program_Fail_Count "

+     "-v 172,raw48,Erase_Fail_Count "

+     "-v 173,raw48,Avg_Block-Erase_Count "

+     "-v 174,raw48,Unexpect_Power_Loss_Ct "

+   //"-v 180,raw48,Reserved_Block_Count " // absolute count of remaining reserved blocks available

+     "-v 183,raw48,SATA_Int_Downshift_Ct " // SATA speed downshift count

+   //"-v 184,raw48,Error_Correction_Count "

+   //"-v 187,raw48,Reported_Uncorrect " // Number of UECC correction failures

+   //"-v 188,raw48,Command_Timeouts "

+   //"-v 194,tempminmax,Temperature_Celsius " // 100 - degrees C, wraps: 101 reported as 255

+   //"-v 195,raw48,Cumulativ_Corrected_ECC "

+   //"-v 196,raw48,Reallocation_Event_Ct "

+   //"-v 197,raw48,Current_Pending_Sector " // Use the raw value

+   //"-v 198,raw48,Offline_Uncorrectable "  // Use the raw value

+   //"-v 199,raw48,UDMA_CRC_Error_Count "   // Use the raw value

+     "-v 202,raw48,Percent_Lifetime_Remain " // Remaining endurance, trips at 10%

+     "-v 206,raw48,Write_Error_Rate "

+     "-v 210,raw48,RAIN_Success_Recovered "  // Total number of NAND pages recovered by RAIN

+     "-v 247,raw48,Host_Program_Page_Count "

      "-v 248,raw48,Bckgnd_Program_Page_Cnt"

    },

    { "Micron M500DC/M510DC Enterprise SSDs",
@@ -360,7 +407,7 @@ 

      "A firmware update is available for this drive.\n"

      "It is HIGHLY RECOMMENDED for drives with specific serial numbers.\n"

      "See the following web pages for details:\n"

-     "http://www.corsair.com/en-us/force-series-ls-60gb-sata-3-6gb-s-ssd\n"

+     "https://www.corsair.com/en-us/force-series-ls-60gb-sata-3-6gb-s-ssd\n"

      "https://www.smartmontools.org/ticket/628",

      "-v 1,raw24/raw32,Raw_Read_Error_Rate "

      "-v 5,raw48,Retired_Block_Count "
@@ -411,6 +458,7 @@ 

      "KINGSTON SMS200S3(30|60|120)G|" // mSATA, SF-2241, tested with SMS200S3120G/KC3ABBF0

      "KINGSTON SMS450S3(32|64|128)G|" // mSATA, SF-2281, tested with SMS450S3128G/503ABBF0

      "KINGSTON (SV300|SKC100|SE100)S3.*G|" // other SF-2281

+     "KINGSTON SNS4151S316GD|" // KINGSTON SNS4151S316GD/S9FM01.6

      "MKNSSDCR(45|60|90|120|180|240|360|480)GB(-(7|DX7?|MX|G2))?|" // Mushkin Chronos (7mm/Deluxe/MX/G2),

        // SF-2281, tested with MKNSSDCR120GB, MKNSSDCR120GB-MX/560ABBF0, MKNSSDCR480GB-DX7/603ABBF0

      "MKNSSDEC(60|120|240|480|512)GB|" // Mushkin Enhanced ECO2, tested with MKNSSDEC120GB/604ABBF0
@@ -515,13 +563,16 @@ 

      "-v 249,raw48,Spares_Remaining_Perc " //  later then 0409 FW.

    },

    { "Phison Driven SSDs", // see MKP_521_Phison_SMART_attribute.pdf

+     "KINGSTON SEDC400S37(400|480|800|960|1600|1800)G|" // DC400, tested with

+       // KINGSTON SEDC400S37480G/SAFM02.[GH], KINGSTON SEDC400S37960G/SAFM32.I

      "KINGSTON SUV300S37A(120|240|480)G|" // UV300 SSD, tested with KINGSTON SUV300S37A120G/SAFM11.K

      "KINGSTON SKC310S3B?7A960G|" // SSDNow KC310, KINGSTON SKC310S37A960G/SAFM00.r

      "KINGSTON SKC400S37(128G|256G|512G|1T)|" // SSDNow KC400, KINGSTON SKC400S37128G

      "KINGSTON SV310S3(7A|D7|N7A|B7A)960G|" // SSDNow V310

-     "GOODRAM|" // GOODRAM/SAFM12.2 (CX200), model name is missing in the SMART!

      "PNY CS1311 (120|240|480|960)GB SSD|" // tested with PNY CS1311 120GB SSD/CS131122

-     "KINGSTON SHSS3B?7A(120|240|480|960)G", // HyperX Savage

+     "SSD Smartbuy (60|120|240)GB|" // SSD Smartbuy 240GB/SBFM91.1

+     "KINGSTON SHSS3B?7A(120|240|480|960)G|" // HyperX Savage

+     "KINGSTON SA400S37(120|240|480|960)G", // Kingston A400 SSD/SBFKB1D1

      "", "",

    //"-v 1,raw48,Raw_Read_Error_Rate "

      "-v 2,raw48,Not_In_Use "
@@ -557,11 +608,12 @@ 

    },

    // this is a copy of the Phison bases record for the OEM drives with a very

    // weak information in the model. Detection is based on Firmware.

-   // Tested with FoxLine flssd240x4se (SATA SSD/SBFM10.5) and Supermicro 

-   // SSD-DM032-PHI (SATA SSD/S9FM02.1)

    { "Phison Driven OEM SSDs", // see MKP_521_Phison_SMART_attribute.pdf

-     "SATA SSD",

-     "(S9FM02\\.1|SBFM10\\.5)",

+     "GOODRAM|" // tested with GOODRAM CX200 (GOODRAM/SAFM12.2)

+     "INTENSO|" // tested with Intenso SSD SATA III Top (INTENSO/S9FM02.6, .../SAFM01.6)

+     "SATA SSD", // tested with Supermicro SSD-DM032-PHI (SATA SSD/S9FM02.1),

+       // PC Engines msata16d (SATA SSD/S9FM02.3), FoxLine flssd240x4s(SATA SSD/SBFM10.5)

+     "S9FM02\\.[136]|SAFM01\\.6|SAFM12\\.2|SBFM10\\.5|SBFM91\\.2",

      "",

    //"-v 1,raw48,Raw_Read_Error_Rate "

      "-v 2,raw48,Not_In_Use "
@@ -723,7 +775,8 @@ 

    {

      "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-TR150|" // tested with TOSHIBA-TR150/SAFZ12.3

+     "TOSHIBA Q300( Pro\\.)?", // tested with TOSHIBA Q300 Pro./JYRA0101

      "", "",

    //"-v 9,raw24(raw8),Power_On_Hours "

    //"-v 12,raw48,Power_Cycle_Count "
@@ -735,8 +788,9 @@ 

    //"-v 194,tempminmax,Temperature_Celsius "

      "-v 241,raw48,Host_Writes"

    },

-   { "InnoDisk InnoLite SATADOM D150QV-L SSDs", // tested with InnoLite SATADOM D150QV-L/120319

-     "InnoLite SATADOM D150QV-L",

+   { "InnoDisk InnoLite SATADOM D150QV SSDs", // tested with InnoLite SATADOM D150QV-L/120319

+                                              // InnoLite SATADOM D150QV/120319

+     "InnoLite SATADOM D150QV.*",

      "", "",

    //"-v 1,raw48,Raw_Read_Error_Rate "

    //"-v 2,raw48,Throughput_Performance "
@@ -744,18 +798,18 @@ 

    //"-v 5,raw16(raw16),Reallocated_Sector_Ct "

    //"-v 7,raw48,Seek_Error_Rate " // from InnoDisk iSMART Linux tool, useless for SSD

    //"-v 8,raw48,Seek_Time_Performance "

-   //"-v 9,raw24(raw8),Power_On_Hours "

+   //"-v 9,raw48,Power_On_Hours "

    //"-v 10,raw48,Spin_Retry_Count "

    //"-v 12,raw48,Power_Cycle_Count "

      "-v 168,raw48,SATA_PHY_Error_Count "

-     "-v 170,raw48,Bad_Block_Count "

-     "-v 173,raw48,Erase_Count "

+     "-v 170,raw16,Bad_Block_Count_New/Tot "

+     "-v 173,raw16,Erase_Count_Max/Avg "

      "-v 175,raw48,Bad_Cluster_Table_Count "

      "-v 192,raw48,Unexpect_Power_Loss_Ct "

    //"-v 194,tempminmax,Temperature_Celsius "

    //"-v 197,raw48,Current_Pending_Sector "

      "-v 229,hex48,Flash_ID "

-     "-v 235,raw48,Later_Bad_Block "

+     "-v 235,raw16,Lat_Bad_Blk_Era/Wri/Rea "

      "-v 236,raw48,Unstable_Power_Count "

      "-v 240,raw48,Write_Head"

    },
@@ -954,7 +1008,7 @@ 

      "",

      "This drive may require a firmware update to\n"

      "fix possible drive hangs when reading SMART self-test log:\n"

-     "http://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=18363",

+     "https://downloadcenter.intel.com/download/26491",

      "-v 192,raw48,Unsafe_Shutdown_Count "

      "-v 225,raw48,Host_Writes_32MiB "

      "-v 226,raw48,Workld_Media_Wear_Indic "
@@ -1173,8 +1227,9 @@ 

    { "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, 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])",

+     "INTEL SSDSC(1N|2B)[ABPX]((080|100|120|150|160|200|240|300|400|480|600|800)G[3467][RT]?|(012|016)T[46])",

        // A = S3700, B*4 = S3500, B*6 = S3510, P = 730, X = S3610

+       // Dell ships drives with model of the form SSDSC2BB120G4R

      "", "",

    //"-v 3,raw16(avg16),Spin_Up_Time "

    //"-v 4,raw48,Start_Stop_Count "
@@ -1206,6 +1261,23 @@ 

      "-v 243,raw48,NAND_Writes_32MiB " // S3510/3610

      "-F xerrorlba" // tested with SSDSC2BB600G4/D2010355

    },

+   // https://www.intel.com/content/www/us/en/solid-state-drives/ssd-pro-5400s-series-spec.html

+   // https://www.intel.com/content/www/us/en/solid-state-drives/ssd-pro-5400s-series-m2-spec.html

+   { "Intel SSD Pro 5400s Series", // Tested with SSDSC2KF480H6/LSF036P

+     "INTEL SSDSC[2K]KF(120H|180H|240H|360H|480H|010X)6",

+     "", "",

+     "-v 170,raw48,Available_Reservd_Space "

+     "-v 171,raw48,Program_Fail_Count "

+     "-v 172,raw48,Erase_Fail_Count "

+     "-v 174,raw48,Unexpect_Power_Loss_Ct "

+     "-v 183,raw48,SATA_Downshift_Count "

+     "-v 187,raw48,Uncorrectable_Error_Cnt "

+     "-v 225,raw48,Host_Writes_32MiB "

+     "-v 226,raw48,Workld_Media_Wear_Indic "

+     "-v 227,raw48,Workld_Host_Reads_Perc "

+     "-v 228,raw48,Workload_Minutes "

+     "-v 249,raw48,NAND_Writes_1GiB "

+   },

    { "Intel 3710 Series SSDs", // INTEL SSDSC2BA200G4R/G201DL2B (dell)

      "INTEL SSDSC2BA(200G|400G|800G|012T)4.?",

      "", "",
@@ -1223,6 +1295,68 @@ 

      "-v 234,raw24/raw32:04321,Thermal_Throttle "

      "-v 243,raw48,NAND_Writes_32MiB "

    },

+   { "Intel S3520 Series SSDs", // INTEL SSDSC2BB960G7/N2010112, INTEL SSDSC2BB016T7/N2010112

+     "INTEL SSDSC(2|K)(J|B)B(240G|480G|960G|150G|760G|800G|012T|016T)7.?",

+     "", "",

+   //"-v 5,raw16(raw16),Reallocated_Sector_Ct "

+   //"-v 9,raw24(raw8),Power_On_Hours "

+   //"-v 12,raw48,Power_Cycle_Count "

+     "-v 170,raw48,Available_Reservd_Space "

+     "-v 171,raw48,Program_Fail_Count "

+     "-v 172,raw48,Erase_Fail_Count "

+     "-v 174,raw48,Unsafe_Shutdown_Count "

+     "-v 175,raw16(raw16),Power_Loss_Cap_Test "

+     "-v 183,raw48,SATA_Downshift_Count "

+     "-v 184,raw48,End-to-End_Error_Count "

+     "-v 187,raw48,Uncorrectable_Error_Cnt "

+     "-v 190,tempminmax,Case_Temperature "

+     "-v 192,raw48,Unsafe_Shutdown_Count "

+     "-v 194,tempminmax,Drive_Temperature "

+     "-v 197,raw48,Pending_Sector_Count "

+     "-v 199,raw48,CRC_Error_Count "

+     "-v 225,raw48,Host_Writes_32MiB "

+     "-v 226,raw48,Workld_Media_Wear_Indic " // Timed Workload Media Wear Indicator (percent*1024)

+     "-v 227,raw48,Workld_Host_Reads_Perc "  // Timed Workload Host Reads Percentage

+     "-v 228,raw48,Workload_Minutes " // 226,227,228 can be reset by 'smartctl -t vendor,0x40'

+   //"-v 232,raw48,Available_Reservd_Space "

+   //"-v 233,raw48,Media_Wearout_Indicator "

+     "-v 234,raw24/raw32:04321,Thermal_Throttle_Status "

+     "-v 241,raw48,Host_Writes_32MiB "

+     "-v 242,raw48,Host_Reads_32MiB "

+     "-v 243,raw48,NAND_Writes_32MiB"

+   },

+   { "Intel S4510/S4610/S4500/S4600 Series SSDs", // INTEL SSDSC2KB480G7/SCV10100,

+       // INTEL SSDSC2KB960G7/SCV10100, INTEL SSDSC2KB038T7/SCV10100,

+       // INTEL SSDSC2KB038T7/SCV10121, INTEL SSDSC2KG240G7/SCV10100

+     "INTEL SSDSC2K(B|G)(240G|480G|960G|019T|038T)(7|8).?",

+     "", "",

+   //"-v 5,raw16(raw16),Reallocated_Sector_Ct "

+   //"-v 9,raw24(raw8),Power_On_Hours "

+   //"-v 12,raw48,Power_Cycle_Count "

+     "-v 170,raw48,Available_Reservd_Space "

+     "-v 171,raw48,Program_Fail_Count "

+     "-v 172,raw48,Erase_Fail_Count "

+     "-v 174,raw48,Unsafe_Shutdown_Count "

+     "-v 175,raw16(raw16),Power_Loss_Cap_Test "

+     "-v 183,raw48,SATA_Downshift_Count "

+     "-v 184,raw48,End-to-End_Error_Count "

+     "-v 187,raw48,Uncorrectable_Error_Cnt "

+     "-v 190,tempminmax,Drive_Temperature "

+     "-v 192,raw48,Unsafe_Shutdown_Count "

+     "-v 197,raw48,Pending_Sector_Count "

+     "-v 199,raw48,CRC_Error_Count "

+     "-v 225,raw48,Host_Writes_32MiB "

+     "-v 226,raw48,Workld_Media_Wear_Indic " // Timed Workload Media Wear Indicator (percent*1024)

+     "-v 227,raw48,Workld_Host_Reads_Perc "  // Timed Workload Host Reads Percentage

+     "-v 228,raw48,Workload_Minutes " // 226,227,228 can be reset by 'smartctl -t vendor,0x40'

+   //"-v 232,raw48,Available_Reservd_Space "

+   //"-v 233,raw48,Media_Wearout_Indicator "

+     "-v 234,raw24/raw32:04321,Thermal_Throttle_Status "

+     "-v 235,raw16(raw16),Power_Loss_Cap_Test "

+     "-v 241,raw48,Host_Writes_32MiB "

+     "-v 242,raw48,Host_Reads_32MiB "

+     "-v 243,raw48,NAND_Writes_32MiB"

+   },

    { "Kingston branded X25-V SSDs", // fixed firmware

      "KINGSTON SSDNow 40GB",

      "2CV102(J[89A-Z]|[K-Z].)", // >= "2CV102J8"
@@ -1310,7 +1444,8 @@ 

        // tested with PLEXTOR PX-128M3/1.01, PX-128M3P/1.04, PX-256M3/1.05, PX-128M5S/1.02, PX-256M5S/1.03,

        // PX-128M5M/1.05, PX-128M5S/1.05, PX-128M5Pro/1.05, PX-512M5Pro/1.06, PX-256M5P/1.01, PX-128M6S/1.03

        // (1.04/5 Firmware self-test log lifetime unit is bogus, possibly 1/256 hours)

-     "PLEXTOR PX-(64|128|256|512|768)M(3P?|5[MPS]|5Pro|6[MS])",

+       // PLEXTOR PX-256M6S+/1.00

+     "PLEXTOR PX-(64|128|256|512|768)M(3P?|5[MPS]|5Pro|6[MS])\\+?",

      "", "",

    //"-v 1,raw48,Raw_Read_Error_Rate "

    //"-v 5,raw16(raw16),Reallocated_Sector_Ct "
@@ -1345,10 +1480,13 @@ 

    },

    { "Samsung based SSDs",

      "SAMSUNG SSD PM800 .*GB|"  // SAMSUNG PM800 SSDs, tested with SAMSUNG SSD PM800 TH 64GB/VBM25D1Q

-     "SAMSUNG SSD PM810 .*GB|"  // SAMSUNG PM810 (470 series) SSDs, tested with SAMSUNG SSD PM810 2.5" 128GB/AXM06D1Q

+     "SAMSUNG SSD PM810 .*GB|"  // SAMSUNG PM810 (470 series) SSDs, tested with

+       // SAMSUNG SSD PM810 2.5" 128GB/AXM06D1Q

+     "SAMSUNG SSD SM841N? (2\\.5\"? 7mm |mSATA )?(128|256|512)GB( SED)?|" // tested with

+       // SAMSUNG SSD SM841 2.5" 7mm 256GB/DXM02D0Q, SAMSUNG SSD SM841 mSATA 512GB/DXM44D0Q,

+       // SAMSUNG SSD SM841N 2.5 7mm 128GB/DXM03D0Q, SAMSUNG SSD SM841N mSATA 256GB SED/DXM45D6Q

      "SAMSUNG SSD PM851 (mSATA |M\\.2 )?(2280 )?(128|256|512)GB|" // tested with SAMSUNG SSD PM851 mSATA 128GB,

        // SAMSUNG SSD PM851 M.2 2280 256GB/EXT25D0Q

-     "SAMSUNG SSD SM841N (mSATA )?(128|256|512)GB|" // tested with SAMSUNG SSD SM841N mSATA 256GB

      "SAMSUNG 470 Series SSD|"  // tested with SAMSUNG 470 Series SSD 64GB/AXM09B1Q

      "Samsung SSD 750 EVO (120|250|500)GB|" // tested with Samsung SSD 750 EVO 250GB/MAT01B6Q

      "SAMSUNG SSD 830 Series|"  // tested with SAMSUNG SSD 830 Series 64GB/CXM03B1Q
@@ -1356,19 +1494,22 @@ 

      "MZ7PC(512|256|128|064)HA(GH|FU|DR)-000.*|" // probably PM830, tested with SAMSUNG MZ7PC128HAFU-000L1/CXM04L1Q

      "Samsung SSD 840 (PRO )?Series|" // tested with Samsung SSD 840 PRO Series 128GB/DXM04B0Q,

        // Samsung SSD 840 Series/DXT06B0Q

-     "Samsung SSD 8[45]0 EVO .*|" // tested with

+     "Samsung SSD 8[456]0 EVO (mSATA |M\\.2 )?((120|250|500|750)G|[12]T)B|" // tested with

        // Samsung SSD 840 EVO (120|250|500|750)GB/EXT0AB0Q,

        // Samsung SSD 840 EVO (120|250)GB/EXT0BB6Q, 1TB/EXT0BB0Q, 120GB mSATA/EXT41B6Q,

-       // Samsung SSD 850 EVO 250GB/EMT01B6Q

-       // Samsung SSD 850 EVO M.2 250GB/EMT21B6Q

-       // Samsung SSD 850 EVO mSATA 120GB/EMT41B6Q

-       // Samsung SSD 850 EVO 2TB/EMT02B6Q

-     "Samsung SSD 850 PRO ((128|256|512)G|1T)B|" // tested with Samsung SSD 850 PRO 128GB/EXM01B6Q,

-       // Samsung SSD 850 PRO 1TB/EXM01B6Q

+       // Samsung SSD 850 EVO 250GB/EMT01B6Q, Samsung SSD 850 EVO M.2 250GB/EMT21B6Q,

+       // Samsung SSD 850 EVO mSATA 120GB/EMT41B6Q, Samsung SSD 850 EVO 2TB/EMT02B6Q,

+       // Samsung SSD 860 EVO 250GB/RVT01B6Q, Samsung SSD 860 EVO mSATA 250GB/RVT41B6Q,

+       // Samsung SSD 860 EVO 500GB/RVT01B6Q, Samsung SSD 860 EVO mSATA 500GB/RVT41B6Q,

+       // Samsung SSD 860 EVO mSATA 1TB/RVT41B6Q, Samsung SSD 860 EVO 2TB/RVT01B6Q

+     "Samsung SSD 8[56]0 PRO ((128|256|512)G|1T)B|" // tested with Samsung SSD 850 PRO 128GB/EXM01B6Q,

+       // Samsung SSD 850 PRO 1TB/EXM01B6Q, Samsung SSD 860 PRO 256GB/RVM01B6Q,

+       // Samsung SSD 860 PRO 512GB/RVM01B6Q, Samsung SSD 860 PRO 1TB/RVM01B6Q

      "SAMSUNG MZ7PA256HMDR-.*|" // PM810 (470 Series), tested with SAMSUNG MZ7PA256HMDR-010H1/AXM07H1Q

      "Samsung SSD 845DC EVO .*|" // Samsung SSD 845DC EVO 960GB/EXT03X3Q

      "SAMSUNG MZ[7M]PC(032|064|128|256|512)HBCD-.*|" // PM830, tested with SAMSUNG MZMPC032HBCD-000L1/CXM12L1Q

      "SAMSUNG MZ7TD(128|256)HAFV-.*|" // 840 Series, tested with SAMSUNG MZ7TD256HAFV-000L7/DXT06L6Q

+     "SAMSUNG MZMTD(128|256|512)HAGL-.*|" // PM841, tested with SAMSUNG MZMTD512HAGL-00000/DXT4200Q

      "SAMSUNG MZ7WD((120|240)H[AC]FV|480HAGM|960HAGP)-00003|" // SM843T Series, tested with

        // SAMSUNG MZ7WD120HAFV-00003/DXM85W3Q, SAMSUNG MZ7WD120HCFV-00003/DXM9203Q

      "SAMSUNG MZ[7N]TE(128|256|512)HMHP-.*|" // PM851, tested with SAMSUNG MZ7TE256HMHP-000L7/EXT09L6Q,
@@ -1377,7 +1518,11 @@ 

        // 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 MZ7KM(120|240|480|960|1T9)HA(JM|HP|GR|FD|JM)-.*|" // SM863, tested with MZ7KM480HAHP-0E005/GXM1003Q

+     "SAMSUNG MZ7LH(240|480|960|1T9|3T8|7T6)H[AM](HQ|JR|LT|LA)-.*|" //PM883, tested with SAMSUNG MZ7LH960HAJR-00005

+     "SAMSUNG MZ7KH(240|480|960|1T9|3T8)HA(HQ|JR|LS)-.*|" //SM883

      "SAMSUNG MZN(LF|TY)(128|256)H[CD]HP-.*|" // CM871/871a, tested with SAMSUNG MZNLF128HCHP-000H1/FXT21H1Q,

        // SAMSUNG MZNTY256HDHP-000/MAT21K0Q

      "SAMSUNG MZ[7N]LN(128|256|512|1T0)H[ACM](GR|HP|HQ|J[HPQ]|LR)-.*|" // PM871/871a/b, tested with
@@ -1385,7 +1530,8 @@ 

        // SAMSUNG MZNLN256HMHQ-000H1/MAV21H3Q

      "SAMSUNG SSD PM871 .*|" // SAMSUNG SSD PM871 2.5 7mm 256GB/EMT02D0Q

        // SAMSUNG MZ7LN256HMJP-00000/MAV0100Q, SAMSUNG MZ7LN512HMJP-00000/MAV0100Q

-     "SAMSUNG MZHPV(128|256|512)HDGL-.*", // SM951, tested with SAMSUNG MZHPV512HDGL-00000/BXW2500Q

+     "SAMSUNG MZHPV(128|256|512)HDGL-.*|" // SM951, tested with SAMSUNG MZHPV512HDGL-00000/BXW2500Q

+     "Samsung Portable SSD T5", // tested with Samsung Portable SSD T5 (0x04e8:0x61f5)

      "", "",

    //"-v 5,raw16(raw16),Reallocated_Sector_Ct "

    //"-v 9,raw24(raw8),Power_On_Hours "
@@ -1438,12 +1584,14 @@ 

        // SanDisk SD6SB1M256G1022I/X231600, SanDisk SD6SF1M128G1022/X231200, SanDisk SD6SB2M512G1022I/X210400

      "SanDisk SD7S[BN]6S-?(128|256|512)G(1122|-1006)|" // X300 (88SS9189?), tested with

        // SanDisk SD7SB6S128G1122/X3310000, SanDisk SD7SN6S-512G-1006/X3511006

-     "SanDisk SD8SB8U((128|256|512)G|1T00)1122|" // X400 (88SS1074), tested with SanDisk SD8SB8U128G1122/X4120000

+     "SanDisk SD8S[BN]8U-?((128|256|512)G|1T00)(1122|-1006)|" // X400 (88SS1074), tested with SanDisk SD8SB8U128G1122/X4120000

      "SanDisk SDSSDHP[0-9]*G|" // Ultra Plus (88SS9175), tested with SanDisk SDSSDHP128G/X23[01]6RL

      "SanDisk (SDSSDHII|Ultra II )[0-9]*GB?|" // Ultra II (88SS9190/88SS9189), tested with

        // SanDisk SDSSDHII120G/X31200RL, SanDisk Ultra II 960GB/X41100RL

-     "SanDisk SDSSDXPS?[0-9]*G", // Extreme II/Pro (88SS9187), tested with SanDisk SDSSDXP480G/R1311,

+     "SanDisk SDSSDH2(128|256)G|" // SanDisk SDSSDH2128G/X211200

+     "SanDisk SDSSDXPS?[0-9]*G|" // Extreme II/Pro (88SS9187), tested with SanDisk SDSSDXP480G/R1311,

        // SanDisk SDSSDXPS480G/X21200RL

+     "SSD SATAIII 16GB", // SSD SATAIII 16GB/i221100 (see #923)

      "", "",

    //"-v 5,raw16(raw16),Reallocated_Sector_Ct "

    //"-v 9,raw24(raw8),Power_On_Hours "
@@ -1462,6 +1610,7 @@ 

    //"-v 188,raw48,Command_Timeout "

    //"-v 194,tempminmax,Temperature_Celsius "

      "-v 199,raw48,SATA_CRC_Error "

+     "-v 201,raw48,Lifetime_Remaining% "

      "-v 212,raw48,SATA_PHY_Error "

      "-v 230,raw48,Perc_Write/Erase_Count "

      "-v 232,raw48,Perc_Avail_Resrvd_Space "
@@ -1471,6 +1620,7 @@ 

      "-v 242,raw48,Total_Reads_GiB "

    //"-v 243,raw48,Unknown_Attribute "

      "-v 244,raw48,Thermal_Throttle "

+     "-v 249,raw48,TLC_NAND_GB_Writes"

    },

    { "SanDisk based SSDs", // see also #463 for the vendor attribute description

      "SanDisk iSSD P4 [0-9]*GB|" // tested with SanDisk iSSD P4 16GB/SSD 9.14
@@ -1480,6 +1630,7 @@ 

      "SanDisk SSD i100 [0-9]*GB|" // tested with SanDisk SSD i100 8GB/11.56.04, 24GB/11.56.04

      "SanDisk SSD U100 ([0-9]*GB|SMG2)|" // tested with SanDisk SSD U100 8GB/10.56.00, 256GB/10.01.02, SMG2/10.56.04

      "SanDisk SSD U110 (8|16|24|32|64|128)GB|" // tested with SanDisk SSD U110 32GB/U221000

+     "SanDisk SDSA6MM-.*|" // tested with SanDisk SDSA6MM-016G-1006/U221006

      "SanDisk SD7[SU]B[23]Q(064|128|256|512)G.*", // tested with SD7SB3Q064G1122/SD7UB3Q256G1122/SD7SB3Q128G/SD7UB2Q512G1122

      "", "",

    //"-v 5,raw16(raw16),Reallocated_Sector_Ct "
@@ -1568,6 +1719,7 @@ 

      "TS(120|240|480|960)GSSD220S|" // TS480GSSD220S/P0520AA

      "TS(16G|32G|64G|128G|256G|512G|1T)MTS800S?|" // MTS800, tested with TS1TMTS800/O1225H1

      "TS(16|32|64)GMSA630|" // MSA630 mSATA SSD, tested with TS32GMSA630/N0113E1

+     "TS(32|64|128)GPSD330|" // Transcend PSD SSD, tested with TS64GPSD330/20140121

      "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
@@ -2006,9 +2158,14 @@ 

      "Buggy and fixed firmware report same version number!\n"

      "See the following web pages for details:\n"

      "http://knowledge.seagate.com/articles/en_US/FAQ/223571en\n"

-     "http://www.smartmontools.org/wiki/SamsungF4EGBadBlocks",

+     "https://www.smartmontools.org/wiki/SamsungF4EGBadBlocks",

      ""

    },

+   { "Seagate Samsung SpinPoint F4 EG (AF)", // later sold as Barracuda Green,

+        // tested with ST2000DL004 HD204UI/1AQ10001

+     "ST2000DL004 HD204UI",

+     "", "", ""

+   },

    { "SAMSUNG SpinPoint S250", // tested with HD200HJ/KF100-06

      "SAMSUNG HD(162|200|250)HJ",

      "", "", ""
@@ -2768,7 +2925,8 @@ 

    },

    { "HGST Deskstar NAS", // tested with HGST HDN724040ALE640/MJAOA5E0,

         // HGST HDN726050ALE610/APGNT517, HGST HDN726060ALE610/APGNT517

-     "HGST HDN72(4030|4040|6050|6060)ALE6[14]0",

+        // HGST HDN726040ALE614/APGNW7JH, HGST HDN726060ALE614/K1HE594D

+     "HGST HDN72(4030|4040|6040|6050|6060)ALE6(10|14|40|04)",

      "", "", ""

    },

    { "Hitachi Ultrastar A7K1000", // tested with
@@ -2815,6 +2973,11 @@ 

      "", "",

      "-v 22,raw48,Helium_Level"

    },

+   { "HGST Ultrastar DC HC520 (He12)", // tested with HGST HUH721212ALE600/LEGNT3D0

+     "HGST HUH721212AL[EN]60[014]",

+     "", "",

+     "-v 22,raw48,Helium_Level"

+   },

    { "HGST MegaScale 4000", // tested with HGST HMS5C4040ALE640/MPAOA580

      "HGST HMS5C4040[AB]LE64[01]", // B = DC 4000.B

      "", "", ""
@@ -2987,6 +3150,14 @@ 

      "TOSHIBA MK6022GAX",

      "", "", ""

    },

+   { "Toshiba HK4R Series SSD", // TOSHIBA THNSN8960PCSE/8EET6101

+     "TOSHIBA THNSN8(120P|240P|480P|960P|1Q92)CSE",

+     "", "", 

+     "-v 167,raw48,SSD_Protect_Mode "

+     "-v 168,raw48,SATA_PHY_Error_Count "

+     "-v 169,raw48,Bad_Block_Count "

+     "-v 173,raw48,Erase_Count "

+   },

    { "Toshiba HG6 Series SSD", // TOSHIBA THNSNJ512GCST/JTRA0102

      // http://www.farnell.com/datasheets/1852757.pdf

      // TOSHIBA THNSFJ256GCSU/JULA1102
@@ -3040,7 +3211,8 @@ 

    },

    { "Seagate Momentus 5400.6",

      "ST9(80313|160(301|314)|(12|25)0315|250317|(320|500)325|500327|640320)ASG?",

-     "", "", ""

+     "", "",

+     "-F xerrorlba" // ST9500325AS/0002SDM1 (ticket #1094)

    },

    { "Seagate Momentus 5400.7",

      "ST9(160316|(250|320)310|(500|640)320)AS",
@@ -3091,8 +3263,7 @@ 

      "AND THIS FIRMWARE VERSION IS AFFECTED,\n"

      "see the following web pages for details:\n"

      "http://knowledge.seagate.com/articles/en_US/FAQ/215451en\n"

-     "http://forums.seagate.com/t5/Momentus-XT-Momentus-Momentus/Momentus-XT-corrupting-large-files-Linux/td-p/109008\n"

-     "http://superuser.com/questions/313447/seagate-momentus-xt-corrupting-files-linux-and-mac",

+     "https://superuser.com/questions/313447/seagate-momentus-xt-corrupting-files-linux-and-mac",

      ""

    },

    { "Seagate Momentus XT", // unknown firmware
@@ -3101,8 +3272,7 @@ 

      "These drives may corrupt large files,\n"

      "see the following web pages for details:\n"

      "http://knowledge.seagate.com/articles/en_US/FAQ/215451en\n"

-     "http://forums.seagate.com/t5/Momentus-XT-Momentus-Momentus/Momentus-XT-corrupting-large-files-Linux/td-p/109008\n"

-     "http://superuser.com/questions/313447/seagate-momentus-xt-corrupting-files-linux-and-mac",

+     "https://superuser.com/questions/313447/seagate-momentus-xt-corrupting-files-linux-and-mac",

      ""

    },

    { "Seagate Momentus XT (AF)", // tested with ST750LX003-1AC154/SM12
@@ -3115,7 +3285,7 @@ 

    },

    { "Seagate Laptop HDD", // tested with ST500LT012-9WS142/0001SDM1,

        // ST500LM021-1KJ152/0002LIM1, ST4000LM016-1N2170/0003

-     "ST((25|32|50)0LT0(12|15|25)|(32|50)0LM0(10|21)|[34]00LM016)-.*",

+     "ST((25|32|50)0LT0(12|15|25)|(32|50)0LM0(10|21)|[34]000LM016)-.*",

      "", "", ""

    },

    { "Seagate Laptop SSHD", // tested with ST500LM000-1EJ162/SM11
@@ -3225,7 +3395,7 @@ 

      "see the following web pages for details:\n"

      "http://knowledge.seagate.com/articles/en_US/FAQ/207931en\n"

      "http://knowledge.seagate.com/articles/en_US/FAQ/207951en\n"

-     "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632758",

+     "https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632758",

      ""

    },

    { "Seagate Barracuda 7200.11", // unknown firmware
@@ -3307,6 +3477,17 @@ 

      "", "",

      "-v 188,raw16 -v 240,msec24hour32"

    },

+   // ST8000DM004, ST6000DM003, ST4000DM004, ST3000DM007, ST2000DM005

+   { "Seagate Barracuda Compute", // tested on ST8000DM004-2CX188/0001

+     "ST(8000DM004|6000DM003|4000DM004|3000DM007|2000DM005)-.*",

+     "", "",

+     ""

+   },

+   { "Seagate Barracuda Pro", // tested on ST8000DM004-2CX188/0001

+     "ST(8000DM005|6000DM004|4000DM006|2000DM009)-.*",

+     "", "",

+     "-v 188,raw16 -v 240,msec24hour32"

+   },

    { "Seagate Barracuda 7200.14 (AF)", // < 1TB, tested with ST250DM000-1BC141

      "ST(250|320|500|750)DM00[0-3]-.*",

      "", "",
@@ -3367,7 +3548,7 @@ 

      "ST3(25031|50032|75033|100034)0NS",

      "SN[01]6|"         // http://knowledge.seagate.com/articles/en_US/FAQ/207963en

      "MA(0[^7]|[^0].)", // http://dellfirmware.seagate.com/dell_firmware/DellFirmwareRequest.jsp

-     "",

+     "",                //        ^^^^^^^^^^^^ down (no DNS A record)

      "-F xerrorlba" // tested with ST31000340NS/SN06

    },

    { "Seagate Barracuda ES.2", // buggy firmware (Dell)
@@ -3375,8 +3556,7 @@ 

      "MA07",

      "There are known problems with these drives,\n"

      "AND THIS FIRMWARE VERSION IS AFFECTED,\n"

-     "see the following Seagate web page:\n"

-     "http://dellfirmware.seagate.com/dell_firmware/DellFirmwareRequest.jsp",

+     "contact Dell support for a firmware update.",

      ""

    },

    { "Seagate Barracuda ES.2", // unknown firmware
@@ -3435,10 +3615,22 @@ 

        // ST8000NM0045-1RL112/NN02

        // ST6000NM0004-1FT17Z/NN01

        // ST4000NM0035-1V4107/TNC3

-     "ST([24568]|10)000NM0[01][0-48][456]-.*", // *[069]4 = 4Kn

+       // ST1000NM0055-1V410C/TN02

+       // ST8000NM0055-1RM112/SN04

+     "ST([1234568]|10)000NM0[01][0-68][456]-.*", // *[069]4 = 4Kn

      "", "", 

      "-v 188,raw16 -v 240,msec24hour32"

    },

+   { "Seagate Enterprise Capacity 3.5 HDD", // V5.1, ms in attribute 9

+     "ST[12]000NM0008-.*", // tested with ST1000NM0008-2F2100/SN01

+     "", "",

+     "-v 9,msec24hour32 -v 188,raw16 -v 240,msec24hour32"

+   },

+   { "Seagate Exos X12 HDD", // tested with ST12000NM0007-2A1101/SN02

+     "ST12000NM00[01]7-.*", // *17 = SED

+     "", "",

+     "-v 240,msec24hour32"

+   },

    // new models: ST8000VN0002, ST6000VN0021, ST4000VN000

    //             ST8000VN0012, ST6000VN0031, ST4000VN003

    // tested with ST8000VN0002-1Z8112/ZA13YGNF
@@ -3446,10 +3638,19 @@ 

      "ST([234]000VN000|[468]000VN00(02|21|12|31|3))-.*",

      "", "", ""

    },

+   // ST8000NE0001, ST8000NE0011, ST6000VN0001, ST6000VN0011, ST5000VN0001,

+   // ST5000VN0011, ST4000VN0001, ST4000VN0011, ST3000VN0001, ST3000VN0011,

+   // ST2000VN0001, ST2000VN0011

+   // tested with ST8000NE0001-1WN112/PNA2

+   { "Seagate Enterprise NAS HDD",

+     "ST(8000NE|[65432]000VN)00[01]1-.*",

+     "", "", ""

+   },

    // ST10000VN0004, ST8000VN0022, ST6000VN0041, ST4000VN008, ST3000VN007,

    // ST2000VN004, ST1000VN002

-   { "Seagate IronWolf", // tested with ST6000VN0041-2EL11C/SC61

-     "ST(10|8|6|4|3|2|1)000VN00(04|22|41|8|7|2|4)-.*",

+   { "Seagate IronWolf", // tested with ST6000VN0041-2EL11C/SC61,

+       // ST12000VN0007-2GS116/SC60

+     "ST(12|10|8|6|4|3|2|1)000VN00(04|07|22|41|8|7|2|4)-.*",

      "", "", ""

    },  

    { "Seagate Archive HDD", // tested with ST8000AS0002-1NA17Z/AR13
@@ -3520,6 +3721,21 @@ 

      "ST6[468]022CF",

      "", "", ""

    },

+   { "Seagate Nytro XF1230 SATA SSD", // tested with XF1230-1A0480/ST200354

+     "XF1230-1A(0240|0480|0960|1920)",

+     "", "", 

+     "-v 174,raw48,Unexpect_Power_Loss_Ct "

+     "-v 180,raw48,End_to_End_Err_Detect "

+     "-v 183,raw48,SATA_Downshift_Count "

+     "-v 189,raw48,SSD_Health_Flags "

+     "-v 190,raw48,SATA_Error_Ct "

+     "-v 201,raw48,Read_Error_Rate "

+     "-v 231,raw48,SSD_Life_Left_Perc "

+     "-v 234,raw48,Lifetime_Nand_Gb "

+     "-v 241,raw48,Total_Writes_GiB "

+     "-v 242,raw48,Total_Reads_GiB "

+     "-v 245,raw48,Read_Error_Rate "

+   },

    { "WD Blue PC SSD", // tested with WDC WDS100T1B0A-00H9H0

      "WDC WDS...[TG]1B0[AB].*",

      "", "",
@@ -3683,12 +3899,15 @@ 

        // WDC WD2000FYYZ-01UL1B0/01.01K01, WDC WD2000FYYZ-01UL1B1/01.01K02,

        // WDC WD4000FYYZ-01UL1B2/01.01K03, WD2000FYYX/00.0D1K2,

        // WDC WD1004FBYZ-01YCBB1/RR04

-     "WDC WD([12]004FBYZ|[1-6]00[01M]F[SXY]YZ)-.*|WD2000FYYX",

+       // WD4000FYYZ, WD4000FDYZ, WD3000FYYZ, WD3000FDYZ, WD2000FYYZ, WD2000FDYZ

+       // WD2004FBYZ, WD1004FBYZ

+     "WDC WD((1004|2004)FBYZ|([234]000)FDYZ|[234]000FYYZ|2000FYYX)-.*",

      "", "",

      "-v 16,raw48,Total_LBAs_Read" // WDC WD1004FBYZ-01YCBB1/RR04

    },

    { "Western Digital Se", // tested with WDC WD2000F9YZ-09N20L0/01.01A01

-     "WDC WD(1002|2000|3000|4000)F9YZ-.*",

+     // WD6001F9YZ, WD5001F9YZ, WD4000F9YZ, WD3000F9YZ, WD2000F9YZ, WD1002F9YZ

+     "WDC WD(1002|2000|3000|4000|5001|6001)F9YZ-.*",

      "", "", ""

    },

    { "Western Digital Caviar Green", // tested with WDC WD7500AADS-00M2B0/01.00A01,
@@ -3761,7 +3980,7 @@ 

      "", "", ""

    },

    { "Western Digital VelociRaptor (AF)", // tested with WDC WD1000DHTZ-04N21V0/04.06A00

-     "WDC WD(2500H|5000H|1000D)HTZ-.*",

+     "WDC WD(2500H|5000B|5000H|1000D)HTZ-.*",

      "", "", ""

    },

    { "Western Digital Scorpio EIDE",
@@ -3797,7 +4016,8 @@ 

        // WDC WD10JFCX-68N6GN0/01.01A01, WDC WD40EFRX-68WT0N0/80.00A80,

        // WDC WD60EFRX-68MYMN1/82.00A82, WDC WD80EFAX-68LHPN0/83.H0A83,

        // WDC WD80EFZX-68UW8N0/83.H0A83

-     "WDC WD(7500BFC|10JFC|[1-6]0EFR|80EF[AZ])X-.*",

+       // WDC WD80EZZX-11CSGA0/83.H0A03 (My Book 0x1058:0x25ee)

+     "WDC WD(7500BFC|10JFC|[1-6]0EFR|80E[FZ][AZ])X-.*",

      "", "",

      "-v 22,raw48,Helium_Level" // WD80EFZX

    },
@@ -3983,48 +4203,15 @@ 

      "-d sat"

    },

    // Toshiba

-   { "USB: Toshiba Stor.E Slim USB 3.0; ", // TOSHIBA MQ01UBD100

-     "0x0480:0x0100",

-     "", // 0x0000

-     "",

-     "-d sat"

-   },

-   { "USB: Toshiba Canvio; ", // 0x0210: TOSHIBA MQ03UBB300

-     "0x0480:0x02(01|10)",

-     "",

-     "",

-     "-d sat"

-   },

    { "USB: Toshiba Canvio 500GB; SunPlus",

      "0x0480:0xa004",

      "",

      "",

      "-d usbsunplus"

    },

-   { "USB: Toshiba Canvio Basics; ",

-     "0x0480:0xa00[6d]",

-     "", // 0x0001, 0x0407

-     "",

-     "-d sat"

-   },

-   { "USB: Toshiba Stor.E; ",

-     "0x0480:0xa00[9ace]",

-     "", // 0x0000 (0xa00e)

-     "",

-     "-d sat"

-   },

-   { "USB: Toshiba Canvio; ",

-     "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)

+   { "USB: Toshiba; ",

+     "0x0480:0x....",

      "",

-     "-d sat"

-   },

-   { "USB: Toshiba Canvio Desktop; ",

-     "0x0480:0xd0(00|10|11)",

-     "", // 0x0316 (0xd011)

      "",

      "-d sat"

    },
@@ -4128,6 +4315,12 @@ 

      "",

      "-d sat"

    },

+   { "USB: Samsung Portable SSD T5; ",

+     "0x04e8:0x61f5",

+     "", // 0x0100

+     "",

+     "-d sat"

+   },

    // Sunplus

    { "USB: ; SunPlus",

      "0x04fc:0x0c05",
@@ -4160,6 +4353,12 @@ 

      "",

      "-d usbcypress"

    },

+   { "USB: Iomega MDHD500-U; JMicron",

+     "0x059b:0x0274",

+     "", // 0x0000

+     "",

+     "-d usbjmicron,0"

+   },

    { "USB: Iomega MDHD500-U; ",

      "0x059b:0x0275",

      "", // 0x0001
@@ -4374,6 +4573,12 @@ 

      "",

      "-d sat"

    },

+   { "USB: Freecom; ",

+     "0x07ab:0xfc17",

+     "", // 0x0100

+     "",

+     "-d sat"

+   },

    { "USB: Freecom Quattro 3.0; ", // USB3.0+IEEE1394+eSATA->SATA

      "0x07ab:0xfc77",

      "",
@@ -4482,135 +4687,14 @@ 

      "",

      "-d usbcypress"

    },

-   { "USB: Seagate FreeAgent Go; ",

-     "0x0bc2:0x2(000|100|101)",

-     "",

-     "",

-     "-d sat"

-   },

-   { "USB: Seagate FreeAgent Go FW; ",

-     "0x0bc2:0x2200",

-     "",

-     "",

-     "-d sat"

-   },

-   { "USB: Seagate Expansion Portable; ",

-     "0x0bc2:0x23(00|12|1a|20|21|22)",

-     "", // 12=0x0219, 1a=0x0707, 22=0x0000

-     "",

-     "-d sat"

-   },

-   { "USB: Seagate FreeAgent Desktop; ",

-     "0x0bc2:0x3000",

-     "",

-     "",

-     "-d sat"

-   },

-   { "USB: Seagate FreeAgent Desk; ",

-     "0x0bc2:0x3001",

-     "",

-     "",

-     "-d sat"

-   },

-   { "USB: Seagate FreeAgent Desk; ", // 1TB

-     "0x0bc2:0x3008",

-     "",

-     "",

-     "-d sat,12"

-   },

-   { "USB: Seagate FreeAgent XTreme; ",

-     "0x0bc2:0x3101",

-     "",

-     "",

-     "-d sat"

-   },

-   { "USB: Seagate Expansion Desktop; ",

-     "0x0bc2:0x33(00|1[2a]|2[012]|3[02])", // 1a=5TB, 21=4TB

-     "", // 1a=0x0909

-     "",

-     "-d sat"

-   },

-   { "USB: Seagate FreeAgent GoFlex USB 2.0; ",

-     "0x0bc2:0x502[01]",

-     "",

-     "",

-     "-d sat"

-   },

-   { "USB: Seagate FreeAgent GoFlex USB 3.0; ",

-     "0x0bc2:0x5030",

-     "", // 0x0100

-     "",

-     "-d sat"

-   },

-   { "USB: Seagate FreeAgent GoFlex USB 3.0; ",

-     "0x0bc2:0x5031",

-     "",

-     "",

-     "-d sat,12"

-   },

    { "USB: Seagate FreeAgent; ",

-     "0x0bc2:0x5040",

-     "",

-     "",

-     "-d sat"

-   },

-   { "USB: Seagate FreeAgent GoFlex USB 3.0; ", // 2TB

-     "0x0bc2:0x507[01]",

-     "",

-     "",

-     "-d sat"

-   },

-   { "USB: Seagate FreeAgent GoFlex Desk USB 3.0; ", // 3TB

-     "0x0bc2:0x50a1",

+     "0x0bc2:0x(3008|50(31|a1))",

      "",

      "",

-     "-d sat,12" // "-d sat" does not work (ticket #151)

-   },

-   { "USB: Seagate FreeAgent GoFlex Desk USB 3.0; ", // 2TB, 4TB

-     "0x0bc2:0x50a[57]",

-     "", // 0x0100

-     "",

-     "-d sat"

+     "-d sat,12" // 0x50a1: "-d sat" does not work (ticket #151)

    },

-   { "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[136]",

-     "",

-     "",

-     "-d sat"

-   },

-   { "USB: Maxtor M3 Portable; ",

-     "0x0bc2:0x61b7", // Maxtor M3 Portable 4TB (0x0000)

-     "",

-     "",

-     "-d sat"

-   },

-   { "USB: Seagate Backup Plus USB 3.0; ", // 1TB

-     "0x0bc2:0xa0[01]3",

-     "", // 0x0100

-     "",

-     "-d sat"

-   },

-   { "USB: Seagate Backup Plus Desktop USB 3.0; ",

-     "0x0bc2:0xa(0a[14]|b3[14])", // 4TB, 3TB (8 LBA/1 PBA offset), 5TB, ?

-     "",

-     "",

-     "-d sat"

-   },

-   { "USB: Seagate Slim Portable Drive; ", // SRD00F1

-     "0x0bc2:0xab00",

-     "",

-     "",

-     "-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(1e|2[01458]|38)",

+   { "USB: Seagate; ",

+     "0x0bc2:0x....",

      "",

      "",

      "-d sat"
@@ -4719,28 +4803,9 @@ 

      "",

      "-d usbcypress"

    },

-   { "USB: WD Elements Desktop; ",

-     "0x1058:0x10(01|03|21|7c)",

-     "", // 01=0x0104, 03=0x0175, 21=0x2002, 7c=0x1065

+   { "USB: Western Digital; ",

+     "0x1058:0x....",

      "",

-     "-d sat"

-   },

-   { "USB: WD Elements / My Passport; ", // 2.5" with integrated USB

-     "0x1058:0x(07(0[245a]|1a|30|4[0128a]|a[8e])|"

-               "08(1[06]|2[02]|3[37a])|"

-               "10(10|23|4[28]|7d|a[28]|b8)|"

-               "25(9[9df]|a[12]|e2|fa))",

-     "", // 0x0822=0x1007, 37=0x1072

-         // 0x1010=0x0105, 7d=0x1073, a8=0x1042, b8=0x1007

-         // 0x2599=0x1012, 9d/a1=0x1005, 9f/a2=0x1004

-     "",

-     "-d sat"

-   },

-   { "USB: WD My Book / Easystore; ", // 3.5"

-     "0x1058:0x(09(0[06]|10)|11(0[01245]|1[0d]|30|40)|1230|25(a3|fb))",

-     "", // 0x0906=0x0012, 10=0x0106

-         // 0x1100/01=0x0165, 02=0x1028, 10=0x1030, 1d=0x1020, 30=0x1012, 40=0x1003

-         // 0x1230=0x1065, 0x25a3=0x1013, 0x25fb=0x3004

      "",

      "-d sat"

    },
@@ -4765,66 +4830,24 @@ 

      "-d usbcypress"

    },

    // Initio

-   { "USB: ; Initio 316000",

-     "0x13fd:0x0540",

-     "",

-     "",

-     "" // unsupported

-   },

-   { "USB: ; Initio", // Thermaltake BlacX

-     "0x13fd:0x0840",

-     "",

-     "",

-     "-d sat"

-   },

-   { "USB: ; Initio", // USB->SATA+PATA, Chieftec CEB-25I

-     "0x13fd:0x1040",

-     "", // 0x0106

-     "",

-     "" // unsupported

-   },

-   { "USB: ; Initio 6Y120L0", // CoolerMaster XCraft RX-3HU

-     "0x13fd:0x1150",

-     "",

-     "",

+   { "USB: ; Initio",

+     "0x13fd:0x(054|1(04|15))0", // 0x0540: Initio 316000

+     "", // 0x1040 (0x0106): USB->SATA+PATA, Chieftec CEB-25I

+     "", // 0x1150: Initio 6Y120L0, CoolerMaster XCraft RX-3HU

      "" // unsupported

    },

-   { "USB: ; Initio", // USB->SATA

-     "0x13fd:0x1240",

-     "", // 0x0104

-     "",

-     "-d sat"

-   },

-   { "USB: ; Initio", // USB+SATA->SATA

-     "0x13fd:0x1340",

-     "", // 0x0208

-     "",

-     "-d sat"

-   },

    { "USB: ; Initio",

      "0x13fd:0x16[45]0",

      "", // 0x1640: 0x0864, 0x1650: 0x0436

      "",

      "-d sat,12" // some SMART commands fail, see ticket #295

    },

-   { "USB: Intenso Memory Station 2,5\"; Initio",

-     "0x13fd:0x1840",

-     "",

-     "",

-     "-d sat"

-   },

-   { "USB: ; Initio", // NexStar CX USB enclosure

-     "0x13fd:0x1e40",

+   { "USB: ; Initio",

+     "0x13fd:0x....",

      "",

      "",

      "-d sat"

    },

-   { "USB: ; Initio",

-     "0x13fd:0x39[124]0", // 0x3910: Seagate Expansion Portable SRD00F1 (0x0100)

-     "", // 0x3920: ezDISK EZ370 (0x0205)

-     "", // 0x3940: MS-TECH LU-275S (0x0306)

-     "-d sat"

-   },

    // Super Top

    { "USB: Super Top generic enclosure; ",

      "0x14cd:0x6116",
@@ -4842,9 +4865,9 @@ 

    { "USB: ; JMicron JMS539", // USB2/3->SATA (new firmware)

      "0x152d:0x0539",

      "0x020[56]|"   //  2.05, ZTC USB 3.0 enclosure (ticket #338)

-     "0x28(03|12)", // 28.03, Mediasonic ProBox HF2-SU3S2 Rev 2 (port multiplier, ticket #504)

-     "",            // 28.12, Mediasonic ProBox H82-SU3S2 (port multiplier)

-     "-d sat"

+     "0x28(01|03|12)", // 28.01, DATOptic U3eSATA (USB3.0 bridge with port multiplier)

+     "",               // 28.03, Mediasonic ProBox HF2-SU3S2 Rev 2 (port multiplier, ticket #504)

+     "-d sat"          // 28.12, Mediasonic ProBox H82-SU3S2 (port multiplier)

    },

    { "USB: ; JMicron ", // USB->SATA->4xSATA (port multiplier)

      "0x152d:0x0551",   // JMS539? (old firmware may use 0x152d:0x0539, ticket #552)
@@ -4852,6 +4875,18 @@ 

      "",

      "-d usbjmicron,x"

    },

+   { "USB: ; JMicron",

+     "0x152d:0x0561",

+     "", // 0x0003, ODROID CloudShell 2

+     "",

+     "-d sat"

+   },

+   { "USB: ; JMicron JM562", // USB2/3+eSATA->2xSATA, USB2/3->3xSATA (RAID0/1)

+     "0x152d:0x0562",

+     "", // 0x0106, Fantec QB-X2US3R (ticket #966)

+     "", // only ATA IDENTIFY works, SMART commands don't work

+     "-d sat"

+   },

    { "USB: ; JMicron", // USB2/3->2xSATA

      "0x152d:0x0565",

      "", // 0x9114, Akasa DuoDock X (ticket #607)
@@ -4942,6 +4977,12 @@ 

      "",

      "-d usbjmicron,x"

    },

+   { "USB: ; JMicron JMS567", // USB3->SATA

+     "0x152d:0x2567",

+     "", // 0x0117, Chieftec CEB-7053S

+     "",

+     "-d sat"

+   },

    { "USB: ; JMicron",

      "0x152d:0x2590",

      "", // 0x0x8105 (ticket #550)
@@ -4960,6 +5001,12 @@ 

      "",

      "-d sat"

    },

+   { "USB: ; JMicron",

+     "0x152d:0x578e",

+     "", // 0x1402, Intenso Memory Center

+     "",

+     "-d sat"

+   },

    { "USB: ; JMicron JMS561U", // USB3->2xSATA

      "0x152d:0x8561",

      "", // 0x0107
@@ -4967,38 +5014,12 @@ 

      "-d sat"

    },

    // ASMedia

-   { "USB: ; ASMedia ASM1053/1153/1351",

-     "0x174c:0x1([01]53|351)",

-     "",

-     "",

-     "-d sat"

-   },

-   { "USB: ; ASMedia ASM1051",

-     "0x174c:0x5106", // 0x174c:0x55aa after firmware update

+   { "USB: ; ASMedia",

+     "0x174c:0x....",

      "",

      "",

      "-d sat"

    },

-   { "USB: ; ASMedia AS2105", // Icy Box IB-AC603A-U3

-     "0x174c:0x5136",

-     "", // 0x0001

-     "",

-     "-d sat"

-   },

-   { "USB: ; ASMedia", // Vantec NexStar USB 3.0 & SATA dual drive dock

-     "0x174c:0x5516",

-     "",

-     "",

-     "-d sat"

-   },

-   { "USB: ; ASMedia", // MEDION HDDrive-n-GO, LaCie Rikiki USB 3.0,

-       // Silicon Power Armor A80 (ticket #237)

-       // reported as unsupported: BYTECC T-200U3, Kingwin USB 3.0 docking station

-     "0x174c:0x55aa",

-     "", // 0x0100

-     "",

-     "-d sat"

-   },

    // LucidPort

    { "USB: ; LucidPORT USB300", // RaidSonic ICY BOX IB-110StU3-B, Sharkoon SATA QuickPort H3

      "0x1759:0x500[02]", // 0x5000: USB 2.0, 0x5002: USB 3.0
@@ -5121,6 +5142,12 @@ 

      "", // 0x0507, Intenso 2,5" Memory Case 2TB USB3

      "-d sat"

    },

+   { "USB: ; VIA VL715", // USB2/3->SATA

+     "0x2109:0x0715",

+     "", // 0x0336

+     "",

+     "-d sat"

+   },

    // 0x2537 (?)

    { "USB: ; ", // USB 3.0

      "0x2537:0x106[68]", // 0x1066: Orico 2599US3, 0x1068: Fantec ER-35U3

file modified
-7
@@ -1,11 +1,5 @@ 

  #! /bin/sh

  

- # Send mail

- if which mail >/dev/null 2>&1

- then

-   echo "$SMARTD_MESSAGE" | mail -s "$SMARTD_FAILTYPE" "$SMARTD_ADDRESS"

- fi

- 

  # Notify desktop user

  MESSAGE="SMART Disk monitor:"

  case "$SMARTD_FAILTYPE" in
@@ -30,4 +24,3 @@ 

    echo "$MESSAGE

  $SMARTD_MESSAGE" >/dev/$t 2>/dev/null ||:

  done

- 

@@ -1,13 +0,0 @@ 

- diff -up smartmontools-5.38/scsiprint.cpp.perc smartmontools-5.38/scsiprint.cpp

- --- smartmontools-5.38/scsiprint.cpp.perc	2008-03-04 23:09:47.000000000 +0100

- +++ smartmontools-5.38/scsiprint.cpp	2008-03-27 11:28:20.000000000 +0100

- @@ -1037,6 +1037,9 @@ static int scsiGetDriveInfo(int device, 

-  	       (0 == strncmp((const char *)(gBuf + 36), "MVSATA", 6))) {

-          pout("please try '-d marvell'\n");

-          return 2;

- +    } else if  (0 == strncmp(product, "PERC", 4)) {

- +        pout("\nDELL PERC controllers are not supported.\n");

- +        return 2;

-      } else if ((0 == con->controller_explicit) &&

-  	       (0 == strncmp(manufacturer, "ATA     ", 8)) &&

-                 has_sat_pass_through(device, 0)) {

@@ -1,160 +0,0 @@ 

- diff -up sm5.mine/configure.in.selinux sm5.mine/configure.in

- --- sm5.mine/configure.in.selinux	2008-04-01 09:01:02.000000000 +0200

- +++ sm5.mine/configure.in	2008-03-28 11:06:05.000000000 +0100

- @@ -136,6 +136,16 @@ AC_ARG_ENABLE(sample,[AC_HELP_STRING([--

-  AC_SUBST(smartd_suffix)

-  AM_CONDITIONAL(SMARTD_SUFFIX, test $smartd_suffix)

-  

- +AC_ARG_WITH(selinux,[AC_HELP_STRING([--with-selinux],[Enables SELinux support])],

- +	[

- +		AC_CHECK_HEADERS([selinux/selinux.h], [], [echo "*** Error: Missing SELinux header files";exit 1])

- +		AC_CHECK_LIB(selinux, matchpathcon, [with_selinux=yes], [echo "*** Error: Missing or incorrect SELinux library files"; exit 1],)

- +	],[])

- +AC_SUBST(with_selinux)

- +if test "$with_selinux" = "yes"; then

- +	AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])

- +fi

- +

-  if test "$prefix" = "NONE"; then

-      dnl no prefix and no mandir, so use ${prefix}/share/man as default

-      if test "$mandir" = '${prefix}/man'; then

- @@ -151,7 +161,11 @@ dnl if OS not recognized, then use the o

-  case "${host}" in

-  	*-*-linux*)

-  		AC_SUBST([os_deps], ['os_linux.o cciss.o']) 

- -		AC_SUBST([os_libs], ['']) ;;

- +		if test "$with_selinux" = "yes"; then

- +			AC_SUBST([os_libs], ['-lselinux'])

- +		else

- +			AC_SUBST([os_libs], [''])

- +		fi;;

-  	*-*-freebsd*|*-*-dragonfly*|*-*-kfreebsd*-gnu*)

-  		AC_SUBST([os_deps], ['os_freebsd.o cciss.o']) 

-  		AC_SUBST([os_libs], ['-lcam']);;

- diff -up sm5.mine/os_linux.cpp.selinux sm5.mine/os_linux.cpp

- --- sm5.mine/os_linux.cpp.selinux	2008-04-01 09:01:14.000000000 +0200

- +++ sm5.mine/os_linux.cpp	2008-04-01 12:28:04.000000000 +0200

- @@ -60,6 +60,9 @@

-  #ifndef makedev // old versions of types.h do not include sysmacros.h

-  #include <sys/sysmacros.h>

-  #endif

- +#ifdef WITH_SELINUX

- +#include <selinux/selinux.h>

- +#endif

-  

-  #include "int64.h"

-  #include "atacmds.h"

- @@ -105,6 +108,14 @@ int setup_3ware_nodes(const char *nodena

-    char             nodestring[NODE_STRING_LENGTH];

-    struct stat      stat_buf;

-    FILE             *file;

- +  int              retval = 0;

- +#ifdef WITH_SELINUX

- +  security_context_t orig_context = NULL;

- +  security_context_t node_context = NULL;

- +  int                selinux_enabled  = is_selinux_enabled();

- +  int                selinux_enforced = security_getenforce();

- +#endif

- +

-  

-    /* First try to open up /proc/devices */

-    if (!(file = fopen("/proc/devices", "r"))) {

- @@ -129,18 +140,50 @@ int setup_3ware_nodes(const char *nodena

-      pout("No major number for /dev/%s listed in /proc/devices. Is the %s driver loaded?\n", nodename, driver_name);

-      return 2;

-    }

- -

- +#ifdef WITH_SELINUX

- +  /* Prepare a database of contexts for files in /dev

- +   * and save the current context */

- +  if (selinux_enabled) {

- +    if (matchpathcon_init_prefix(NULL, "/dev") < 0)

- +      pout("Error initializing contexts database for /dev");

- +    if (getfscreatecon(&orig_context) < 0) {

- +      pout("Error retrieving original SELinux fscreate context");

- +      if (selinux_enforced)

- +        matchpathcon_fini();

- +        return 6;

- +      }

- +  }

- +#endif

-    /* Now check if nodes are correct */

-    for (index=0; index<16; index++) {

-      sprintf(nodestring, "/dev/%s%d", nodename, index);

- -

- +#ifdef WITH_SELINUX

- +    /* Get context of the node and set it as the default */

- +    if (selinux_enabled) {

- +      if (matchpathcon(nodestring, S_IRUSR | S_IWUSR, &node_context) < 0) {

- +        pout("Could not retreive context for %s", nodestring);

- +        if (selinux_enforced) {

- +          retval = 6;

- +          break;

- +        }

- +      }

- +      if (setfscreatecon(node_context) < 0) {

- +        pout ("Error setting default fscreate context");

- +        if (selinux_enforced) {

- +          retval = 6;

- +          break;

- +        }

- +      }

- +    }

- +#endif

-      /* Try to stat the node */

-      if ((stat(nodestring, &stat_buf))) {

-        /* Create a new node if it doesn't exist */

-        if (mknod(nodestring, S_IFCHR|0600, makedev(tw_major, index))) {

-          pout("problem creating 3ware device nodes %s", nodestring);

-          syserror("mknod");

- -        return 3;

- +        retval = 3;

- +        break;

-        }

-      }

-  

- @@ -153,18 +196,41 @@ int setup_3ware_nodes(const char *nodena

-        if (unlink(nodestring)) {

-          pout("problem unlinking stale 3ware device node %s", nodestring);

-          syserror("unlink");

- -        return 4;

- +        retval = 4;

- +        break;

-        }

-  

-        /* Make a new node */

-        if (mknod(nodestring, S_IFCHR|0600, makedev(tw_major, index))) {

-          pout("problem creating 3ware device nodes %s", nodestring);

-          syserror("mknod");

- -        return 5;

- +        retval = 5;

- +        break;

-        }

-      }

- +#ifdef WITH_SELINUX

- +    if (selinux_enabled && node_context) {

- +      freecon(node_context);

- +      node_context = NULL;

- +    }

- +#endif

-    }

- -  return 0;

- +

- +#ifdef WITH_SELINUX

- +  if (selinux_enabled) {

- +    if(setfscreatecon(orig_context) < 0) {

- +      pout("Error re-setting original fscreate context");

- +      if (selinux_enforced)

- +        retval = 6;

- +    }

- +    if(orig_context)

- +      freecon(orig_context);

- +    if(node_context)

- +      freecon(node_context);

- +    matchpathcon_fini();

- +  }

- +#endif

- +  return retval;

-  }

-  

-  static char prev_scsi_dev[128];

@@ -1,956 +0,0 @@ 

- diff -up smartmontools-6.2/drivedb.h.newdrivedb smartmontools-6.2/drivedb.h

- --- smartmontools-6.2/drivedb.h.newdrivedb	2013-07-25 23:29:08.000000000 +0200

- +++ smartmontools-6.2/drivedb.h	2014-07-17 10:13:06.041488876 +0200

- @@ -4,7 +4,7 @@

-   * Home page of code is: http://smartmontools.sourceforge.net

-   *

-   * Copyright (C) 2003-11 Philip Williams, Bruce Allen

- - * Copyright (C) 2008-13 Christian Franke <smartmontools-support@lists.sourceforge.net>

- + * Copyright (C) 2008-14 Christian Franke <smartmontools-support@lists.sourceforge.net>

-   *

-   * This program is free software; you can redistribute it and/or modify

-   * it under the terms of the GNU General Public License as published by

- @@ -75,7 +75,7 @@

-  /*

-  const drive_settings builtin_knowndrives[] = {

-   */

- -  { "$Id: drivedb.h 3840 2013-07-25 21:29:08Z chrfranke $",

- +  { "$Id: drivedb.h 3952 2014-07-16 21:30:37Z chrfranke $",

-      "-", "-",

-      "This is a dummy entry to hold the SVN-Id of drivedb.h",

-      ""

- @@ -158,8 +158,8 @@ const drive_settings builtin_knowndrives

-      "", "", ""

-    },

-    { "Apacer SDM4",

- -    "2GB SATA Flash Drive", // tested with APSDM002G15AN-CT/SFI2101D

- -    "SFI2101D", "",

- +    "2GB SATA Flash Drive", // tested with APSDM002G15AN-CT/SFDDA01C and SFI2101D

- +    "SF(DDA01C|I2101D)", "",

-      "-v 160,raw48,Initial_Bad_Block_Count "

-      "-v 161,raw48,Bad_Block_Count "

-      "-v 162,raw48,Spare_Block_Count "

- @@ -174,7 +174,8 @@ const drive_settings builtin_knowndrives

-    { "Crucial/Micron RealSSD C300/M500", // Marvell 88SS91xx

-      "C300-CTFDDA[AC](064|128|256)MAG|" // Marvell 88SS9174 BJP2, tested with C300-CTFDDAC128MAG/0002,

-        // C300-CTFDDAC064MAG/0006

- -    "Crucial_CT(120|240|480)M500SSD3", // Marvell 88SS9187 BLD2, tested with Crucial_CT120M500SSD3/MU02

- +    "Crucial_CT(120|240|480)M500SSD[13]", // Marvell 88SS9187 BLD2, tested with Crucial_CT120M500SSD3/MU02,

- +      // Crucial_CT120M500SSD1/MU02, Crucial_CT240M500SSD1/MU03, Crucial_CT480M500SSD1/MU03

-      "", "",

-    //"-v 1,raw48,Raw_Read_Error_Rate "

-    //"-v 5,raw16(raw16),Reallocated_Sector_Ct "

- @@ -197,12 +198,16 @@ const drive_settings builtin_knowndrives

-    //"-v 197,raw48,Current_Pending_Sector "

-    //"-v 198,raw48,Offline_Uncorrectable "

-    //"-v 199,raw48,UDMA_CRC_Error_Count "

- -    "-v 202,raw48,Perc_Rated_Life_Used "

- -    "-v 206,raw48,Write_Error_Rate"

- +    "-v 202,raw48,Percent_Lifetime_Used "

- +    "-v 206,raw48,Write_Error_Rate "

- +    "-v 210,raw48,Success_RAIN_Recov_Cnt "

- +    "-v 246,raw48,Total_Host_Sector_Write "

- +    "-v 247,raw48,Host_Program_Page_Count "

- +    "-v 248,raw48,Bckgnd_Program_Page_Cnt"

-    },

-    { "Crucial/Micron RealSSD m4/C400/P400", // Marvell 9176, fixed firmware

-      "C400-MTFDDA[ACK](064|128|256|512)MAM|"

- -    "M4-CT(064|128|256|512)M4SSD[23]|" // tested with M4-CT512M4SSD2/0309

- +    "M4-CT(064|128|256|512)M4SSD[123]|" // tested with M4-CT512M4SSD2/0309

-      "MTFDDAK(064|128|256|512|050|100|200|400)MA[RN]-1[JKS]1AA.*", // tested with

-                                               // MTFDDAK256MAR-1K1AA/MA52

-      "030[9-Z]|03[1-Z].|0[4-Z]..|[1-Z]....*", // >= "0309"

- @@ -233,7 +238,7 @@ const drive_settings builtin_knowndrives

-    },

-    { "Crucial/Micron RealSSD m4/C400", // Marvell 9176, buggy or unknown firmware

-      "C400-MTFDDA[ACK](064|128|256|512)MAM|" // tested with C400-MTFDDAC256MAM/0002

- -    "M4-CT(064|128|256|512)M4SSD[23]", // tested with M4-CT064M4SSD2/0002,

- +    "M4-CT(064|128|256|512)M4SSD[123]", // tested with M4-CT064M4SSD2/0002,

-        // M4-CT064M4SSD2/0009, M4-CT256M4SSD3/000F

-      "",

-      "This drive may hang after 5184 hours of power-on time:\n"

- @@ -252,22 +257,82 @@ const drive_settings builtin_knowndrives

-      "-v 202,raw48,Perc_Rated_Life_Used "

-      "-v 206,raw48,Write_Error_Rate"

-    },

- +  { "Crucial/Micron M500/M510/M550 Client SSDs",

- +    "Micron_M500_MTFDDA[KTV](120|240|480|960)MAV|"// tested with Micron_M500_MTFDDAK960MAV/MU05

- +    "M510-MTFDDA[KTV](128|256)MAZ|" // tested with M510-MTFDDAK256MAZ/MU01

- +    "M550-MTFDDA[KTV](064|128|256|512|1T0)MAY", // tested with M550-MTFDDAK256MAY/MU01

- +    "", "",

- +  //"-v 1,raw48,Raw_Read_Error_Rate "

- +    "-v 5,raw48,Reallocate_NAND_Blk_Cnt "

- +  //"-v 9,raw24(raw8),Power_On_Hours "

- +  //"-v 12,raw48,Power_Cycle_Count "

- +    "-v 171,raw48,Program_Fail_Count "

- +    "-v 172,raw48,Erase_Fail_Count "

- +    "-v 173,raw48,Ave_Block-Erase_Count "

- +    "-v 174,raw48,Unexpect_Power_Loss_Ct "

- +    "-v 180,raw48,Unused_Reserve_NAND_Blk "

- +    "-v 183,raw48,SATA_Interfac_Downshift "

- +    "-v 184,raw48,Error_Correction_Count "

- +  //"-v 187,raw48,Reported_Uncorrect "

- +  //"-v 194,tempminmax,Temperature_Celsius "

- +  //"-v 196,raw16(raw16),Reallocated_Event_Count "

- +  //"-v 197,raw48,Current_Pending_Sector "

- +  //"-v 198,raw48,Offline_Uncorrectable "

- +  //"-v 199,raw48,UDMA_CRC_Error_Count "

- +    "-v 202,raw48,Percent_Lifetime_Used "

- +    "-v 206,raw48,Write_Error_Rate "

- +    "-v 210,raw48,Success_RAIN_Recov_Cnt "

- +    "-v 246,raw48,Total_Host_Sector_Write "

- +    "-v 247,raw48,Host_Program_Page_Count "

- +    "-v 248,raw48,Bckgnd_Program_Page_Cnt"

- +  },

- +  { "Micron M500DC Enterprise SSDs",

- +    "Micron_M500DC_(EE|MT)FDDA[AK](120|240|480|800)MBB", // tested with

- +      // Micron_M500DC_EEFDDAA120MBB/129, Micron_M500DC_MTFDDAK800MBB/0129

- +    "", "",

- +  //"-v 1,raw48,Raw_Read_Error_Rate "

- +    "-v 5,raw48,Reallocated_Block_Count "

- +  //"-v 9,raw24(raw8),Power_On_Hours "

- +  //"-v 12,raw48,Power_Cycle_Count "

- +    "-v 170,raw48,Reserved_Block_Count "

- +    "-v 171,raw48,Program_Fail_Count "

- +    "-v 172,raw48,Erase_Fail_Count "

- +    "-v 173,raw48,Ave_Block-Erase_Count "

- +    "-v 174,raw48,Unexpect_Power_Loss_Ct "

- +    "-v 184,raw48,Error_Correction_Count "

- +  //"-v 187,raw48,Reported_Uncorrect "

- +    "-v 188,raw48,Command_Timeouts "

- +  //"-v 194,tempminmax,Temperature_Celsius "

- +    "-v 195,raw48,Cumulativ_Corrected_ECC "

- +  //"-v 197,raw48,Current_Pending_Sector "

- +  //"-v 198,raw48,Offline_Uncorrectable "

- +  //"-v 199,raw48,UDMA_CRC_Error_Count "

- +    "-v 202,raw48,Percent_Lifetime_Remain "

- +    "-v 206,raw48,Write_Error_Rate "

- +    "-v 247,raw48,Host_Program_Page_Count "

- +    "-v 248,raw48,Bckgnd_Program_Page_Cnt"

- +  },

-    { "SandForce Driven SSDs",

-      "SandForce 1st Ed\\.|" // Demo Drive, tested with firmware 320A13F0

-      "ADATA SSD S(396|510|599) .?..GB|" // tested with ADATA SSD S510 60GB/320ABBF0,

-        // ADATA SSD S599 256GB/3.1.0, 64GB/3.4.6

- -    "ADATA SP900|" // Premier Pro, SF-2281, tested with ADATA SP900/5.0.6

- +    "ADATA SP[389]00|" // tested with ADATA SP300/5.0.2d, SP800/5.0.6c,

- +      // ADATA SP900/5.0.6 (Premier Pro, SF-2281)

- +    "ADATA SSD SP900 (64|128|256)GB-DL2|" // tested with ADATA SSD SP900 256GB-DL2/5.0.6

- +    "ADATA XM11 (128|256)GB|" // tested with ADATA XM11 128GB/5.0.1

-      "Corsair CSSD-F(40|60|80|115|120|160|240)GBP?2.*|" // Corsair Force, tested with

-        // Corsair CSSD-F40GB2/1.1, Corsair CSSD-F115GB2-A/2.1a

- -    "Corsair Force (3 SSD|GS|GT)|" // SF-2281, tested with

- -      // Corsair Force 3 SSD/1.3.2, GT/1.3.3, GS/5.03

- +    "Corsair Force ((3 |LS )?SSD|GS|GT)|" // SF-2281, tested with

- +      // Corsair Force SSD/5.05, 3 SSD/1.3.2, GT/1.3.3, GS/5.03, LS SSD/S8FM06.5

-      "FM-25S2S-(60|120|240)GBP2|" // G.SKILL Phoenix Pro, SF-1200, tested with

-        // FM-25S2S-240GBP2/4.2

-      "FTM(06|12|24|48)CT25H|" // Supertalent TeraDrive CT, tested with

-        // FTM24CT25H/STTMP2P1

- +    "KINGSTON SE50S3(100|240|480)G|" // tested with SE50S3100G/KE1ABBF0

-      "KINGSTON SH10[03]S3(90|120|240|480)G|" // HyperX (3K), SF-2281, tested with

-        // SH100S3240G/320ABBF0, SH103S3120G/505ABBF0

- -    "KINGSTON SKC300S37A(60|120|240|480)G|" // SF-2281, tested with SKC300S37A120G/KC4ABBF0

- +    "KINGSTON SKC(300S37A|380S3)(60|120|240|480)G|" // SF-2281, tested with SKC300S37A120G/KC4ABBF0,

- +      // SKC380S3120G/507ABBF0

-      "KINGSTON SVP200S3(7A)?(60|90|120|240|480)G|" // V+ 200, SF-2281, tested with

-        // SVP200S37A480G/502ABBF0, SVP200S390G/332ABBF0

-      "KINGSTON SMS200S3(30|60|120)G|" // mSATA, SF-2241, tested with SMS200S3120G/KC3ABBF0

- @@ -294,22 +359,26 @@ const drive_settings builtin_knowndrives

-      "(APOC|DENC|DENEVA|FTNC|GFGC|MANG|MMOC|NIMC|TMSC).*|" // other OCZ SF-1200,

-        // tested with DENCSTE251M11-0120/1.33, DENEVA PCI-E/1.33

-      "(DENR|DRSAK|EC188|NIMR|PSIR|TRSAK).*|" // other OCZ SF-1500

- -    "OWC Mercury Electra [36]G SSD|" // tested with

- -      // OWC Mercury Electra 6G SSD/502ABBF0

- -    "OWC Mercury Extreme Pro (RE )?SSD|" // tested with

- -      // OWC Mercury Extreme Pro SSD/360A13F0

- -    "OWC Mercury EXTREME Pro 6G SSD|" // tested with

- -      // OWC Mercury EXTREME Pro 6G SSD/507ABBF0

- +    "OWC Aura Pro 6G SSD|" // tested with OWC Aura Pro 6G SSD/507ABBF0

- +    "OWC Mercury Electra (Pro )?[36]G SSD|" // tested with

- +      // OWC Mercury Electra 6G SSD/502ABBF0, OWC Mercury Electra Pro 3G SSD/541ABBF0

- +    "OWC Mercury E(xtreme|XTREME) Pro (6G |RE )?SSD|" // tested with

- +      // OWC Mercury Extreme Pro SSD/360A13F0, OWC Mercury EXTREME Pro 6G SSD/507ABBF0

-      "Patriot Pyro|" // tested with Patriot Pyro/332ABBF0

-      "SanDisk SDSSDX(60|120|240|480)GG25|" // SanDisk Extreme, SF-2281, tested with

-        // SDSSDX240GG25/R201

-      "SuperSSpeed S301 [0-9]*GB|" // SF-2281, tested with SuperSSpeed S301 128GB/503

- +    "SG9XCS2D(0?50|100|200|400)GESLT|" // Smart Storage Systems XceedIOPS2, tested with

- +      // SG9XCS2D200GESLT/SA03L370

- +    "SSD9SC(120|240|480)GED[EA]|" // PNY Prevail Elite, tested with SSD9SC120GEDA/334ABBF0

-      "(TX32|TX31C1|VN0.?..GCNMK).*|" // Smart Storage Systems XceedSTOR

-      "(TX22D1|TX21B1).*|" // Smart Storage Systems XceedIOPS2

-      "TX52D1.*|" // Smart Storage Systems Xcel-200

- -    "TS(64|128|256|512)GSSD320|" // Transcend SSD320, SF-2281, tested with TS128GSSD320

- -    "UGB(88P|99S)GC...H[BF].", // Unigen, tested with

- +    "TS(64|128|256|512)GSSD[37]20|" // Transcend SSD320/720, SF-2281, tested with

- +      // TS128GSSD320, TS256GSSD720/5.2.0

- +    "UGB(88P|99S)GC...H[BF].|" // Unigen, tested with

-        // UGB88PGC100HF2/MP Rev2, UGB99SGC100HB3/RC Rev3

- +    "VisionTek GoDrive (60|120|240|480)GB", // tested with VisionTek GoDrive 480GB/506ABBF0

-      "", "",

-      "-v 1,raw24/raw32,Raw_Read_Error_Rate "

-      "-v 5,raw48,Retired_Block_Count "

- @@ -397,7 +466,8 @@ const drive_settings builtin_knowndrives

-    //"-v 233,raw48,Media_Wearout_Indicator"

-    },

-    { "Indilinx Barefoot 3 based SSDs",

- -    "OCZ-VECTOR", // tested with OCZ-VECTOR/1.03

- +    "OCZ-VECTOR|" // tested with OCZ-VECTOR/1.03

- +    "OCZ-VERTEX450", // tested with OCZ-VERTEX450/1.0 (Barefoot 3 M10)

-      "", "", ""

-      "-v 5,raw48,Runtime_Bad_Block "

-    //"-v 9,raw24(raw8),Power_On_Hours "

- @@ -413,8 +483,44 @@ const drive_settings builtin_knowndrives

-      "-v 208,raw48,Average_Erase_Count "

-      "-v 210,raw48,SATA_CRC_Error_Count "

-      "-v 233,raw48,Remaining_Lifetime_Perc "

- +    "-v 241,raw48,Host_Writes_GiB " // M10

- +    "-v 242,raw48,Host_Reads_GiB "  // M10

-      "-v 249,raw48,Total_NAND_Prog_Ct_GiB"

-    },

- +  { "OCZ Intrepid 3000 SSDs", // tested with OCZ INTREPID 3600/1.4.3.6, 3800/1.4.3.0

- +    "OCZ INTREPID 3[68]00",

- +    "", "", ""

- +    "-v 5,raw48,Runtime_Bad_Block "

- +  //"-v 9,raw24(raw8),Power_On_Hours "

- +  //"-v 12,raw48,Power_Cycle_Count "

- +    "-v 100,raw48,Total_Blocks_Erased "

- +    "-v 171,raw48,Avail_OP_Block_Count "

- +    "-v 174,raw48,Pwr_Cycle_Ct_Unplanned "

- +    "-v 184,raw48,Factory_Bad_Block_Count "

- +    "-v 187,raw48,Total_Unc_NAND_Reads "

- +    "-v 190,tempminmax,Temperature_Celsius "

- +    "-v 195,raw48,Total_Prog_Failures "

- +    "-v 196,raw48,Total_Erase_Failures "

- +    "-v 197,raw48,Total_Unc_Read_Failures "

- +    "-v 198,raw48,Host_Reads_GiB "

- +    "-v 199,raw48,Host_Writes_GiB "

- +    "-v 202,raw48,Total_Read_Bits_Corr_Ct "

- +    "-v 205,raw48,Max_Rated_PE_Count "

- +    "-v 206,raw48,Min_Erase_Count "

- +    "-v 207,raw48,Max_Erase_Count "

- +    "-v 208,raw48,Average_Erase_Count "

- +    "-v 210,raw48,SATA_CRC_Error_Count "

- +    "-v 211,raw48,SATA_UNC_Count "

- +    "-v 212,raw48,NAND_Reads_with_Retry "

- +    "-v 213,raw48,Simple_Rd_Rtry_Attempts "

- +    "-v 214,raw48,Adaptv_Rd_Rtry_Attempts "

- +    "-v 221,raw48,Int_Data_Path_Prot_Unc "

- +    "-v 222,raw48,RAID_Recovery_Count "

- +    "-v 230,raw48,SuperCap_Charge_Status " // 0=not charged, 1=fully charged, 2=unknown

- +    "-v 233,raw48,Remaining_Lifetime_Perc "

- +    "-v 249,raw48,Total_NAND_Prog_Ct_GiB "

- +    "-v 251,raw48,Total_NAND_Read_Ct_GiB"

- +  },

-    { "InnoDisk InnoLite SATADOM D150QV-L SSDs", // tested with InnoLite SATADOM D150QV-L/120319

-      "InnoLite SATADOM D150QV-L",

-      "", "",

- @@ -528,8 +634,9 @@ const drive_settings builtin_knowndrives

-      "-v 242,raw48,Host_Reads_32MiB"

-    },

-    { "Intel 320 Series SSDs", // tested with INTEL SSDSA2CT040G3/4PC10362,

- -      // INTEL SSDSA2CW160G3/4PC10362, INTEL SSDSA2BT040G3/4PC10362, INTEL SSDSA2BW120G3A/4PC10362

- -    "INTEL SSDSA[12][BC][WT](040|080|120|160|300|600)G3A?",

- +      // INTEL SSDSA2CW160G3/4PC10362, INTEL SSDSA2BT040G3/4PC10362, INTEL SSDSA2BW120G3A/4PC10362,

- +      // INTEL SSDSA2BW300G3D/4PC10362

- +    "INTEL SSDSA[12][BC][WT](040|080|120|160|300|600)G3[AD]?",

-      "", "",

-      "-F nologdir "

-    //"-v 3,raw16(avg16),Spin_Up_Time "

- @@ -540,8 +647,10 @@ const drive_settings builtin_knowndrives

-      "-v 170,raw48,Reserve_Block_Count "

-      "-v 171,raw48,Program_Fail_Count "