[PATCH 1/2] genwqe: use pci_irq_allocate_vectors

[PATCH 1/2] genwqe: use pci_irq_allocate_vectors

[Gabriel Krisman Bertazi]

From: Christoph Hellwig <hch@lst.de>

Simply the interrupt setup by using the new PCI layer helpers.

One odd thing about this driver is that it looks like it could request
multiple MSI vectors, but it will then only ever use a single one.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
---
 drivers/misc/genwqe/card_base.h  |  1 -
 drivers/misc/genwqe/card_utils.c | 12 ++----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/drivers/misc/genwqe/card_base.h b/drivers/misc/genwqe/card_base.h
index cb851c14ca4b..5813b5f25006 100644
--- a/drivers/misc/genwqe/card_base.h
+++ b/drivers/misc/genwqe/card_base.h
@@ -41,7 +41,6 @@
 #include "genwqe_driver.h"
 
 #define GENWQE_MSI_IRQS			4  /* Just one supported, no MSIx */
-#define GENWQE_FLAG_MSI_ENABLED		(1 << 0)
 
 #define GENWQE_MAX_VFS			15 /* maximum 15 VFs are possible */
 #define GENWQE_MAX_FUNCS		16 /* 1 PF and 15 VFs */
diff --git a/drivers/misc/genwqe/card_utils.c b/drivers/misc/genwqe/card_utils.c
index 8a679ecc8fd1..be79f78da8f8 100644
--- a/drivers/misc/genwqe/card_utils.c
+++ b/drivers/misc/genwqe/card_utils.c
@@ -730,13 +730,10 @@ int genwqe_read_softreset(struct genwqe_dev *cd)
 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_range(pci_dev, 1, count);
+	rc = pci_alloc_irq_vectors(cd->pci_dev, 1, count, PCI_IRQ_MSI);
 	if (rc < 0)
 		return rc;
-
-	cd->flags |= GENWQE_FLAG_MSI_ENABLED;
 	return 0;
 }
 
@@ -746,12 +743,7 @@ int genwqe_set_interrupt_capability(struct genwqe_dev *cd, int count)
  */
 void genwqe_reset_interrupt_capability(struct genwqe_dev *cd)
 {
-	struct pci_dev *pci_dev = cd->pci_dev;
-
-	if (cd->flags & GENWQE_FLAG_MSI_ENABLED) {
-		pci_disable_msi(pci_dev);
-		cd->flags &= ~GENWQE_FLAG_MSI_ENABLED;
-	}
+	pci_free_irq_vectors(cd->pci_dev);
 }
 
 /**
-- 
2.7.4

[PATCH 2/2] MAINTAINERS: Add entry for genwqe driver

[Gabriel Krisman Bertazi]

Frank and I maintain this

Signed-off-by: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
Cc: haver@linux.vnet.ibm.com
---
 MAINTAINERS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index bd69bc0ed717..db20c3204606 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5220,6 +5220,12 @@ M:	Joe Perches <joe@perches.com>
 S:	Maintained
 F:	scripts/get_maintainer.pl
 
+GENWQE (IBM Generic Workqueue Card)
+M:	Frank Haverkamp <haver@linux.vnet.ibm.com>
+M:	Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
+S:	Supported
+F:	drivers/misc/genwqe/
+
 GFS2 FILE SYSTEM
 M:	Steven Whitehouse <swhiteho@redhat.com>
 M:	Bob Peterson <rpeterso@redhat.com>
-- 
2.7.4

Re: [PATCH 2/2] MAINTAINERS: Add entry for genwqe driver

[Frank Haverkamp]

Hi Gabriel,

> On 4 Oct 2016, at 20:26, Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com> wrote:
> 
> Frank and I maintain this
> 
> Signed-off-by: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
> Cc: haver@linux.vnet.ibm.com
> ---
> MAINTAINERS | 6 ++++++
> 1 file changed, 6 insertions(+)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index bd69bc0ed717..db20c3204606 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -5220,6 +5220,12 @@ M:	Joe Perches <joe@perches.com>
> S:	Maintained
> F:	scripts/get_maintainer.pl
> 
> +GENWQE (IBM Generic Workqueue Card)
> +M:	Frank Haverkamp <haver@linux.vnet.ibm.com>
> +M:	Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
> +S:	Supported
> +F:	drivers/misc/genwqe/
> +
> GFS2 FILE SYSTEM
> M:	Steven Whitehouse <swhiteho@redhat.com>
> M:	Bob Peterson <rpeterso@redhat.com>
> -- 
> 2.7.4
> 
Agreed.

Acked-by: Frank Haverkamp <haver@linux.vnet.ibm.com>