diff options
author | Shane Huang <shane.huang@amd.com> | 2013-06-08 16:00:16 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-21 18:19:01 -0700 |
commit | 9d57dc4b0be6fe82b22dc310724a79a728b48147 (patch) | |
tree | a7918fccb69de44cdb8d0e19b80021ad188f7bd0 | |
parent | 722804f129921e1d8c134b1bb7a594de395e3210 (diff) | |
download | lwn-9d57dc4b0be6fe82b22dc310724a79a728b48147.tar.gz lwn-9d57dc4b0be6fe82b22dc310724a79a728b48147.zip |
ahci: remove pmp link online check in FBS EH
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/ata/libahci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index f9eaa82311a9..47a1fb85ff0c 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -1543,8 +1543,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; } |