* [PATCH] vmw_vmci: Use pci_enable_msix_range() instead of pci_enable_msix()
@ 2014-02-19 10:15 Alexander Gordeev
2014-02-23 6:50 ` [PATCH v2] vmw_vmci: Use pci_enable_msix_exact() " Alexander Gordeev
0 siblings, 1 reply; 2+ messages in thread
From: Alexander Gordeev @ 2014-02-19 10:15 UTC (permalink / raw)
To: linux-kernel
Cc: Alexander Gordeev, Greg Kroah-Hartman, Andy King,
Dmitry Torokhov, linux-pci
As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() and pci_enable_msix_range()
interfaces.
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andy King <acking@vmware.com>
Cc: Dmitry Torokhov <dtor@vmware.com>
Cc: linux-pci@vger.kernel.org
---
drivers/misc/vmw_vmci/vmci_guest.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/misc/vmw_vmci/vmci_guest.c b/drivers/misc/vmw_vmci/vmci_guest.c
index d35cda0..877ec8a 100644
--- a/drivers/misc/vmw_vmci/vmci_guest.c
+++ b/drivers/misc/vmw_vmci/vmci_guest.c
@@ -383,13 +383,18 @@ static int vmci_enable_msix(struct pci_dev *pdev,
vmci_dev->msix_entries[i].vector = i;
}
- result = pci_enable_msix(pdev, vmci_dev->msix_entries, VMCI_MAX_INTRS);
- if (result == 0)
+ result = pci_enable_msix_range(pdev, vmci_dev->msix_entries,
+ VMCI_MAX_INTRS, VMCI_MAX_INTRS);
+ if (result > 0) {
vmci_dev->exclusive_vectors = true;
- else if (result > 0)
- result = pci_enable_msix(pdev, vmci_dev->msix_entries, 1);
+ } else if (result == -ENOSPC) {
+ result = pci_enable_msix_range(pdev, vmci_dev->msix_entries,
+ 1, 1);
+ if (result < 0)
+ return result;
+ }
- return result;
+ return 0;
}
/*
--
1.7.7.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v2] vmw_vmci: Use pci_enable_msix_exact() instead of pci_enable_msix()
2014-02-19 10:15 [PATCH] vmw_vmci: Use pci_enable_msix_range() instead of pci_enable_msix() Alexander Gordeev
@ 2014-02-23 6:50 ` Alexander Gordeev
0 siblings, 0 replies; 2+ messages in thread
From: Alexander Gordeev @ 2014-02-23 6:50 UTC (permalink / raw)
To: linux-kernel; +Cc: Greg Kroah-Hartman, Andy King, Dmitry Torokhov, linux-pci
As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() or pci_enable_msi_exact()
and pci_enable_msix_range() or pci_enable_msix_exact()
interfaces.
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andy King <acking@vmware.com>
Cc: Dmitry Torokhov <dtor@vmware.com>
Cc: linux-pci@vger.kernel.org
---
drivers/misc/vmw_vmci/vmci_guest.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/misc/vmw_vmci/vmci_guest.c b/drivers/misc/vmw_vmci/vmci_guest.c
index d35cda0..e0d5017 100644
--- a/drivers/misc/vmw_vmci/vmci_guest.c
+++ b/drivers/misc/vmw_vmci/vmci_guest.c
@@ -383,11 +383,12 @@ static int vmci_enable_msix(struct pci_dev *pdev,
vmci_dev->msix_entries[i].vector = i;
}
- result = pci_enable_msix(pdev, vmci_dev->msix_entries, VMCI_MAX_INTRS);
+ result = pci_enable_msix_exact(pdev,
+ vmci_dev->msix_entries, VMCI_MAX_INTRS);
if (result == 0)
vmci_dev->exclusive_vectors = true;
- else if (result > 0)
- result = pci_enable_msix(pdev, vmci_dev->msix_entries, 1);
+ else if (result == -ENOSPC)
+ result = pci_enable_msix_exact(pdev, vmci_dev->msix_entries, 1);
return result;
}
--
1.7.7.6
--
Regards,
Alexander Gordeev
agordeev@redhat.com
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-02-23 6:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-19 10:15 [PATCH] vmw_vmci: Use pci_enable_msix_range() instead of pci_enable_msix() Alexander Gordeev
2014-02-23 6:50 ` [PATCH v2] vmw_vmci: Use pci_enable_msix_exact() " Alexander Gordeev
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.