From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 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: Sender: linux-kernel-owner@vger.kernel.org List-ID: 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