]> git.itanic.dy.fi Git - linux-stable/commitdiff
libata: Add ATA_HORKAGE_NO_NCQ_ON_ATI for Samsung 860 and 870 SSD.
authorKate Hsuan <hpa@redhat.com>
Fri, 3 Sep 2021 09:44:11 +0000 (17:44 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 9 Oct 2021 13:02:42 +0000 (15:02 +0200)
commit 7a8526a5cd51cf5f070310c6c37dd7293334ac49 upstream.

Many users are reporting that the Samsung 860 and 870 SSD are having
various issues when combined with AMD/ATI (vendor ID 0x1002)  SATA
controllers and only completely disabling NCQ helps to avoid these
issues.

Always disabling NCQ for Samsung 860/870 SSDs regardless of the host
SATA adapter vendor will cause I/O performance degradation with well
behaved adapters. To limit the performance impact to ATI adapters,
introduce the ATA_HORKAGE_NO_NCQ_ON_ATI flag to force disable NCQ
only for these adapters.

Also, two libata.force parameters (noncqati and ncqati) are introduced
to disable and enable the NCQ for the system which equipped with ATI
SATA adapter and Samsung 860 and 870 SSDs. The user can determine NCQ
function to be enabled or disabled according to the demand.

After verifying the chipset from the user reports, the issue appears
on AMD/ATI SB7x0/SB8x0/SB9x0 SATA Controllers and does not appear on
recent AMD SATA adapters. The vendor ID of ATI should be 0x1002.
Therefore, ATA_HORKAGE_NO_NCQ_ON_AMD was modified to
ATA_HORKAGE_NO_NCQ_ON_ATI.

BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=201693
Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20210903094411.58749-1-hpa@redhat.com
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Cc: Krzysztof Olędzki <ole@ans.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/ata/libata-core.c
include/linux/libata.h

index 0e6e73b8023fcd96962545b7c7edbc7620047ad0..8916163d508e05b55c9f7f6d369b7c8dccd4bdef 100644 (file)
@@ -2199,6 +2199,25 @@ static void ata_dev_config_ncq_prio(struct ata_device *dev)
 
 }
 
+static bool ata_dev_check_adapter(struct ata_device *dev,
+                                 unsigned short vendor_id)
+{
+       struct pci_dev *pcidev = NULL;
+       struct device *parent_dev = NULL;
+
+       for (parent_dev = dev->tdev.parent; parent_dev != NULL;
+            parent_dev = parent_dev->parent) {
+               if (dev_is_pci(parent_dev)) {
+                       pcidev = to_pci_dev(parent_dev);
+                       if (pcidev->vendor == vendor_id)
+                               return true;
+                       break;
+               }
+       }
+
+       return false;
+}
+
 static int ata_dev_config_ncq(struct ata_device *dev,
                               char *desc, size_t desc_sz)
 {
@@ -2217,6 +2236,13 @@ static int ata_dev_config_ncq(struct ata_device *dev,
                snprintf(desc, desc_sz, "NCQ (not used)");
                return 0;
        }
+
+       if (dev->horkage & ATA_HORKAGE_NO_NCQ_ON_ATI &&
+           ata_dev_check_adapter(dev, PCI_VENDOR_ID_ATI)) {
+               snprintf(desc, desc_sz, "NCQ (not used)");
+               return 0;
+       }
+
        if (ap->flags & ATA_FLAG_NCQ) {
                hdepth = min(ap->scsi_host->can_queue, ATA_MAX_QUEUE);
                dev->flags |= ATA_DFLAG_NCQ;
@@ -3951,9 +3977,11 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
        { "Samsung SSD 850*",           NULL,   ATA_HORKAGE_NO_NCQ_TRIM |
                                                ATA_HORKAGE_ZERO_AFTER_TRIM, },
        { "Samsung SSD 860*",           NULL,   ATA_HORKAGE_NO_NCQ_TRIM |
-                                               ATA_HORKAGE_ZERO_AFTER_TRIM, },
+                                               ATA_HORKAGE_ZERO_AFTER_TRIM |
+                                               ATA_HORKAGE_NO_NCQ_ON_ATI, },
        { "Samsung SSD 870*",           NULL,   ATA_HORKAGE_NO_NCQ_TRIM |
-                                               ATA_HORKAGE_ZERO_AFTER_TRIM, },
+                                               ATA_HORKAGE_ZERO_AFTER_TRIM |
+                                               ATA_HORKAGE_NO_NCQ_ON_ATI, },
        { "FCCT*M500*",                 NULL,   ATA_HORKAGE_NO_NCQ_TRIM |
                                                ATA_HORKAGE_ZERO_AFTER_TRIM, },
 
@@ -6108,6 +6136,8 @@ static int __init ata_parse_force_one(char **cur,
                { "ncq",        .horkage_off    = ATA_HORKAGE_NONCQ },
                { "noncqtrim",  .horkage_on     = ATA_HORKAGE_NO_NCQ_TRIM },
                { "ncqtrim",    .horkage_off    = ATA_HORKAGE_NO_NCQ_TRIM },
+               { "noncqati",   .horkage_on     = ATA_HORKAGE_NO_NCQ_ON_ATI },
+               { "ncqati",     .horkage_off    = ATA_HORKAGE_NO_NCQ_ON_ATI },
                { "dump_id",    .horkage_on     = ATA_HORKAGE_DUMP_ID },
                { "pio0",       .xfer_mask      = 1 << (ATA_SHIFT_PIO + 0) },
                { "pio1",       .xfer_mask      = 1 << (ATA_SHIFT_PIO + 1) },
index 3fcd24236793ea77bc57445cd06dbfd099a0a7ae..cb95d3f3337d58bb505a85a8175be4e97d0beb83 100644 (file)
@@ -422,6 +422,7 @@ enum {
        ATA_HORKAGE_NOTRIM      = (1 << 24),    /* don't use TRIM */
        ATA_HORKAGE_MAX_SEC_1024 = (1 << 25),   /* Limit max sects to 1024 */
        ATA_HORKAGE_MAX_TRIM_128M = (1 << 26),  /* Limit max trim size to 128M */
+       ATA_HORKAGE_NO_NCQ_ON_ATI = (1 << 27),  /* Disable NCQ on ATI chipset */
 
         /* DMA mask for user DMA control: User visible values; DO NOT
            renumber */