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 C33222C008E for ; Thu, 3 Oct 2013 02:44:17 +1000 (EST) From: Alexander Gordeev To: linux-kernel@vger.kernel.org Subject: [PATCH RFC 42/77] lpfc: Update MSI/MSI-X interrupts enablement code Date: Wed, 2 Oct 2013 12:48:58 +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, 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: , As result of recent re-design of the MSI/MSI-X interrupts enabling pattern this driver has to be updated to use the new technique to obtain a optimal number of MSI/MSI-X interrupts required. Note, in case just one MSI-X vector was available the error message "0484 PCI enable MSI-X failed 1" is preserved to not break tools which might depend on it. Also, not sure why in case of multiple MSI-Xs mode failed the driver skips the single MSI-X mode and falls back to single MSI mode. Signed-off-by: Alexander Gordeev --- drivers/scsi/lpfc/lpfc_init.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 0803b84..d83a1a3 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -8639,13 +8639,17 @@ lpfc_sli4_enable_msix(struct lpfc_hba *phba) /* Configure MSI-X capability structure */ vectors = phba->cfg_fcp_io_channel; -enable_msix_vectors: - rc = pci_enable_msix(phba->pcidev, phba->sli4_hba.msix_entries, - vectors); - if (rc > 1) { - vectors = rc; - goto enable_msix_vectors; - } else if (rc) { + + rc = pci_msix_table_size(phba->pcidev); + if (rc < 0) + goto msg_fail_out; + + vectors = min(vectors, rc); + if (vectors > 1) + rc = pci_enable_msix(phba->pcidev, phba->sli4_hba.msix_entries, + vectors); + if (rc) { +msg_fail_out: lpfc_printf_log(phba, KERN_INFO, LOG_INIT, "0484 PCI enable MSI-X failed (%d)\n", rc); goto vec_fail_out; -- 1.7.7.6