From patchwork Sat Jun 8 08:00:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shane Huang X-Patchwork-Id: 249932 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4ED762C02EF for ; Sat, 8 Jun 2013 18:02:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751413Ab3FHICS (ORCPT ); Sat, 8 Jun 2013 04:02:18 -0400 Received: from [207.46.163.27] ([207.46.163.27]:54906 "EHLO co9outboundpool.messaging.microsoft.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751397Ab3FHICQ (ORCPT ); Sat, 8 Jun 2013 04:02:16 -0400 Received: from mail5-co9-R.bigfish.com (10.236.132.238) by CO9EHSOBE041.bigfish.com (10.236.130.104) with Microsoft SMTP Server id 14.1.225.23; Sat, 8 Jun 2013 08:01:05 +0000 Received: from mail5-co9 (localhost [127.0.0.1]) by mail5-co9-R.bigfish.com (Postfix) with ESMTP id 7213160172; Sat, 8 Jun 2013 08:01:05 +0000 (UTC) X-Forefront-Antispam-Report: CIP:163.181.249.108; KIP:(null); UIP:(null); IPV:NLI; H:ausb3twp01.amd.com; RD:none; EFVD:NLI X-SpamScore: 1 X-BigFish: VPS1(zzzz1f42h1ee6h1de0h1fdah1202h1e76h1d1ah1d2ah1fc6hzz177df4h17326ah8275eh8275bh8275dha1495iz2dh668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1d0ch1d2eh1d3fh1dc1h1dfeh1dffh1e1dh1e23h1155h) Received: from mail5-co9 (localhost.localdomain [127.0.0.1]) by mail5-co9 (MessageSwitch) id 1370678462738369_31968; Sat, 8 Jun 2013 08:01:02 +0000 (UTC) Received: from CO9EHSMHS017.bigfish.com (unknown [10.236.132.248]) by mail5-co9.bigfish.com (Postfix) with ESMTP id B20F62A006A; Sat, 8 Jun 2013 08:01:02 +0000 (UTC) Received: from ausb3twp01.amd.com (163.181.249.108) by CO9EHSMHS017.bigfish.com (10.236.130.27) with Microsoft SMTP Server id 14.1.225.23; Sat, 8 Jun 2013 08:01:02 +0000 X-WSS-ID: 0MO2E9N-01-8MW-02 X-M-MSG: Received: from sausexedgep01.amd.com (sausexedgep01-ext.amd.com [163.181.249.72]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ausb3twp01.amd.com (Axway MailGate 3.8.1) with ESMTP id 226601028073; Sat, 8 Jun 2013 03:00:59 -0500 (CDT) Received: from SAUSEXDAG02.amd.com (163.181.55.2) by sausexedgep01.amd.com (163.181.36.54) with Microsoft SMTP Server (TLS) id 8.3.192.1; Sat, 8 Jun 2013 03:12:31 -0500 Received: from SCYBEXDAG04.amd.com (10.34.11.14) by sausexdag02.amd.com (163.181.55.2) with Microsoft SMTP Server (TLS) id 14.2.328.9; Sat, 8 Jun 2013 03:00:59 -0500 Received: from shane-Annapurna.amd.com (10.237.74.105) by SCYBEXDAG04.amd.com (10.34.11.14) with Microsoft SMTP Server id 14.2.328.9; Sat, 8 Jun 2013 16:00:57 +0800 From: Shane Huang To: Tejun Heo CC: Yu Liu , , , Shane Huang Subject: [PATCH] ahci: remove pmp link online check in FBS EH Date: Sat, 8 Jun 2013 16:00:16 +0800 Message-ID: <1370678416-2133-1-git-send-email-shane.huang@amd.com> X-Mailer: git-send-email 1.8.1.2 MIME-Version: 1.0 X-OriginatorOrg: amd.com Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org 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 Cc: stable@vger.kernel.org --- 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 a70ff15..7b9bdd8 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; }