ahci: remove pmp link online check in FBS EH
authorShane Huang <shane.huang@amd.com>
Sat, 8 Jun 2013 08:00:16 +0000 (16:00 +0800)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 27 Jul 2013 04:34:08 +0000 (05:34 +0100)
commit 912b9ac683b112615d5605686f1dc086402ce9f7 upstream.

ata_link_online() check in ahci_error_intr() is unnecessary, it should
be removed otherwise may lead to lockup with FBS enabled PMP.
http://marc.info/?l=linux-ide&m=137050421603272&w=2

Reported-by: Yu Liu <liuyu.ac@gmail.com>
Signed-off-by: Shane Huang <shane.huang@amd.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/ata/libahci.c

index 3c92dbd751e0d287e2c124aa28e828ef46ad1858..60def03da06e5fc12c9bfef99cfb81b0332e3622 100644 (file)
@@ -1541,8 +1541,7 @@ static void ahci_error_intr(struct ata_port *ap, u32 irq_stat)
                u32 fbs = readl(port_mmio + PORT_FBS);
                int pmp = fbs >> PORT_FBS_DWE_OFFSET;
 
-               if ((fbs & PORT_FBS_SDE) && (pmp < ap->nr_pmp_links) &&
-                   ata_link_online(&ap->pmp_link[pmp])) {
+               if ((fbs & PORT_FBS_SDE) && (pmp < ap->nr_pmp_links)) {
                        link = &ap->pmp_link[pmp];
                        fbs_need_dec = true;
                }