From: Antonios Motakis <a.motakis@virtualopensystems.com>
To: alex.williamson@redhat.com, kvmarm@lists.cs.columbia.edu,
iommu@lists.linux-foundation.org
Cc: tech@virtualopensystems.com, kvm@vger.kernel.org,
christoffer.dall@linaro.org, will.deacon@arm.com,
kim.phillips@freescale.com, eric.auger@linaro.org,
marc.zyngier@arm.com,
Antonios Motakis <a.motakis@virtualopensystems.com>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCHv7 19/26] vfio/platform: initial interrupts support code
Date: Tue, 23 Sep 2014 16:46:18 +0200 [thread overview]
Message-ID: <1411483586-29304-20-git-send-email-a.motakis@virtualopensystems.com> (raw)
In-Reply-To: <1411483586-29304-1-git-send-email-a.motakis@virtualopensystems.com>
This patch is a skeleton for the VFIO_DEVICE_SET_IRQS IOCTL, around which
most IRQ functionality is implemented in VFIO.
Signed-off-by: Antonios Motakis <a.motakis@virtualopensystems.com>
---
drivers/vfio/platform/vfio_platform_common.c | 41 ++++++++++++++++++--
drivers/vfio/platform/vfio_platform_irq.c | 56 +++++++++++++++++++++++++++
drivers/vfio/platform/vfio_platform_private.h | 6 +++
3 files changed, 100 insertions(+), 3 deletions(-)
diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c
index 6dccf22..8df0912 100644
--- a/drivers/vfio/platform/vfio_platform_common.c
+++ b/drivers/vfio/platform/vfio_platform_common.c
@@ -178,10 +178,43 @@ static long vfio_platform_ioctl(void *device_data,
return copy_to_user((void __user *)arg, &info, minsz);
- } else if (cmd == VFIO_DEVICE_SET_IRQS)
- return -EINVAL;
+ } else if (cmd == VFIO_DEVICE_SET_IRQS) {
+ struct vfio_irq_set hdr;
+ int ret = 0;
+
+ minsz = offsetofend(struct vfio_irq_set, count);
+
+ if (copy_from_user(&hdr, (void __user *)arg, minsz))
+ return -EFAULT;
+
+ if (hdr.argsz < minsz)
+ return -EINVAL;
+
+ if (hdr.index >= vdev->num_irqs)
+ return -EINVAL;
+
+ if (hdr.start != 0 || hdr.count > 1)
+ return -EINVAL;
- else if (cmd == VFIO_DEVICE_RESET)
+ if (hdr.count == 0 &&
+ (!(hdr.flags & VFIO_IRQ_SET_DATA_NONE) ||
+ !(hdr.flags & VFIO_IRQ_SET_ACTION_TRIGGER)))
+ return -EINVAL;
+
+ if (hdr.flags & ~(VFIO_IRQ_SET_DATA_TYPE_MASK |
+ VFIO_IRQ_SET_ACTION_TYPE_MASK))
+ return -EINVAL;
+
+ mutex_lock(&vdev->igate);
+
+ ret = vfio_platform_set_irqs_ioctl(vdev, hdr.flags, hdr.index,
+ hdr.start, hdr.count,
+ (void *)arg+minsz);
+ mutex_unlock(&vdev->igate);
+
+ return ret;
+
+ } else if (cmd == VFIO_DEVICE_RESET)
return -EINVAL;
return -ENOTTY;
@@ -377,6 +410,8 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev,
return ret;
}
+ mutex_init(&vdev->igate);
+
return 0;
}
EXPORT_SYMBOL_GPL(vfio_platform_probe_common);
diff --git a/drivers/vfio/platform/vfio_platform_irq.c b/drivers/vfio/platform/vfio_platform_irq.c
index d99c71c..007b386 100644
--- a/drivers/vfio/platform/vfio_platform_irq.c
+++ b/drivers/vfio/platform/vfio_platform_irq.c
@@ -31,6 +31,53 @@
#include "vfio_platform_private.h"
+static int vfio_platform_set_irq_mask(struct vfio_platform_device *vdev,
+ unsigned index, unsigned start,
+ unsigned count, uint32_t flags, void *data)
+{
+ return -EINVAL;
+}
+
+static int vfio_platform_set_irq_unmask(struct vfio_platform_device *vdev,
+ unsigned index, unsigned start,
+ unsigned count, uint32_t flags, void *data)
+{
+ return -EINVAL;
+}
+
+static int vfio_platform_set_irq_trigger(struct vfio_platform_device *vdev,
+ unsigned index, unsigned start,
+ unsigned count, uint32_t flags, void *data)
+{
+ return -EINVAL;
+}
+
+int vfio_platform_set_irqs_ioctl(struct vfio_platform_device *vdev,
+ uint32_t flags, unsigned index, unsigned start,
+ unsigned count, void *data)
+{
+ int (*func)(struct vfio_platform_device *vdev, unsigned index,
+ unsigned start, unsigned count, uint32_t flags,
+ void *data) = NULL;
+
+ switch (flags & VFIO_IRQ_SET_ACTION_TYPE_MASK) {
+ case VFIO_IRQ_SET_ACTION_MASK:
+ func = vfio_platform_set_irq_mask;
+ break;
+ case VFIO_IRQ_SET_ACTION_UNMASK:
+ func = vfio_platform_set_irq_unmask;
+ break;
+ case VFIO_IRQ_SET_ACTION_TRIGGER:
+ func = vfio_platform_set_irq_trigger;
+ break;
+ }
+
+ if (!func)
+ return -ENOTTY;
+
+ return func(vdev, index, start, count, flags, data);
+}
+
int vfio_platform_irq_init(struct vfio_platform_device *vdev)
{
int cnt = 0, i;
@@ -43,13 +90,22 @@ int vfio_platform_irq_init(struct vfio_platform_device *vdev)
return -ENOMEM;
for (i = 0; i < cnt; i++) {
+ int hwirq = vdev->get_irq(vdev, i);
+
+ if (hwirq < 0)
+ goto err;
+
vdev->irqs[i].flags = 0;
vdev->irqs[i].count = 1;
+ vdev->irqs[i].hwirq = hwirq;
}
vdev->num_irqs = cnt;
return 0;
+err:
+ kfree(vdev->irqs);
+ return -EINVAL;
}
void vfio_platform_irq_cleanup(struct vfio_platform_device *vdev)
diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h
index c5c7a7b..4201b94 100644
--- a/drivers/vfio/platform/vfio_platform_private.h
+++ b/drivers/vfio/platform/vfio_platform_private.h
@@ -27,6 +27,7 @@
struct vfio_platform_irq {
u32 flags;
u32 count;
+ int hwirq;
};
struct vfio_platform_region {
@@ -42,6 +43,7 @@ struct vfio_platform_device {
struct vfio_platform_irq *irqs;
u32 num_irqs;
atomic_t refcnt;
+ struct mutex igate;
/*
* These fields should be filled by the bus driver at binding time
@@ -62,4 +64,8 @@ extern int vfio_platform_remove_common(struct device *dev);
extern int vfio_platform_irq_init(struct vfio_platform_device *vdev);
extern void vfio_platform_irq_cleanup(struct vfio_platform_device *vdev);
+extern int vfio_platform_set_irqs_ioctl(struct vfio_platform_device *vdev,
+ uint32_t flags, unsigned index, unsigned start,
+ unsigned count, void *data);
+
#endif /* VFIO_PLATFORM_PRIVATE_H */
--
1.8.3.2
next prev parent reply other threads:[~2014-09-23 14:55 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1411483586-29304-1-git-send-email-a.motakis@virtualopensystems.com>
2014-09-23 14:46 ` [PATCHv7 01/26] iommu/arm-smmu: change IOMMU_EXEC to IOMMU_NOEXEC Antonios Motakis
2014-09-23 14:58 ` Will Deacon
2014-09-23 22:14 ` Alex Williamson
2014-09-23 14:46 ` [PATCHv7 02/26] iommu: add capability IOMMU_CAP_NOEXEC Antonios Motakis
2014-09-26 9:48 ` Joerg Roedel
2014-09-26 15:00 ` Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 03/26] iommu/arm-smmu: add IOMMU_CAP_NOEXEC to the ARM SMMU driver Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 04/26] vfio/iommu_type1: support for platform bus devices on ARM Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 05/26] vfio: introduce the VFIO_DMA_MAP_FLAG_NOEXEC flag Antonios Motakis
2014-09-23 22:21 ` Alex Williamson
2014-09-23 22:30 ` Alex Williamson
2014-09-26 15:45 ` Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 06/26] vfio/iommu_type1: implement " Antonios Motakis
2014-09-23 22:40 ` Alex Williamson
2014-09-26 15:39 ` Antonios Motakis
2014-09-26 20:27 ` Alex Williamson
2014-09-29 10:38 ` Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 07/26] driver core: amba: add device binding path 'driver_override' Antonios Motakis
2014-09-23 22:45 ` Alex Williamson
2014-09-26 15:10 ` Antonios Motakis
2014-09-26 15:37 ` Russell King - ARM Linux
2014-09-29 10:14 ` Antonios Motakis
2014-10-08 12:18 ` Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 08/26] driver core: amba: add documentation for " Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 09/26] vfio/platform: initial skeleton of VFIO support for platform devices Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 10/26] vfio: platform: probe to devices on the platform bus Antonios Motakis
2014-09-23 23:01 ` Alex Williamson
2014-09-26 15:30 ` Antonios Motakis
2014-09-26 20:18 ` Alex Williamson
2014-09-29 10:21 ` Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 11/26] vfio: platform: add the VFIO PLATFORM module to Kconfig Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 12/26] vfio: amba: VFIO support for AMBA devices Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 13/26] vfio: amba: add the VFIO for AMBA devices module to Kconfig Antonios Motakis
2014-09-23 23:11 ` Alex Williamson
2014-09-26 15:06 ` Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 14/26] vfio/platform: return info for bound device Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 15/26] vfio/platform: return info for device memory mapped IO regions Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 16/26] vfio/platform: read and write support for the device fd Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 17/26] vfio/platform: support MMAP of MMIO regions Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 18/26] vfio/platform: return IRQ info Antonios Motakis
2014-09-23 14:46 ` Antonios Motakis [this message]
2014-09-23 14:46 ` [PATCHv7 20/26] vfio/platform: trigger an interrupt via eventfd Antonios Motakis
2014-09-24 17:00 ` Alex Williamson
2014-09-26 15:03 ` Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 21/26] vfio/platform: support for maskable and automasked interrupts Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 22/26] vfio: move eventfd support code for VFIO_PCI to a separate file Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 23/26] vfio: add local lock in virqfd instead of depending on VFIO PCI Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 24/26] vfio: pass an opaque pointer on virqfd initialization Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 25/26] vfio: initialize the virqfd workqueue in VFIO generic code Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 26/26] vfio/platform: implement IRQ masking/unmasking via an eventfd Antonios Motakis
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=1411483586-29304-20-git-send-email-a.motakis@virtualopensystems.com \
--to=a.motakis@virtualopensystems.com \
--cc=alex.williamson@redhat.com \
--cc=christoffer.dall@linaro.org \
--cc=eric.auger@linaro.org \
--cc=iommu@lists.linux-foundation.org \
--cc=kim.phillips@freescale.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=tech@virtualopensystems.com \
--cc=will.deacon@arm.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
all inboxes | Powered by JetHome®