csiostor: Use pci_enable_msix_range() instead of pci_enable_msix() (6b733521) · Commits · 戴 / test

drivers/scsi/csiostor/csio_hw.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ enum {
		};

		struct csio_msix_entries {
		unsigned short vector; /* Vector assigned by pci_enable_msix */
		unsigned short vector; /* Assigned MSI-X vector */
		void dev_id; / Priv object associated w/ this msix*/
		char desc[24]; /* Description of this vector */
		};

+9 −13

Original line number	Diff line number	Diff line
		@@ -499,7 +499,7 @@ csio_reduce_sqsets(struct csio_hw *hw, int cnt)
		static int
		csio_enable_msix(struct csio_hw *hw)
		{
		int rv, i, j, k, n, min, cnt;
		int i, j, k, n, min, cnt;
		struct csio_msix_entries *entryp;
		struct msix_entry *entries;
		int extra = CSIO_EXTRA_VECS;
		@@ -521,20 +521,16 @@ 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;
		if (!rv) {
		cnt = pci_enable_msix_range(hw->pdev, entries, min, cnt);
		if (cnt < 0) {
		kfree(entries);
		return cnt;
		}

		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 -ENOMEM;
		}

		/* Save off vectors */
		for (i = 0; i < cnt; i++) {