diff options
author | Tejun Heo <tj@kernel.org> | 2015-08-03 11:45:34 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2015-08-03 12:01:19 -0400 |
commit | 84ded2f8e7dda336fc2fb3570726ceb3b3b3590f (patch) | |
tree | fd3ab53fff8959c6f3373eae756e6314c653baf6 /drivers/ata/libata-core.c | |
parent | fe16d4f202c59a560533a223bc6375739ee30944 (diff) |
Revert "libata: Implement support for sense data reporting"
This reverts commit fe7173c206de63fc28475ee6ae42ff95c05692de.
As implemented, ACS-4 sense reporting for ATA devices bypasses error
diagnosis and handling in libata degrading EH behavior significantly.
Revert the related changes for now.
ATA_ID_COMMAND_SET_3/4 constants are not reverted as they're used by
later changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Hannes Reinecke <hare@suse.de>
Cc: stable@vger.kernel.org #v4.1+
Diffstat (limited to 'drivers/ata/libata-core.c')
-rw-r--r-- | drivers/ata/libata-core.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 426bc12459de..19bcb80b2031 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -2147,24 +2147,6 @@ static int ata_dev_config_ncq(struct ata_device *dev, | |||
2147 | return 0; | 2147 | return 0; |
2148 | } | 2148 | } |
2149 | 2149 | ||
2150 | static void ata_dev_config_sense_reporting(struct ata_device *dev) | ||
2151 | { | ||
2152 | unsigned int err_mask; | ||
2153 | |||
2154 | if (!ata_id_has_sense_reporting(dev->id)) | ||
2155 | return; | ||
2156 | |||
2157 | if (ata_id_sense_reporting_enabled(dev->id)) | ||
2158 | return; | ||
2159 | |||
2160 | err_mask = ata_dev_set_feature(dev, SETFEATURE_SENSE_DATA, 0x1); | ||
2161 | if (err_mask) { | ||
2162 | ata_dev_dbg(dev, | ||
2163 | "failed to enable Sense Data Reporting, Emask 0x%x\n", | ||
2164 | err_mask); | ||
2165 | } | ||
2166 | } | ||
2167 | |||
2168 | /** | 2150 | /** |
2169 | * ata_dev_configure - Configure the specified ATA/ATAPI device | 2151 | * ata_dev_configure - Configure the specified ATA/ATAPI device |
2170 | * @dev: Target device to configure | 2152 | * @dev: Target device to configure |
@@ -2387,7 +2369,7 @@ int ata_dev_configure(struct ata_device *dev) | |||
2387 | dev->devslp_timing[i] = sata_setting[j]; | 2369 | dev->devslp_timing[i] = sata_setting[j]; |
2388 | } | 2370 | } |
2389 | } | 2371 | } |
2390 | ata_dev_config_sense_reporting(dev); | 2372 | |
2391 | dev->cdb_len = 16; | 2373 | dev->cdb_len = 16; |
2392 | } | 2374 | } |
2393 | 2375 | ||