From: Alexander Gordeev <agordeev@redhat.com>
Date: Mon, 16 Dec 2013 08:34:54 +0000 (+0100)
Subject: s390/PCI: Fix single MSI only check
X-Git-Tag: v3.14-rc1~132^2~13^2~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a384c8924a8be3f5cf7dac06c04e9dd4a78b41df;p=~emulex%2Finfiniband.git

s390/PCI: Fix single MSI only check

Multiple MSIs have never been supported on s390 architecture, but the
platform code fails to report single MSI only.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index bf7c73d71ee..6f3788e3363 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -409,6 +409,8 @@ int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
 
 	if (type != PCI_CAP_ID_MSIX && type != PCI_CAP_ID_MSI)
 		return -EINVAL;
+	if (type == PCI_CAP_ID_MSI && nvec > 1)
+		return 1;
 	msi_vecs = min(nvec, ZPCI_MSI_VEC_MAX);
 	msi_vecs = min_t(unsigned int, msi_vecs, CONFIG_PCI_NR_MSI);