1 files changed, 27 insertions, 28 deletions

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 6d932409aadd..1539734bbbad 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -200,6 +200,7 @@ struct ahci_port_priv {
         /* for NCQ spurious interrupt analysis */
         unsigned int            ncq_saw_d2h:1;
         unsigned int            ncq_saw_dmas:1;
+        unsigned int            ncq_saw_sdb:1;
 };
 
 static u32 ahci_scr_read (struct ata_port *ap, unsigned int sc_reg);
@@ -384,12 +385,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {
         { PCI_VDEVICE(INTEL, 0x294d), board_ahci_pi }, /* ICH9 */
         { PCI_VDEVICE(INTEL, 0x294e), board_ahci_pi }, /* ICH9M */
 
-        /* JMicron */
-        { PCI_VDEVICE(JMICRON, 0x2360), board_ahci_ign_iferr }, /* JMB360 */
-        { PCI_VDEVICE(JMICRON, 0x2361), board_ahci_ign_iferr }, /* JMB361 */
-        { PCI_VDEVICE(JMICRON, 0x2363), board_ahci_ign_iferr }, /* JMB363 */
-        { PCI_VDEVICE(JMICRON, 0x2365), board_ahci_ign_iferr }, /* JMB365 */
-        { PCI_VDEVICE(JMICRON, 0x2366), board_ahci_ign_iferr }, /* JMB366 */
+        /* JMicron 360/1/3/5/6, match class to avoid IDE function */
+        { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+          PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci_ign_iferr },
 
         /* ATI */
         { PCI_VDEVICE(ATI, 0x4380), board_ahci }, /* ATI SB600 non-raid */
@@ -1160,23 +1158,31 @@ static void ahci_host_intr(struct ata_port *ap)
         }
 
         if (status & PORT_IRQ_SDB_FIS) {
-                /* SDB FIS containing spurious completions might be
-                 * dangerous, whine and fail commands with HSM
-                 * violation.  EH will turn off NCQ after several such
-                 * failures.
-                 */
                 const __le32 *f = pp->rx_fis + RX_FIS_SDB;
 
-                ata_ehi_push_desc(ehi, "spurious completion during NCQ "
-                                  "issue=0x%x SAct=0x%x FIS=%08x:%08x",
-                                  readl(port_mmio + PORT_CMD_ISSUE),
-                                  readl(port_mmio + PORT_SCR_ACT),
-                                  le32_to_cpu(f[0]), le32_to_cpu(f[1]));
-
-                ehi->err_mask |= AC_ERR_HSM;
-                ehi->action |= ATA_EH_SOFTRESET;
-                ata_port_freeze(ap);
-
+                if (le32_to_cpu(f[1])) {
+                        /* SDB FIS containing spurious completions
+                         * might be dangerous, whine and fail commands
+                         * with HSM violation.  EH will turn off NCQ
+                         * after several such failures.
+                         */
+                        ata_ehi_push_desc(ehi,
+                                "spurious completions during NCQ "
+                                "issue=0x%x SAct=0x%x FIS=%08x:%08x",
+                                readl(port_mmio + PORT_CMD_ISSUE),
+                                readl(port_mmio + PORT_SCR_ACT),
+                                le32_to_cpu(f[0]), le32_to_cpu(f[1]));
+                        ehi->err_mask |= AC_ERR_HSM;
+                        ehi->action |= ATA_EH_SOFTRESET;
+                        ata_port_freeze(ap);
+                } else {
+                        if (!pp->ncq_saw_sdb)
+                                ata_port_printk(ap, KERN_INFO,
+                                        "spurious SDB FIS %08x:%08x during NCQ, "
+                                        "this message won't be printed again\n",
+                                        le32_to_cpu(f[0]), le32_to_cpu(f[1]));
+                        pp->ncq_saw_sdb = 1;
+                }
                 known_irq = 1;
         }
 
@@ -1665,13 +1671,6 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
 
-        if (pdev->vendor == PCI_VENDOR_ID_JMICRON) {
-                /* Function 1 is the PATA controller except on the 368, where
-                   we are not AHCI anyway */
-                if (PCI_FUNC(pdev->devfn))
-                        return -ENODEV;
-        }
-
         rc = pcim_enable_device(pdev);
         if (rc)
                 return rc;