From: Shijith Thotton <sthotton@marvell.com>
To: <virtualization@lists.linux.dev>, <mst@redhat.com>,
<jasowang@redhat.com>, <dan.carpenter@linaro.org>
Cc: "Shijith Thotton" <sthotton@marvell.com>,
schalla@marvell.com, vattunuru@marvell.com,
ndabilpuram@marvell.com, jerinj@marvell.com,
"Xuan Zhuo" <xuanzhuo@linux.alibaba.com>,
"Eugenio Pérez" <eperezma@redhat.com>,
"Satha Rao" <skoteshwar@marvell.com>,
"open list" <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 4/4] vdpa/octeon_ep: add interrupt handler for virtio crypto device
Date: Thu, 21 Nov 2024 19:09:46 +0530 [thread overview]
Message-ID: <20241121134002.990285-4-sthotton@marvell.com> (raw)
In-Reply-To: <20241121134002.990285-1-sthotton@marvell.com>
Introduced an interrupt handler for the virtio crypto device, as its
queue usage differs from that of network devices. While virtio network
device receives packets only on even-indexed queues, virtio crypto
device utilize all available queues for processing data.
Signed-off-by: Shijith Thotton <sthotton@marvell.com>
---
drivers/vdpa/octeon_ep/octep_vdpa_main.c | 52 +++++++++++++++++++++++-
1 file changed, 50 insertions(+), 2 deletions(-)
diff --git a/drivers/vdpa/octeon_ep/octep_vdpa_main.c b/drivers/vdpa/octeon_ep/octep_vdpa_main.c
index d674b9678428..1bdf7a8111ce 100644
--- a/drivers/vdpa/octeon_ep/octep_vdpa_main.c
+++ b/drivers/vdpa/octeon_ep/octep_vdpa_main.c
@@ -44,7 +44,35 @@ static struct octep_hw *vdpa_to_octep_hw(struct vdpa_device *vdpa_dev)
return oct_vdpa->oct_hw;
}
-static irqreturn_t octep_vdpa_intr_handler(int irq, void *data)
+static irqreturn_t octep_vdpa_crypto_irq_handler(int irq, void *data)
+{
+ struct octep_hw *oct_hw = data;
+ int i;
+
+ /* Each device interrupt (nb_irqs) maps to specific receive rings
+ * (nr_vring) in a round-robin fashion.
+ *
+ * For example, if nb_irqs = 8 and nr_vring = 64:
+ * 0 -> 0, 8, 16, 24, 32, 40, 48, 56;
+ * 1 -> 1, 9, 17, 25, 33, 41, 49, 57;
+ * ...
+ * 7 -> 7, 15, 23, 31, 39, 47, 55, 63;
+ */
+ for (i = irq - oct_hw->irqs[0]; i < oct_hw->nr_vring; i += oct_hw->nb_irqs) {
+ if (ioread32(oct_hw->vqs[i].cb_notify_addr)) {
+ /* Acknowledge the per ring notification to the device */
+ iowrite32(0, oct_hw->vqs[i].cb_notify_addr);
+
+ if (likely(oct_hw->vqs[i].cb.callback))
+ oct_hw->vqs[i].cb.callback(oct_hw->vqs[i].cb.private);
+ break;
+ }
+ }
+
+ return IRQ_HANDLED;
+}
+
+static irqreturn_t octep_vdpa_net_irq_handler(int irq, void *data)
{
struct octep_hw *oct_hw = data;
int i, ring_start, ring_stride;
@@ -85,6 +113,18 @@ static irqreturn_t octep_vdpa_intr_handler(int irq, void *data)
return IRQ_HANDLED;
}
+static irqreturn_t (*octep_vdpa_get_irq_handler(u32 dev_id))(int, void *)
+{
+ switch (dev_id) {
+ case VIRTIO_ID_NET:
+ return octep_vdpa_net_irq_handler;
+ case VIRTIO_ID_CRYPTO:
+ return octep_vdpa_crypto_irq_handler;
+ default:
+ return NULL;
+ }
+}
+
static void octep_free_irqs(struct octep_hw *oct_hw)
{
struct pci_dev *pdev = oct_hw->pdev;
@@ -107,6 +147,7 @@ static void octep_free_irqs(struct octep_hw *oct_hw)
static int octep_request_irqs(struct octep_hw *oct_hw)
{
+ irqreturn_t (*irq_handler)(int irq, void *data);
struct pci_dev *pdev = oct_hw->pdev;
int ret, irq, idx;
@@ -120,9 +161,16 @@ static int octep_request_irqs(struct octep_hw *oct_hw)
return ret;
}
+ irq_handler = octep_vdpa_get_irq_handler(oct_hw->dev_id);
+ if (!irq_handler) {
+ dev_err(&pdev->dev, "Invalid device id %d\n", oct_hw->dev_id);
+ ret = -EINVAL;
+ goto free_irqs;
+ }
+
for (idx = 0; idx < oct_hw->nb_irqs; idx++) {
irq = pci_irq_vector(pdev, idx);
- ret = devm_request_irq(&pdev->dev, irq, octep_vdpa_intr_handler, 0,
+ ret = devm_request_irq(&pdev->dev, irq, irq_handler, 0,
dev_name(&pdev->dev), oct_hw);
if (ret) {
dev_err(&pdev->dev, "Failed to register interrupt handler\n");
--
2.25.1
next prev parent reply other threads:[~2024-11-21 13:43 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-21 13:39 [PATCH v2 1/4] vdpa/octeon_ep: enable support for multiple interrupts per device Shijith Thotton
2024-11-21 13:39 ` [PATCH v2 2/4] vdpa/octeon_ep: handle device config change events Shijith Thotton
2024-12-06 2:13 ` Jason Wang
2024-11-21 13:39 ` [PATCH v2 3/4] vdpa/octeon_ep: read vendor-specific PCI capability Shijith Thotton
2024-12-06 2:21 ` Jason Wang
2024-12-06 7:25 ` [EXTERNAL] " Shijith Thotton
2024-11-21 13:39 ` Shijith Thotton [this message]
2024-12-06 2:38 ` [PATCH v2 4/4] vdpa/octeon_ep: add interrupt handler for virtio crypto device Jason Wang
2024-12-06 11:58 ` Shijith Thotton
2024-12-09 9:29 ` Shijith Thotton
2024-11-21 14:02 ` [PATCH v2 1/4] vdpa/octeon_ep: enable support for multiple interrupts per device Dan Carpenter
2024-12-06 1:25 ` Jason Wang
2024-12-06 2:31 ` Jason Wang
2024-12-09 9:39 ` Shijith Thotton
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=20241121134002.990285-4-sthotton@marvell.com \
--to=sthotton@marvell.com \
--cc=dan.carpenter@linaro.org \
--cc=eperezma@redhat.com \
--cc=jasowang@redhat.com \
--cc=jerinj@marvell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=ndabilpuram@marvell.com \
--cc=schalla@marvell.com \
--cc=skoteshwar@marvell.com \
--cc=vattunuru@marvell.com \
--cc=virtualization@lists.linux.dev \
--cc=xuanzhuo@linux.alibaba.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