From: Dennis Chen <dennis.chen@arm.com>
Date: Thu, 1 Dec 2016 02:15:04 +0000 (+0800)
Subject: PCI/MSI: Return -ENOSPC if pci_enable_msi_range() can't get enough vectors
X-Git-Tag: v4.11-rc1~92^2~21^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=948b7620c15411444167a62cfc14cdd4b0e44682;p=karo-tx-linux.git

PCI/MSI: Return -ENOSPC if pci_enable_msi_range() can't get enough vectors

If device doesn't support as many MSI vectors as the driver requested, we
previously returned -EINVAL from __pci_enable_msi_range() and
pci_enable_msi_range().  In other similar situations in both
__pci_enable_msi_range() and __pci_enable_msix_range(), we returned
-ENOSPC.

Return -ENOSPC from __pci_enable_msi_range() so we do it consistently.

[bhelgaas: changelog]
Signed-off-by: Dennis Chen <dennis.chen@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Tejun Heo <tj@kernel.org>
CC: Christoph Hellwig <hch@lst.de>
CC: Tom Long Nguyen <tom.l.nguyen@intel.com>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Marc Zyngier <marc.zyngier@arm.com>
CC: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
CC: Steve Capper <steve.capper@arm.com>
---

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 52ac675f0bd7..93cc268c6ff1 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -1065,7 +1065,7 @@ static int __pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec,
 	if (nvec < 0)
 		return nvec;
 	if (nvec < minvec)
-		return -EINVAL;
+		return -ENOSPC;
 
 	if (nvec > maxvec)
 		nvec = maxvec;