Add irq handler for tty interfaces to VK.  If irq not enable
poll method will still be used.

Signed-off-by: Scott Branden <scott.bran...@broadcom.com>
---
 drivers/misc/bcm-vk/bcm_vk.h     |  2 ++
 drivers/misc/bcm-vk/bcm_vk_dev.c | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/drivers/misc/bcm-vk/bcm_vk.h b/drivers/misc/bcm-vk/bcm_vk.h
index 084be53a9518..64894c77759e 100644
--- a/drivers/misc/bcm-vk/bcm_vk.h
+++ b/drivers/misc/bcm-vk/bcm_vk.h
@@ -8,6 +8,7 @@
 
 #include <linux/atomic.h>
 #include <linux/firmware.h>
+#include <linux/irq.h>
 #include <linux/kref.h>
 #include <linux/miscdevice.h>
 #include <linux/mutex.h>
@@ -484,6 +485,7 @@ int bcm_vk_release(struct inode *inode, struct file 
*p_file);
 void bcm_vk_release_data(struct kref *kref);
 irqreturn_t bcm_vk_msgq_irqhandler(int irq, void *dev_id);
 irqreturn_t bcm_vk_notf_irqhandler(int irq, void *dev_id);
+irqreturn_t bcm_vk_tty_irqhandler(int irq, void *dev_id);
 int bcm_vk_msg_init(struct bcm_vk *vk);
 void bcm_vk_msg_remove(struct bcm_vk *vk);
 void bcm_vk_drain_msg_on_reset(struct bcm_vk *vk);
diff --git a/drivers/misc/bcm-vk/bcm_vk_dev.c b/drivers/misc/bcm-vk/bcm_vk_dev.c
index 76fe58fc98e2..18e11c8633fd 100644
--- a/drivers/misc/bcm-vk/bcm_vk_dev.c
+++ b/drivers/misc/bcm-vk/bcm_vk_dev.c
@@ -1338,6 +1338,19 @@ static int bcm_vk_probe(struct pci_dev *pdev, const 
struct pci_device_id *ent)
        }
        vk->num_irqs++;
 
+       for (i = 0;
+            (i < VK_MSIX_TTY_MAX) && (vk->num_irqs < irq);
+            i++, vk->num_irqs++) {
+               err = devm_request_irq(dev, pci_irq_vector(pdev, vk->num_irqs),
+                                      bcm_vk_tty_irqhandler,
+                                      IRQF_SHARED, DRV_MODULE_NAME, vk);
+               if (err) {
+                       dev_err(dev, "failed request tty IRQ %d for MSIX %d\n",
+                               pdev->irq + vk->num_irqs, vk->num_irqs + 1);
+                       goto err_irq;
+               }
+               vk->tty[i].irq_enabled = true;
+       }
 
        id = ida_simple_get(&bcm_vk_ida, 0, 0, GFP_KERNEL);
        if (id < 0) {
-- 
2.17.1

Reply via email to