Return-Path: Message-Id: <20130813155836.670525358@goodmis.org> Date: Tue, 13 Aug 2013 11:58:15 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yu Liu , Shane Huang , Tejun Heo Subject: [81/88] ahci: remove pmp link online check in FBS EH References: <20130813155654.069291373@goodmis.org> Content-Disposition: inline; filename=0081-ahci-remove-pmp-link-online-check-in-FBS-EH.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.7-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Shane Huang [ Upstream commit 912b9ac683b112615d5605686f1dc086402ce9f7 ] 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 Signed-off-by: Shane Huang Signed-off-by: Tejun Heo Cc: stable@vger.kernel.org Signed-off-by: Steven Rostedt --- drivers/ata/libahci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 555c07a..48a946a 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -1544,8 +1544,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; } -- 1.7.10.4