libata: add ATA_HORKAGE_NOTRIM

commit 71d126fd28de2d4d9b7b2088dbccd7ca62fad6e0 upstream.

Some devices lose data on TRIM whether queued or not.  This patch adds
a horkage to disable TRIM.

tj: Collapsed unnecessary if() nesting.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 9933b4db7caf41cbb5c3b8b82518925b67643dd8..04e7db668362448ae717c5014254cb86d9765d07 100644 (file)
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2512,7 +2512,8 @@ static unsigned int ata_scsiop_read_cap(struct ata_scsi_args *args, u8 *rbuf)
                rbuf[14] = (lowest_aligned >> 8) & 0x3f;
                rbuf[15] = lowest_aligned;
 
-               if (ata_id_has_trim(args->id)) {
+               if (ata_id_has_trim(args->id) &&
+                   !(dev->horkage & ATA_HORKAGE_NOTRIM)) {
                        rbuf[14] |= 0x80; /* TPE */
 
                        if (ata_id_has_zero_after_trim(args->id))

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 8e5d45fa83cfb71872527cc5a4e2887d50f406d9..8ad0771b88abfd4589f01e07cd446e93f0bc9107 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -409,6 +409,7 @@ enum {
        ATA_HORKAGE_ATAPI_DMADIR = (1 << 18),   /* device requires dmadir */
        ATA_HORKAGE_NOLPM       = (1 << 20),    /* don't use LPM */
        ATA_HORKAGE_WD_BROKEN_LPM = (1 << 21),  /* some WDs have broken LPM */
+       ATA_HORKAGE_NOTRIM = (1 << 24),         /* don't use TRIM */
 
         /* DMA mask for user DMA control: User visible values; DO NOT
            renumber */