lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 2 Oct 2013 12:49:23 +0200 From: Alexander Gordeev <agordeev@...hat.com> To: linux-kernel@...r.kernel.org Cc: Alexander Gordeev <agordeev@...hat.com>, Bjorn Helgaas <bhelgaas@...gle.com>, Ralf Baechle <ralf@...ux-mips.org>, Michael Ellerman <michael@...erman.id.au>, Benjamin Herrenschmidt <benh@...nel.crashing.org>, Martin Schwidefsky <schwidefsky@...ibm.com>, Ingo Molnar <mingo@...hat.com>, Tejun Heo <tj@...nel.org>, Dan Williams <dan.j.williams@...el.com>, Andy King <acking@...are.com>, Jon Mason <jon.mason@...el.com>, Matt Porter <mporter@...nel.crashing.org>, linux-pci@...r.kernel.org, linux-mips@...ux-mips.org, linuxppc-dev@...ts.ozlabs.org, linux390@...ibm.com, linux-s390@...r.kernel.org, x86@...nel.org, linux-ide@...r.kernel.org, iss_storagedev@...com, linux-nvme@...ts.infradead.org, linux-rdma@...r.kernel.org, netdev@...r.kernel.org, e1000-devel@...ts.sourceforge.net, linux-driver@...gic.com, Solarflare linux maintainers <linux-net-drivers@...arflare.com>, "VMware, Inc." <pv-drivers@...are.com>, linux-scsi@...r.kernel.org Subject: [PATCH RFC 67/77] rapidio: Update MSI/MSI-X interrupts enablement code 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 <agordeev@...hat.com> --- 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 netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists