linux-mips
[Top] [All Lists]

[PATCH RFC 64/77] qlcnic: Make MSI-X initialization routine bit more rea

To: linux-kernel@vger.kernel.org
Subject: [PATCH RFC 64/77] qlcnic: Make MSI-X initialization routine bit more readable
From: Alexander Gordeev <agordeev@redhat.com>
Date: Wed, 2 Oct 2013 12:49:20 +0200
Cc: Alexander Gordeev <agordeev@redhat.com>, Bjorn Helgaas <bhelgaas@google.com>, Ralf Baechle <ralf@linux-mips.org>, Michael Ellerman <michael@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Martin Schwidefsky <schwidefsky@de.ibm.com>, Ingo Molnar <mingo@redhat.com>, Tejun Heo <tj@kernel.org>, Dan Williams <dan.j.williams@intel.com>, Andy King <acking@vmware.com>, Jon Mason <jon.mason@intel.com>, Matt Porter <mporter@kernel.crashing.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 <linux-net-drivers@solarflare.com>, "VMware, Inc." <pv-drivers@vmware.com>, linux-scsi@vger.kernel.org
In-reply-to: <cover.1380703262.git.agordeev@redhat.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <cover.1380703262.git.agordeev@redhat.com>
Sender: linux-mips-bounce@linux-mips.org
Signed-off-by: Alexander Gordeev <agordeev@redhat.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


<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH RFC 64/77] qlcnic: Make MSI-X initialization routine bit more readable, Alexander Gordeev <=