| Message ID | 1434653418-4562-1-git-send-email-martin.petersen@oracle.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Jun 18, 2015 at 02:50:18PM -0400, Martin K. Petersen wrote: > Queued TRIM got disabled on Micron M500DC drives thanks to the > "Micron_M500*" pattern we had in place to accommodate the previous > generation of this drive family. Tweak the blacklist entry slightly so > we only disable queued TRIM for the non-DC variants of M500 drives. > > Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> > Cc: stable@vger.kernel.org Applied to libata/for-4.2. This one isn't too urgent so letting it propagate through -rc1 should be fine. Thanks.
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 9cebd7872ac6..8815b9f691bd 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -4225,7 +4225,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "PIONEER DVD-RW DVR-216D", NULL, ATA_HORKAGE_NOSETXFER }, /* devices that don't properly handle queued TRIM commands */ - { "Micron_M500*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | + { "Micron_M500_*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | ATA_HORKAGE_ZERO_AFTER_TRIM, }, { "Crucial_CT*M500*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | ATA_HORKAGE_ZERO_AFTER_TRIM, },
Queued TRIM got disabled on Micron M500DC drives thanks to the "Micron_M500*" pattern we had in place to accommodate the previous generation of this drive family. Tweak the blacklist entry slightly so we only disable queued TRIM for the non-DC variants of M500 drives. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Cc: stable@vger.kernel.org --- drivers/ata/libata-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)