aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorShane Huang <shane.huang@amd.com>2013-06-08 04:00:16 -0400
committerTejun Heo <tj@kernel.org>2013-06-09 17:54:32 -0400
commit912b9ac683b112615d5605686f1dc086402ce9f7 (patch)
treed41eaca8c3efdb62750b280d28871dd49c8d985f /drivers/ata
parent5ba59b59cb413b9d89f40532bad3529d5185dd3c (diff)
ahci: remove pmp link online check in FBS EH
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> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libahci.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index a70ff154f586..7b9bdd822c62 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -1560,8 +1560,7 @@ static void ahci_error_intr(struct ata_port *ap, u32 irq_stat)
1560 u32 fbs = readl(port_mmio + PORT_FBS); 1560 u32 fbs = readl(port_mmio + PORT_FBS);
1561 int pmp = fbs >> PORT_FBS_DWE_OFFSET; 1561 int pmp = fbs >> PORT_FBS_DWE_OFFSET;
1562 1562
1563 if ((fbs & PORT_FBS_SDE) && (pmp < ap->nr_pmp_links) && 1563 if ((fbs & PORT_FBS_SDE) && (pmp < ap->nr_pmp_links)) {
1564 ata_link_online(&ap->pmp_link[pmp])) {
1565 link = &ap->pmp_link[pmp]; 1564 link = &ap->pmp_link[pmp];
1566 fbs_need_dec = true; 1565 fbs_need_dec = true;
1567 } 1566 }