From patchwork Wed Oct 2 10:48:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 2978081 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EB82EBFF0B for ; Wed, 2 Oct 2013 18:01:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D56AC2038B for ; Wed, 2 Oct 2013 18:01:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B841B20190 for ; Wed, 2 Oct 2013 18:01:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754171Ab3JBSA0 (ORCPT ); Wed, 2 Oct 2013 14:00:26 -0400 Received: from 221-186-24-89.in-addr.arpa ([89.24.186.221]:27271 "EHLO dhcp-26-207.brq.redhat.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753650Ab3JBSAX (ORCPT ); Wed, 2 Oct 2013 14:00:23 -0400 Received: from dhcp-26-207.brq.redhat.com (localhost [127.0.0.1]) by dhcp-26-207.brq.redhat.com (8.14.5/8.14.5) with ESMTP id r92As0PS002463; Wed, 2 Oct 2013 12:54:01 +0200 Received: (from agordeev@localhost) by dhcp-26-207.brq.redhat.com (8.14.5/8.14.5/Submit) id r92Arx7n002462; Wed, 2 Oct 2013 12:53:59 +0200 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , Bjorn Helgaas , Ralf Baechle , Michael Ellerman , Benjamin Herrenschmidt , Martin Schwidefsky , Ingo Molnar , Tejun Heo , Dan Williams , Andy King , Jon Mason , Matt Porter , stable@vger.kernel.org, linux-pci@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org, linux390@de.ibm.com, linux-s390@vger.kernel.org, x86@kernel.org, linux-ide@vger.kernel.org, iss_storagedev@hp.com, linux-nvme@lists.infradead.org, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net, linux-driver@qlogic.com, Solarflare linux maintainers , "VMware, Inc." , linux-scsi@vger.kernel.org Subject: [PATCH RFC 18/77] cciss: Fallback to single MSI mode in case MSI-X failed Date: Wed, 2 Oct 2013 12:48:34 +0200 Message-Id: X-Mailer: git-send-email 1.7.7.6 In-Reply-To: References: Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Alexander Gordeev --- drivers/block/cciss.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index bf11540..0eea035 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -4081,7 +4081,7 @@ static void cciss_interrupt_mode(ctlr_info_t *h) if (pci_find_capability(h->pdev, PCI_CAP_ID_MSIX)) { err = pci_msix_table_size(h->pdev); if (err < ARRAY_SIZE(cciss_msix_entries)) - goto default_int_mode; + goto single_msi_mode; err = pci_enable_msix(h->pdev, cciss_msix_entries, ARRAY_SIZE(cciss_msix_entries)); if (!err) { @@ -4093,8 +4093,8 @@ static void cciss_interrupt_mode(ctlr_info_t *h) return; } dev_warn(&h->pdev->dev, "MSI-X init failed %d\n", err); - goto default_int_mode; } +single_msi_mode: if (pci_find_capability(h->pdev, PCI_CAP_ID_MSI)) { if (!pci_enable_msi(h->pdev)) h->msi_vector = 1;