[PATCH RFC 21/77] csiostor: Update MSI/MSI-X interrupts enablement code
From: Alexander Gordeev <hidden>
Date: 2013-10-02 16:51:50
Also in:
linux-ide, linux-mips, linux-pci, linux-rdma, linux-s390, linux-scsi, lkml, netdev
Subsystem:
scsi subsystem, the rest · Maintainers:
"James E.J. Bottomley", "Martin K. Petersen", Linus Torvalds
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 <redacted> --- drivers/scsi/csiostor/csio_isr.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/csiostor/csio_isr.c b/drivers/scsi/csiostor/csio_isr.c
index abf20ab..b8a840e 100644
--- a/drivers/scsi/csiostor/csio_isr.c
+++ b/drivers/scsi/csiostor/csio_isr.c@@ -512,6 +512,16 @@ csio_enable_msix(struct csio_hw *hw) if (hw->flags & CSIO_HWF_USING_SOFT_PARAMS || !csio_is_hw_master(hw)) cnt = min_t(uint8_t, hw->cfg_niq, cnt); + rv = pci_msix_table_size(hw->pdev); + if (rv < 0) + return rv; + + cnt = min(cnt, rv); + if (cnt < min) { + csio_info(hw, "Not using MSI-X, remainder:%d\n", rv); + return -ENOSPC; + } + entries = kzalloc(sizeof(struct msix_entry) * cnt, GFP_KERNEL); if (!entries) return -ENOMEM;
@@ -521,19 +531,15 @@ csio_enable_msix(struct csio_hw *hw) csio_dbg(hw, "FW supp #niq:%d, trying %d msix's\n", hw->cfg_niq, cnt); - while ((rv = pci_enable_msix(hw->pdev, entries, cnt)) >= min) - cnt = rv; + rv = pci_enable_msix(hw->pdev, entries, cnt); if (!rv) { if (cnt < (hw->num_sqsets + extra)) { csio_dbg(hw, "Reducing sqsets to %d\n", cnt - extra); csio_reduce_sqsets(hw, cnt - extra); } } else { - if (rv > 0) - csio_info(hw, "Not using MSI-X, remainder:%d\n", rv); - kfree(entries); - return -ENOSPC; + return rv; } /* Save off vectors */
--
1.7.7.6