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:21:31 -0700 |
| commit | f4f391e86e14bcbc0ddcbca8a52b81cac7bf0c7c (patch) | |
| tree | 2d9df11065efca8292c1fcf0eef387f2642d5c17 /drivers/ata | |
| parent | 21e8e04d6f137aeab872fd9e0ef356dd1126deb4 (diff) | |
| download | linux-3.10-f4f391e86e14bcbc0ddcbca8a52b81cac7bf0c7c.tar.gz linux-3.10-f4f391e86e14bcbc0ddcbca8a52b81cac7bf0c7c.tar.bz2 linux-3.10-f4f391e86e14bcbc0ddcbca8a52b81cac7bf0c7c.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>
Diffstat (limited to 'drivers/ata')
| -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 a70ff154f58..7b9bdd822c6 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) 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; } |