diff options
| author | Tejun Heo <tj@kernel.org> | 2017-08-29 08:36:58 -0700 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2017-08-29 08:36:58 -0700 |
| commit | 2aca392398384f8a2f339f4c661a1699f4f2e2eb (patch) | |
| tree | 73b0086097f69c000bcbf353fc10cc6dd47b14d8 | |
| parent | e8f11db956aa09c1618051a7aaf367d6810d8d8c (diff) | |
| download | linux-2aca392398384f8a2f339f4c661a1699f4f2e2eb.tar.bz2 | |
Revert "libata: quirk read log on no-name M.2 SSD"
This reverts commit 35f0b6a779b8b7a98faefd7c1c660b4dac9a5c26.
We now conditionalize issuing of READ LOG PAGE on the TRUSTED
COMPUTING SUPPORTED bit in the identity data and this shouldn't be
necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
| -rw-r--r-- | drivers/ata/libata-core.c | 4 | ||||
| -rw-r--r-- | include/linux/libata.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index ca57b03ab950..1945a8ea2099 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -2079,8 +2079,6 @@ unsigned int ata_read_log_page(struct ata_device *dev, u8 log, */ if (ap_flags & ATA_FLAG_NO_LOG_PAGE) return AC_ERR_DEV; - if (dev->horkage & ATA_HORKAGE_NO_LOG_PAGE) - return AC_ERR_DEV; retry: ata_tf_init(dev, &tf); @@ -4583,8 +4581,6 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "WDC WD3000JD-*", NULL, ATA_HORKAGE_WD_BROKEN_LPM }, { "WDC WD3200JD-*", NULL, ATA_HORKAGE_WD_BROKEN_LPM }, - - { "M.2 (S42) 3ME3", NULL, ATA_HORKAGE_NO_LOG_PAGE }, /* End Marker */ { } }; diff --git a/include/linux/libata.h b/include/linux/libata.h index 9e927ae7fced..931c32f1f18d 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -438,7 +438,6 @@ enum { ATA_HORKAGE_NO_DMA_LOG = (1 << 23), /* don't use DMA for log read */ ATA_HORKAGE_NOTRIM = (1 << 24), /* don't use TRIM */ ATA_HORKAGE_MAX_SEC_1024 = (1 << 25), /* Limit max sects to 1024 */ - ATA_HORKAGE_NO_LOG_PAGE = (1 << 26), /* Doesn't like Get Log Page */ /* DMA mask for user DMA control: User visible values; DO NOT renumber */ |