]> err.no Git - linux-2.6/commitdiff
ahci: jmb361 has only one port
authorTejun Heo <tj@kernel.org>
Tue, 17 Jun 2008 03:46:30 +0000 (12:46 +0900)
committerJeff Garzik <jgarzik@redhat.com>
Thu, 19 Jun 2008 00:27:45 +0000 (20:27 -0400)
JMB361 has only one port but reports it has two causing longish probe
failure on the second one.  Quirk it.

Reported by Gajo Petrovic in bz 10911.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Gajo Petrovic <gajo01@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/ata/ahci.c

index 966ab401e5234d6c0adc8c86a90250b586e8f2fb..29f34d03bd75bd207c169d58e6d846954f3b7947 100644 (file)
@@ -653,6 +653,14 @@ static void ahci_save_initial_config(struct pci_dev *pdev,
                cap &= ~HOST_CAP_PMP;
        }
 
+       if (pdev->vendor == PCI_VENDOR_ID_JMICRON && pdev->device == 0x2361 &&
+           port_map != 1) {
+               dev_printk(KERN_INFO, &pdev->dev,
+                          "JMB361 has only one port, port_map 0x%x -> 0x%x\n",
+                          port_map, 1);
+               port_map = 1;
+       }
+
        /*
         * Temporary Marvell 6145 hack: PATA port presence
         * is asserted through the standard AHCI port