| 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:20 +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 64/77] qlcnic: Make MSI-X initialization routine bit more readable
Signed-off-by: Alexander Gordeev <agordeev@...hat.com>
---
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 112 +++++++++++-----------
1 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index a137c14..8510457 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -568,7 +568,7 @@ int qlcnic_enable_msix(struct qlcnic_adapter *adapter, u32 num_msix)
{
struct pci_dev *pdev = adapter->pdev;
int max_tx_rings, max_sds_rings, tx_vector;
- int err = -EINVAL, i;
+ int err, i;
if (adapter->flags & QLCNIC_TX_INTR_SHARED) {
max_tx_rings = 0;
@@ -589,68 +589,68 @@ int qlcnic_enable_msix(struct qlcnic_adapter *adapter, u32 num_msix)
adapter->max_sds_rings = 1;
adapter->flags &= ~(QLCNIC_MSI_ENABLED | QLCNIC_MSIX_ENABLED);
- if (adapter->ahw->msix_supported) {
- err = pci_msix_table_size(pdev);
- if (err < 0)
+ if (!adapter->ahw->msix_supported)
+ return -EINVAL;
+
+ err = pci_msix_table_size(pdev);
+ if (err < 0)
+ goto fail;
+
+ if (err < num_msix) {
+ dev_info(&pdev->dev,
+ "Unable to allocate %d MSI-X interrupt vectors\n",
+ num_msix);
+ if (qlcnic_83xx_check(adapter)) {
+ if (err < (QLC_83XX_MINIMUM_VECTOR - tx_vector))
+ return -ENOSPC;
+ err -= (max_tx_rings + 1);
+ num_msix = rounddown_pow_of_two(err);
+ num_msix += (max_tx_rings + 1);
+ } else {
+ num_msix = rounddown_pow_of_two(err);
+ if (qlcnic_check_multi_tx(adapter))
+ num_msix += max_tx_rings;
+ }
+
+ if (!num_msix) {
+ err = -ENOSPC;
goto fail;
+ }
- if (err < num_msix) {
- dev_info(&pdev->dev,
- "Unable to allocate %d MSI-X interrupt vectors\n",
- num_msix);
- if (qlcnic_83xx_check(adapter)) {
- if (err < (QLC_83XX_MINIMUM_VECTOR - tx_vector))
- return -ENOSPC;
- err -= (max_tx_rings + 1);
- num_msix = rounddown_pow_of_two(err);
- num_msix += (max_tx_rings + 1);
- } else {
- num_msix = rounddown_pow_of_two(err);
- if (qlcnic_check_multi_tx(adapter))
- num_msix += max_tx_rings;
- }
+ dev_info(&pdev->dev,
+ "Trying to allocate %d MSI-X interrupt vectors\n",
+ num_msix);
+ }
- if (!num_msix) {
- err = -ENOSPC;
- goto fail;
- }
+ for (i = 0; i < num_msix; i++)
+ adapter->msix_entries[i].entry = i;
- dev_info(&pdev->dev,
- "Trying to allocate %d MSI-X interrupt vectors\n",
- num_msix);
- }
- }
+ err = pci_enable_msix(pdev, adapter->msix_entries, num_msix);
+ if (err)
+ goto fail;
- for (i = 0; i < num_msix; i++)
- adapter->msix_entries[i].entry = i;
- err = pci_enable_msix(pdev, adapter->msix_entries, num_msix);
- if (err == 0) {
- adapter->flags |= QLCNIC_MSIX_ENABLED;
- if (qlcnic_83xx_check(adapter)) {
- adapter->ahw->num_msix = num_msix;
- /* subtract mail box and tx ring vectors */
- adapter->max_sds_rings = num_msix -
- max_tx_rings - 1;
- } else {
- adapter->ahw->num_msix = num_msix;
- if (qlcnic_check_multi_tx(adapter) &&
- !adapter->ahw->diag_test &&
- (adapter->max_drv_tx_rings > 1))
- max_sds_rings = num_msix - max_tx_rings;
- else
- max_sds_rings = num_msix;
-
- adapter->max_sds_rings = max_sds_rings;
- }
- dev_info(&pdev->dev, "using msi-x interrupts\n");
- } else {
-fail:
- dev_info(&pdev->dev,
- "Unable to allocate %d MSI-X interrupt vectors\n",
- num_msix);
- }
+ adapter->flags |= QLCNIC_MSIX_ENABLED;
+ if (qlcnic_83xx_check(adapter)) {
+ adapter->ahw->num_msix = num_msix;
+ /* subtract mail box and tx ring vectors */
+ adapter->max_sds_rings = num_msix - max_tx_rings - 1;
+ } else {
+ adapter->ahw->num_msix = num_msix;
+ if (qlcnic_check_multi_tx(adapter) &&
+ !adapter->ahw->diag_test && (adapter->max_drv_tx_rings > 1))
+ max_sds_rings = num_msix - max_tx_rings;
+ else
+ max_sds_rings = num_msix;
+
+ adapter->max_sds_rings = max_sds_rings;
}
+ dev_info(&pdev->dev, "using msi-x interrupts\n");
+ return 0;
+
+fail:
+ dev_info(&pdev->dev,
+ "Unable to allocate %d MSI-X interrupt vectors\n", num_msix);
return err;
}
--
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