From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dhcp-26-207.brq.redhat.com (unknown [89.24.186.221]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 99DC02C112F for ; Thu, 3 Oct 2013 03:58:31 +1000 (EST) From: Alexander Gordeev To: linux-kernel@vger.kernel.org Subject: [PATCH RFC 32/77] hpsa: Fallback to single MSI mode in case MSI-X failed Date: Wed, 2 Oct 2013 12:48:48 +0200 Message-Id: In-Reply-To: References: Cc: linux-mips@linux-mips.org, "VMware, Inc." , linux-nvme@lists.infradead.org, linux-ide@vger.kernel.org, stable@vger.kernel.org, linux-s390@vger.kernel.org, Andy King , linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org, x86@kernel.org, Alexander Gordeev , linux-pci@vger.kernel.org, iss_storagedev@hp.com, linux-driver@qlogic.com, Tejun Heo , Bjorn Helgaas , Dan Williams , Jon Mason , Ingo Molnar , Solarflare linux maintainers , netdev@vger.kernel.org, Ralf Baechle , e1000-devel@lists.sourceforge.net, Martin Schwidefsky , linux390@de.ibm.com, linuxppc-dev@lists.ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Signed-off-by: Alexander Gordeev --- drivers/scsi/hpsa.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index eb17b3d..252b65d 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -4112,7 +4112,7 @@ static void hpsa_interrupt_mode(struct ctlr_info *h) err = pci_msix_table_size(h->pdev); if (err < ARRAY_SIZE(hpsa_msix_entries)) - goto default_int_mode; + goto single_msi_mode; for (i = 0; i < ARRAY_SIZE(hpsa_msix_entries); i++) { hpsa_msix_entries[i].vector = 0; @@ -4128,8 +4128,9 @@ static void hpsa_interrupt_mode(struct ctlr_info *h) return; } dev_warn(&h->pdev->dev, "MSI-X init failed %d\n", err); - goto default_int_mode; + goto single_msi_mode; } +single_msi_mode: if (pci_find_capability(h->pdev, PCI_CAP_ID_MSI)) { dev_info(&h->pdev->dev, "MSI\n"); if (!pci_enable_msi(h->pdev)) -- 1.7.7.6