Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1649915
| From | Eric Auger <eric.auger@redhat.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 01/10] vfio: platform: Add automasked field to vfio_platform_irq |
| Date | 2017-05-24 22:20 +0200 |
| Message-ID | <tKKVc-6Ww-21@gated-at.bofh.it> (permalink) |
| References | <tKKVb-6Ww-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
For direct EOI modality we will need to differentiate a userspace
masking from the IRQ handler auto-masking.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
drivers/vfio/platform/vfio_platform_irq.c | 10 ++++++----
drivers/vfio/platform/vfio_platform_private.h | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/vfio/platform/vfio_platform_irq.c b/drivers/vfio/platform/vfio_platform_irq.c
index 46d4750..831f0b0 100644
--- a/drivers/vfio/platform/vfio_platform_irq.c
+++ b/drivers/vfio/platform/vfio_platform_irq.c
@@ -29,7 +29,7 @@ static void vfio_platform_mask(struct vfio_platform_irq *irq_ctx)
spin_lock_irqsave(&irq_ctx->lock, flags);
- if (!irq_ctx->masked) {
+ if (!irq_ctx->masked && !irq_ctx->automasked) {
disable_irq_nosync(irq_ctx->hwirq);
irq_ctx->masked = true;
}
@@ -89,9 +89,10 @@ static void vfio_platform_unmask(struct vfio_platform_irq *irq_ctx)
spin_lock_irqsave(&irq_ctx->lock, flags);
- if (irq_ctx->masked) {
+ if (irq_ctx->masked || irq_ctx->automasked) {
enable_irq(irq_ctx->hwirq);
irq_ctx->masked = false;
+ irq_ctx->automasked = false;
}
spin_unlock_irqrestore(&irq_ctx->lock, flags);
@@ -152,12 +153,12 @@ static irqreturn_t vfio_automasked_irq_handler(int irq, void *dev_id)
spin_lock_irqsave(&irq_ctx->lock, flags);
- if (!irq_ctx->masked) {
+ if (!irq_ctx->masked && !irq_ctx->automasked) {
ret = IRQ_HANDLED;
/* automask maskable interrupts */
disable_irq_nosync(irq_ctx->hwirq);
- irq_ctx->masked = true;
+ irq_ctx->automasked = true;
}
spin_unlock_irqrestore(&irq_ctx->lock, flags);
@@ -315,6 +316,7 @@ int vfio_platform_irq_init(struct vfio_platform_device *vdev)
vdev->irqs[i].count = 1;
vdev->irqs[i].hwirq = hwirq;
vdev->irqs[i].masked = false;
+ vdev->irqs[i].automasked = false;
}
vdev->num_irqs = cnt;
diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h
index 85ffe5d..8a3cfa9 100644
--- a/drivers/vfio/platform/vfio_platform_private.h
+++ b/drivers/vfio/platform/vfio_platform_private.h
@@ -34,6 +34,7 @@ struct vfio_platform_irq {
char *name;
struct eventfd_ctx *trigger;
bool masked;
+ bool automasked;
spinlock_t lock;
struct virqfd *unmask;
struct virqfd *mask;
--
2.5.5
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/10] ARM/ARM64 Direct EOI setup for VFIO wired interrupts Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
[PATCH 02/10] VFIO: platform: Introduce direct EOI interrupt handler Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
Re: [PATCH 02/10] VFIO: platform: Introduce direct EOI interrupt handler Alex Williamson <alex.williamson@redhat.com> - 2017-05-31 20:30 +0200
[PATCH 06/10] irqbypass: Add a private field in the producer Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
[PATCH 01/10] vfio: platform: Add automasked field to vfio_platform_irq Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
Re: [PATCH 01/10] vfio: platform: Add automasked field to vfio_platform_irq Marc Zyngier <marc.zyngier@arm.com> - 2017-05-25 20:10 +0200
Re: [PATCH 01/10] vfio: platform: Add automasked field to vfio_platform_irq Auger Eric <eric.auger@redhat.com> - 2017-05-30 14:50 +0200
Re: [PATCH 01/10] vfio: platform: Add automasked field to vfio_platform_irq Alex Williamson <alex.williamson@redhat.com> - 2017-05-31 19:50 +0200
[PATCH 07/10] VFIO: pci: Direct EOI irq bypass for ARM/ARM64 Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
[PATCH 04/10] VFIO: pci: Add automasked field to vfio_pci_irq_ctx Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
Re: [PATCH 04/10] VFIO: pci: Add automasked field to vfio_pci_irq_ctx Alex Williamson <alex.williamson@redhat.com> - 2017-05-31 20:30 +0200
[PATCH 10/10] KVM: arm/arm64: register DEOI irq bypass consumer on ARM/ARM64 Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
[PATCH 08/10] KVM: arm/arm64: vgic: Handle unshared mapped interrupts Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
Re: [PATCH 08/10] KVM: arm/arm64: vgic: Handle unshared mapped interrupts Marc Zyngier <marc.zyngier@arm.com> - 2017-05-25 21:20 +0200
Re: [PATCH 08/10] KVM: arm/arm64: vgic: Handle unshared mapped interrupts Auger Eric <eric.auger@redhat.com> - 2017-05-30 15:00 +0200
Re: [PATCH 08/10] KVM: arm/arm64: vgic: Handle unshared mapped interrupts Christoffer Dall <cdall@linaro.org> - 2017-06-02 15:40 +0200
Re: [PATCH 08/10] KVM: arm/arm64: vgic: Handle unshared mapped interrupts Marc Zyngier <marc.zyngier@arm.com> - 2017-06-02 16:20 +0200
Re: [PATCH 08/10] KVM: arm/arm64: vgic: Handle unshared mapped interrupts Christoffer Dall <cdall@linaro.org> - 2017-06-02 18:40 +0200
[PATCH 03/10] VFIO: platform: Direct EOI irq bypass for ARM/ARM64 Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
Re: [PATCH 03/10] VFIO: platform: Direct EOI irq bypass for ARM/ARM64 Alex Williamson <alex.williamson@redhat.com> - 2017-05-31 20:30 +0200
Re: [PATCH 03/10] VFIO: platform: Direct EOI irq bypass for ARM/ARM64 Auger Eric <eric.auger@redhat.com> - 2017-05-31 21:40 +0200
Re: [PATCH 03/10] VFIO: platform: Direct EOI irq bypass for ARM/ARM64 Marc Zyngier <marc.zyngier@arm.com> - 2017-06-01 12:50 +0200
csiph-web