Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754643Ab3JBRAf (ORCPT ); Wed, 2 Oct 2013 13:00:35 -0400 Received: from 221-186-24-89.in-addr.arpa ([89.24.186.221]:25420 "EHLO dhcp-26-207.brq.redhat.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753937Ab3JBRAd (ORCPT ); Wed, 2 Oct 2013 13:00:33 -0400 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 , 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 67/77] rapidio: Update MSI/MSI-X interrupts enablement code Date: Wed, 2 Oct 2013 12:49:23 +0200 Message-Id: X-Mailer: git-send-email 1.7.7.6 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2087 Lines: 69 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. Signed-off-by: Alexander Gordeev --- drivers/rapidio/devices/tsi721.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c index ff7cbf2..5edd920 100644 --- a/drivers/rapidio/devices/tsi721.c +++ b/drivers/rapidio/devices/tsi721.c @@ -734,6 +734,16 @@ static int tsi721_enable_msix(struct tsi721_device *priv) int err; int i; + err = pci_msix_table_size(priv->pdev); + if (err < 0) + goto err_out; + if (err < ARRAY_SIZE(entries)) { + dev_info(&priv->pdev->dev, + "Only %d MSI-X vectors available, not using MSI-X\n", + err); + return -ENOSPC; + } + entries[TSI721_VECT_IDB].entry = TSI721_MSIX_SR2PC_IDBQ_RCV(IDB_QUEUE); entries[TSI721_VECT_PWRX].entry = TSI721_MSIX_SRIO_MAC_INT; @@ -769,16 +779,8 @@ static int tsi721_enable_msix(struct tsi721_device *priv) #endif /* CONFIG_RAPIDIO_DMA_ENGINE */ err = pci_enable_msix(priv->pdev, entries, ARRAY_SIZE(entries)); - if (err) { - if (err > 0) - dev_info(&priv->pdev->dev, - "Only %d MSI-X vectors available, " - "not using MSI-X\n", err); - else - dev_err(&priv->pdev->dev, - "Failed to enable MSI-X (err=%d)\n", err); - return err; - } + if (err) + goto err_out; /* * Copy MSI-X vector information into tsi721 private structure @@ -833,6 +835,11 @@ static int tsi721_enable_msix(struct tsi721_device *priv) #endif /* CONFIG_RAPIDIO_DMA_ENGINE */ return 0; + +err_out: + dev_err(&priv->pdev->dev, + "Failed to enable MSI-X (err=%d)\n", err); + return err; } #endif /* CONFIG_PCI_MSI */ -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/