From: Maciej Kwapulinski <maciej.kwapulinski@linux.intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Arnd Bergmann <arnd@arndb.de>, Jonathan Corbet <corbet@lwn.net>,
Derek Kiernan <derek.kiernan@xilinx.com>,
Dragan Cvetic <dragan.cvetic@xilinx.com>,
Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
Maciej Kwapulinski <maciej.kwapulinski@linux.intel.com>,
Savo Novakovic <savox.novakovic@intel.com>,
Tomasz Jankowski <tomasz1.jankowski@intel.com>,
Jianxun Zhang <jianxun.zhang@linux.intel.com>
Subject: [PATCH v3 10/14] intel_gna: add interrupt handler
Date: Thu, 13 May 2021 13:00:36 +0200 [thread overview]
Message-ID: <20210513110040.2268-11-maciej.kwapulinski@linux.intel.com> (raw)
In-Reply-To: <20210513110040.2268-1-maciej.kwapulinski@linux.intel.com>
An interrupt is generated by the hardware when a scoring job is
done. The interrupt handler wakes up the work queue to resume
the processing on the current request.
Signed-off-by: Maciej Kwapulinski <maciej.kwapulinski@linux.intel.com>
Tested-by: Savo Novakovic <savox.novakovic@intel.com>
Co-developed-by: Tomasz Jankowski <tomasz1.jankowski@intel.com>
Signed-off-by: Tomasz Jankowski <tomasz1.jankowski@intel.com>
Co-developed-by: Jianxun Zhang <jianxun.zhang@linux.intel.com>
Signed-off-by: Jianxun Zhang <jianxun.zhang@linux.intel.com>
---
drivers/misc/intel/gna/device.c | 20 ++++++++++++++++++-
drivers/misc/intel/gna/device.h | 2 +-
drivers/misc/intel/gna/pci.c | 35 ++++++++++++++++++++++++++++++++-
3 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/drivers/misc/intel/gna/device.c b/drivers/misc/intel/gna/device.c
index ca988d3ec408..75d8e1675485 100644
--- a/drivers/misc/intel/gna/device.c
+++ b/drivers/misc/intel/gna/device.c
@@ -3,6 +3,7 @@
#include <linux/device.h>
#include <linux/dma-mapping.h>
+#include <linux/interrupt.h>
#include <linux/module.h>
#include "device.h"
@@ -23,6 +24,16 @@ static void gna_devm_idr_destroy(void *data)
idr_destroy(idr);
}
+static irqreturn_t gna_interrupt(int irq, void *priv)
+{
+ struct gna_private *gna_priv;
+
+ gna_priv = (struct gna_private *)priv;
+ gna_priv->dev_busy = false;
+ wake_up(&gna_priv->dev_busy_waitq);
+ return IRQ_HANDLED;
+}
+
static void gna_devm_destroy_workqueue(void *data)
{
struct workqueue_struct *request_wq = data;
@@ -51,7 +62,7 @@ static int gna_devm_create_singlethread_workqueue(struct gna_private *gna_priv)
return ret;
}
-int gna_probe(struct device *parent, struct gna_dev_info *dev_info, void __iomem *iobase)
+int gna_probe(struct device *parent, struct gna_dev_info *dev_info, void __iomem *iobase, int irq)
{
static atomic_t dev_last_idx = ATOMIC_INIT(-1);
struct gna_private *gna_priv;
@@ -124,6 +135,13 @@ int gna_probe(struct device *parent, struct gna_dev_info *dev_info, void __iomem
if (ret)
return ret;
+ ret = devm_request_irq(parent, irq, gna_interrupt,
+ IRQF_SHARED, dev_misc_name, gna_priv);
+ if (ret) {
+ dev_err(parent, "could not register for interrupt\n");
+ return ret;
+ }
+
return 0;
}
diff --git a/drivers/misc/intel/gna/device.h b/drivers/misc/intel/gna/device.h
index 65856d08729f..d3c86d649b5c 100644
--- a/drivers/misc/intel/gna/device.h
+++ b/drivers/misc/intel/gna/device.h
@@ -70,7 +70,7 @@ struct gna_private {
struct mutex memidr_lock;
};
-int gna_probe(struct device *parent, struct gna_dev_info *dev_info, void __iomem *iobase);
+int gna_probe(struct device *parent, struct gna_dev_info *dev_info, void __iomem *iobase, int irq);
static inline u32 gna_reg_read(struct gna_private *gna_priv, u32 reg)
{
diff --git a/drivers/misc/intel/gna/pci.c b/drivers/misc/intel/gna/pci.c
index 525e9de9d577..a31f0142a4f2 100644
--- a/drivers/misc/intel/gna/pci.c
+++ b/drivers/misc/intel/gna/pci.c
@@ -69,10 +69,33 @@ static const struct pci_device_id gna_pci_ids[] = {
{ }
};
+static void gna_pcim_free_irq_vectors(void *data)
+{
+ struct pci_dev *pcidev = data;
+
+ pci_free_irq_vectors(pcidev);
+}
+
+static int gna_pcim_alloc_irq_vectors(struct pci_dev *pcidev)
+{
+ int ret;
+
+ ret = pci_alloc_irq_vectors(pcidev, 1, 1, PCI_IRQ_ALL_TYPES);
+ if (ret < 0)
+ return ret;
+
+ ret = devm_add_action(&pcidev->dev, gna_pcim_free_irq_vectors, pcidev);
+ if (ret)
+ gna_pcim_free_irq_vectors(pcidev);
+
+ return ret;
+}
+
int gna_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pci_id)
{
struct gna_dev_info *dev_info;
void __iomem *iobase;
+ int irq;
int ret;
ret = pcim_enable_device(pcidev);
@@ -91,9 +114,19 @@ int gna_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pci_id)
pci_set_master(pcidev);
+ ret = gna_pcim_alloc_irq_vectors(pcidev);
+ if (ret < 0)
+ return ret;
+
+ irq = pci_irq_vector(pcidev, 0);
+ if (unlikely(irq < 0)) {
+ dev_err(&pcidev->dev, "could not get irq number\n");
+ return -EIO;
+ }
+
dev_info = (struct gna_dev_info *)pci_id->driver_data;
- ret = gna_probe(&pcidev->dev, dev_info, iobase);
+ ret = gna_probe(&pcidev->dev, dev_info, iobase, irq);
if (ret) {
dev_err(&pcidev->dev, "could not initialize device\n");
return ret;
--
2.28.0
next prev parent reply other threads:[~2021-05-13 11:03 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-13 11:00 [PATCH v3 00/14] Driver of Intel(R) Gaussian & Neural Accelerator Maciej Kwapulinski
2021-05-13 11:00 ` [PATCH v3 01/14] intel_gna: add driver module Maciej Kwapulinski
2021-05-13 11:13 ` Greg Kroah-Hartman
2021-05-13 11:00 ` [PATCH v3 02/14] intel_gna: add component of hardware operation Maciej Kwapulinski
2021-05-13 11:15 ` Greg Kroah-Hartman
2021-05-13 11:00 ` [PATCH v3 03/14] intel_gna: read hardware info in the driver Maciej Kwapulinski
2021-05-13 11:00 ` [PATCH v3 04/14] intel_gna: add memory handling Maciej Kwapulinski
2021-05-13 11:00 ` [PATCH v3 05/14] intel_gna: initialize mmu Maciej Kwapulinski
2021-05-13 11:00 ` [PATCH v3 06/14] intel_gna: add hardware ids Maciej Kwapulinski
2021-05-13 11:00 ` [PATCH v3 07/14] intel_gna: add request component Maciej Kwapulinski
2021-05-13 11:00 ` [PATCH v3 08/14] intel_gna: implement scoring Maciej Kwapulinski
2021-05-13 11:00 ` [PATCH v3 09/14] intel_gna: add a work queue to process scoring requests Maciej Kwapulinski
2021-05-13 11:00 ` Maciej Kwapulinski [this message]
2021-05-13 11:00 ` [PATCH v3 11/14] intel_gna: add ioctl handler Maciej Kwapulinski
2021-05-13 11:24 ` Greg Kroah-Hartman
2021-05-14 8:20 ` Maciej Kwapulinski
2021-05-14 8:32 ` Greg Kroah-Hartman
2021-05-24 10:43 ` Maciej Kwapulinski
2021-05-24 10:49 ` Greg Kroah-Hartman
2021-05-25 7:50 ` Maciej Kwapulinski
2021-05-13 14:16 ` Matthew Wilcox
[not found] ` <20210514101253.1037-1-hdanton@sina.com>
2021-05-14 15:06 ` Maciej Kwapulinski
2021-05-13 11:00 ` [PATCH v3 12/14] intel_gna: add a 'misc' device Maciej Kwapulinski
2021-05-13 11:18 ` Greg Kroah-Hartman
2021-05-13 17:06 ` Maciej Kwapulinski
2021-05-13 17:15 ` Greg Kroah-Hartman
2021-05-13 11:00 ` [PATCH v3 13/14] intel_gna: add file operations to " Maciej Kwapulinski
2021-05-13 11:19 ` Greg Kroah-Hartman
2021-05-13 11:00 ` [PATCH v3 14/14] intel_gna: add power management Maciej Kwapulinski
2021-05-14 8:34 ` [PATCH v3 00/14] Driver of Intel(R) Gaussian & Neural Accelerator Greg Kroah-Hartman
2021-05-14 9:00 ` Arnd Bergmann
2021-05-17 7:40 ` Daniel Vetter
2021-05-17 8:00 ` Greg Kroah-Hartman
2021-05-17 8:49 ` Daniel Vetter
2021-05-17 8:55 ` Greg Kroah-Hartman
2021-05-17 9:12 ` Daniel Vetter
2021-05-17 18:04 ` Dave Airlie
2021-05-17 19:12 ` Thomas Zimmermann
2021-05-17 19:23 ` Alex Deucher
2021-05-17 19:39 ` Daniel Vetter
2021-05-17 19:49 ` Thomas Zimmermann
2021-05-17 20:00 ` Daniel Vetter
2021-05-17 20:15 ` Thomas Zimmermann
2021-05-17 19:32 ` Daniel Stone
2021-05-17 20:10 ` Thomas Zimmermann
2021-05-17 21:24 ` Daniel Vetter
2021-05-17 21:36 ` Dave Airlie
2021-06-16 7:38 ` Maciej Kwapulinski
2022-06-20 9:49 ` maciej.kwapulinski
2022-06-20 9:56 ` Greg KH
2022-06-20 10:08 ` Maciej Kwapulinski
2022-06-20 10:26 ` Greg KH
2022-06-25 17:25 ` Daniel Vetter
2021-05-20 11:58 ` Linus Walleij
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=20210513110040.2268-11-maciej.kwapulinski@linux.intel.com \
--to=maciej.kwapulinski@linux.intel.com \
--cc=andy.shevchenko@gmail.com \
--cc=arnd@arndb.de \
--cc=corbet@lwn.net \
--cc=derek.kiernan@xilinx.com \
--cc=dragan.cvetic@xilinx.com \
--cc=gregkh@linuxfoundation.org \
--cc=jianxun.zhang@linux.intel.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=savox.novakovic@intel.com \
--cc=tomasz1.jankowski@intel.com \
/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).