]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Revert "libata: quirk read log on no-name M.2 SSD"
authorTejun Heo <tj@kernel.org>
Tue, 29 Aug 2017 15:36:58 +0000 (08:36 -0700)
committerTejun Heo <tj@kernel.org>
Tue, 29 Aug 2017 15:36:58 +0000 (08:36 -0700)
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>
drivers/ata/libata-core.c
include/linux/libata.h

index ca57b03ab9505ec03375e72cffc1b55aa3af4416..1945a8ea20998490b48aa70dfe56c4fbaad744ea 100644 (file)
@@ -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 */
        { }
 };
index 9e927ae7fceda8cdb6a6a77697c55da285d85746..931c32f1f18d38835425eb21a4c952e1195e4f10 100644 (file)
@@ -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 */