From: Alexander Gordeev <agordeev@redhat.com>
To: Alex Williamson <alex.williamson@redhat.com>
Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
linux-pci@vger.kernel.org
Subject: [PATCH v3 5/7] vfio: Use new interfaces for MSI/MSI-X enablement
Date: Fri, 10 Jan 2014 08:42:47 +0100 [thread overview]
Message-ID: <20140110074247.GA4883@dhcp-26-207.brq.redhat.com> (raw)
In-Reply-To: <1389188753.3209.156.camel@bling.home>
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
---
drivers/vfio/pci/vfio_pci_intrs.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c
index 641bc87..4a9db1d 100644
--- a/drivers/vfio/pci/vfio_pci_intrs.c
+++ b/drivers/vfio/pci/vfio_pci_intrs.c
@@ -482,15 +482,19 @@ static int vfio_msi_enable(struct vfio_pci_device *vdev, int nvec, bool msix)
for (i = 0; i < nvec; i++)
vdev->msix[i].entry = i;
- ret = pci_enable_msix(pdev, vdev->msix, nvec);
- if (ret) {
+ ret = pci_enable_msix_range(pdev, vdev->msix, 1, nvec);
+ if (ret < nvec) {
+ if (ret > 0)
+ pci_disable_msix(pdev);
kfree(vdev->msix);
kfree(vdev->ctx);
return ret;
}
} else {
- ret = pci_enable_msi_block(pdev, nvec);
- if (ret) {
+ ret = pci_enable_msi_range(pdev, 1, nvec);
+ if (ret < nvec) {
+ if (ret > 0)
+ pci_disable_msi(pdev);
kfree(vdev->ctx);
return ret;
}
--
1.7.7.6
--
Regards,
Alexander Gordeev
agordeev@redhat.com
next prev parent reply other threads:[~2014-01-10 7:40 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-07 18:05 [PATCH 0/7] Phase out pci_enable_msi_block() Alexander Gordeev
2014-01-07 18:05 ` [PATCH 1/7] ipr: Do not call pci_disable_msi/msix() if pci_enable_msi/msix() failed Alexander Gordeev
2014-01-07 18:05 ` [PATCH 2/7] ipr: Use new interfaces for MSI/MSI-X enablement Alexander Gordeev
2014-01-07 18:05 ` [PATCH 3/7] ahci: " Alexander Gordeev
2014-01-13 19:12 ` Bjorn Helgaas
2014-01-14 8:50 ` Alexander Gordeev
2014-01-14 8:54 ` Alexander Gordeev
2014-01-14 17:31 ` Bjorn Helgaas
2014-01-07 18:05 ` [PATCH 4/7] nvme: " Alexander Gordeev
2014-01-07 18:05 ` [PATCH 5/7] vfio: " Alexander Gordeev
2014-01-07 18:34 ` Alex Williamson
2014-01-08 7:42 ` Alexander Gordeev
2014-01-08 7:57 ` [PATCH v2 " Alexander Gordeev
2014-01-08 13:45 ` Alex Williamson
2014-01-10 7:42 ` Alexander Gordeev [this message]
2014-01-10 15:45 ` [PATCH v3 " Alex Williamson
2014-01-07 18:05 ` [PATCH 6/7] ath10k: Use new interfaces for MSI enablement Alexander Gordeev
2014-01-08 8:23 ` Kalle Valo
2014-01-08 9:04 ` Alexander Gordeev
2014-01-08 12:44 ` Kalle Valo
2014-01-07 18:05 ` [PATCH 7/7] wil6210: " Alexander Gordeev
2014-01-08 11:30 ` Vladimir Kondratiev
2014-01-08 11:54 ` Alexander Gordeev
2014-01-08 12:19 ` Vladimir Kondratiev
2014-01-08 12:34 ` Alexander Gordeev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140110074247.GA4883@dhcp-26-207.brq.redhat.com \
--to=agordeev@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).