Commit 7276883f authored Jul 09, 2014 by Sebastian Ott Committed by Greg Kroah-Hartman Jul 09, 2014

misc/GenWQE: fix pci_enable_msi usage



GenWQE used to call pci_enable_msi_block to allocate a desired number
of MSI's. If that was not possible pci_enable_msi_block returned with a
smaller number which might be possible to allocate. GenWQE then called
pci_enable_msi_block with that number.

Since commit a30d0108
"GenWQE: Use pci_enable_msi_exact() instead of pci_enable_msi_block()"
pci_enable_msi_exact is used which fails if the desired number of MSI's
was not possible to allocate. Change GenWQE to use pci_enable_msi_range
to restore the old behavior.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Reviewed-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent d584f69d

drivers/misc/genwqe/card_ddcb.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1251,9 +1251,7 @@ int genwqe_setup_service_layer(struct genwqe_dev *cd)
		}

		rc = genwqe_set_interrupt_capability(cd, GENWQE_MSI_IRQS);
		if (rc > 0)
		rc = genwqe_set_interrupt_capability(cd, rc);
		if (rc != 0) {
		if (rc) {
		rc = -ENODEV;
		goto stop_kthread;
		}

drivers/misc/genwqe/card_utils.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -728,10 +728,12 @@ int genwqe_set_interrupt_capability(struct genwqe_dev *cd, int count)
		int rc;
		struct pci_dev *pci_dev = cd->pci_dev;

		rc = pci_enable_msi_exact(pci_dev, count);
		if (rc == 0)
		cd->flags \|= GENWQE_FLAG_MSI_ENABLED;
		rc = pci_enable_msi_range(pci_dev, 1, count);
		if (rc < 0)
		return rc;

		cd->flags \|= GENWQE_FLAG_MSI_ENABLED;
		return 0;
		}

		/**