From patchwork Thu Jul 2 13:17:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 50579 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F148A214B3 for ; Thu, 2 Jul 2015 13:18:14 +0000 (UTC) Received: by lbcui10 with SMTP id ui10sf13398958lbc.0 for ; Thu, 02 Jul 2015 06:18:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=9IdQ6lT/7K/2GpzxpmibOPdwVhDdU0tQuwVofHUpJPs=; b=IYCBSb8yxVldpO+OOoqHci0CMpeKi/R33OO12lmQlBHhwJ+Tp4+2y2wzSLBrr9ug8q B5+4VTkvdTXu69kRImXyl8NvIXuMMFxb9O/dPlrEPc8+sJ19l0A1scpLE3G6xXPMIbr9 TpMcNbfd3eatKRg0GjihWzMMxkWXAOMkVhU9cMEbIUrfFiC5jiRkmVpSvBRJBtU5/GvD dPNuZ6yWaxlJ7MYi7p3Gu20X/axvw26Xq3/+RY0Tj5ERDleyQ5kT1PrcJJ0TVALbDQNn F5drH7khZ1JhgQMuWvLzUHUXMqNKzPJ/awz0LwyPlDycV94rIJv86u/zQu/BJLHMh8m+ DJbg== X-Gm-Message-State: ALoCoQnagUa08nJnthIHkAzmqKotLthBbTlvhu7U9Tk95P1vUVL4GV2D6V0AxVGx4hY7TJ0WcCv0 X-Received: by 10.152.37.101 with SMTP id x5mr19923537laj.5.1435843093226; Thu, 02 Jul 2015 06:18:13 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.4 with SMTP id x4ls337375lag.100.gmail; Thu, 02 Jul 2015 06:18:12 -0700 (PDT) X-Received: by 10.112.50.66 with SMTP id a2mr30751219lbo.68.1435843092954; Thu, 02 Jul 2015 06:18:12 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id e7si4454967lbc.62.2015.07.02.06.18.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jul 2015 06:18:12 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by lbbpo10 with SMTP id po10so31808718lbb.3 for ; Thu, 02 Jul 2015 06:18:12 -0700 (PDT) X-Received: by 10.152.18.162 with SMTP id x2mr11303958lad.73.1435843092841; Thu, 02 Jul 2015 06:18:12 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp476155lbb; Thu, 2 Jul 2015 06:18:10 -0700 (PDT) X-Received: by 10.180.86.73 with SMTP id n9mr52965591wiz.78.1435843085396; Thu, 02 Jul 2015 06:18:05 -0700 (PDT) Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com. [209.85.212.181]) by mx.google.com with ESMTPS id v10si9407902wiz.113.2015.07.02.06.18.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jul 2015 06:18:05 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.181 as permitted sender) client-ip=209.85.212.181; Received: by wicgi11 with SMTP id gi11so73558996wic.0 for ; Thu, 02 Jul 2015 06:18:05 -0700 (PDT) X-Received: by 10.180.86.73 with SMTP id n9mr52965557wiz.78.1435843085138; Thu, 02 Jul 2015 06:18:05 -0700 (PDT) Received: from gnx2579.home (LCaen-156-56-7-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by mx.google.com with ESMTPSA id tl3sm8157099wjc.20.2015.07.02.06.18.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jul 2015 06:18:04 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, christoffer.dall@linaro.org, marc.zyngier@arm.com, alex.williamson@redhat.com, pbonzini@redhat.com, avi.kivity@gmail.com, mtosatti@redhat.com, feng.wu@intel.com, joro@8bytes.org, b.reynal@virtualopensystems.com Cc: linux-kernel@vger.kernel.org, patches@linaro.org Subject: [RFC 05/17] VFIO: platform: implement vfio_device_external_ops callbacks Date: Thu, 2 Jul 2015 15:17:15 +0200 Message-Id: <1435843047-6327-6-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1435843047-6327-1-git-send-email-eric.auger@linaro.org> References: <1435843047-6327-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch adds the implementation for the 3 external callbacks of vfio_device_external_ops struct, namely active, is_active, set_automasked. Also vfio_device_ops and vfio_device_external_ops are set accordingly. Signed-off-by: Eric Auger --- v6: creation --- drivers/vfio/platform/vfio_platform_common.c | 7 ++++ drivers/vfio/platform/vfio_platform_irq.c | 49 +++++++++++++++++++++++++++ drivers/vfio/platform/vfio_platform_private.h | 11 ++++++ 3 files changed, 67 insertions(+) diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c index e43efb5..9acfca6 100644 --- a/drivers/vfio/platform/vfio_platform_common.c +++ b/drivers/vfio/platform/vfio_platform_common.c @@ -520,6 +520,12 @@ static int vfio_platform_mmap(void *device_data, struct vm_area_struct *vma) return -EINVAL; } +static struct vfio_device_external_ops vfio_platform_external_ops = { + .mask = vfio_platform_external_mask, + .is_active = vfio_platform_external_is_active, + .set_automasked = vfio_platform_external_set_automasked, +}; + static const struct vfio_device_ops vfio_platform_ops = { .name = "vfio-platform", .open = vfio_platform_open, @@ -528,6 +534,7 @@ static const struct vfio_device_ops vfio_platform_ops = { .read = vfio_platform_read, .write = vfio_platform_write, .mmap = vfio_platform_mmap, + .external_ops = &vfio_platform_external_ops }; int vfio_platform_probe_common(struct vfio_platform_device *vdev, diff --git a/drivers/vfio/platform/vfio_platform_irq.c b/drivers/vfio/platform/vfio_platform_irq.c index 8eb65c1..f6d83ed 100644 --- a/drivers/vfio/platform/vfio_platform_irq.c +++ b/drivers/vfio/platform/vfio_platform_irq.c @@ -231,6 +231,55 @@ static int vfio_set_trigger(struct vfio_platform_device *vdev, int index, return 0; } +int vfio_platform_external_mask(void *device_data, unsigned index, + unsigned start, unsigned count) +{ + struct vfio_platform_device *vdev = device_data; + + vfio_platform_mask(&vdev->irqs[index]); + return 0; +} + +int vfio_platform_external_is_active(void *device_data, unsigned index, + unsigned start, unsigned count) +{ + unsigned long flags; + struct vfio_platform_device *vdev = device_data; + struct vfio_platform_irq *irq = &vdev->irqs[index]; + bool active, masked, outstanding; + int ret; + + spin_lock_irqsave(&irq->lock, flags); + + ret = irq_get_irqchip_state(irq->hwirq, IRQCHIP_STATE_ACTIVE, &active); + BUG_ON(ret); + masked = irq->masked; + outstanding = active || masked; + + spin_unlock_irqrestore(&irq->lock, flags); + return outstanding; +} + +int vfio_platform_external_set_automasked(void *device_data, unsigned index, + unsigned start, unsigned count, + bool automasked) +{ + unsigned long flags; + struct vfio_platform_device *vdev = device_data; + struct vfio_platform_irq *irq = &vdev->irqs[index]; + + spin_lock_irqsave(&irq->lock, flags); + if (automasked) { + irq->flags |= VFIO_IRQ_INFO_AUTOMASKED; + irq->handler = vfio_automasked_irq_handler; + } else { + irq->flags &= ~VFIO_IRQ_INFO_AUTOMASKED; + irq->handler = vfio_irq_handler; + } + spin_unlock_irqrestore(&irq->lock, flags); + return 0; +} + static int vfio_platform_set_irq_trigger(struct vfio_platform_device *vdev, unsigned index, unsigned start, unsigned count, uint32_t flags, diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h index 413f575..5f46c68 100644 --- a/drivers/vfio/platform/vfio_platform_private.h +++ b/drivers/vfio/platform/vfio_platform_private.h @@ -90,4 +90,15 @@ extern int vfio_platform_set_irqs_ioctl(struct vfio_platform_device *vdev, unsigned start, unsigned count, void *data); +extern int vfio_platform_external_mask(void *device_data, unsigned index, + unsigned start, unsigned count); +extern int vfio_platform_external_is_active(void *device_data, + unsigned index, unsigned start, + unsigned count); +extern int vfio_platform_external_set_automasked(void *device_data, + unsigned index, + unsigned start, + unsigned count, + bool automasked); + #endif /* VFIO_PLATFORM_PRIVATE_H */