From patchwork Mon Apr 13 12:29:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 47109 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 EBB0320553 for ; Mon, 13 Apr 2015 12:32:52 +0000 (UTC) Received: by lbdc7 with SMTP id c7sf15227123lbd.2 for ; Mon, 13 Apr 2015 05:32:51 -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=nOs8ovMgq38LvITDQhUooCSEtBUyBXc7P6l1o2RU+OE=; b=bRScVuiLqB34FeleGxhNjILwqVnUtVdHaSYVIl7uGqi4gQyhB7s2bXfM5zusH3oOil E6ODkaJNQs68RnewFza9XL4TTx37oH50nSvx7s1eZoCrbjeYsoCfYYp3MB/tB68aKw0i c8YPbrFPqJmX6O8FCHHX7o5SLuJMRDqmws1n9rbUVtDlueQj6PR0NIDHvvr/msLAwbc5 /SbIrkkNHq6qaiLOJwYfYvFkrE53RB/MXjl3tYekF/KEpJ+d/kc77YyeRIyOTERhl+qc HUMvLk/9On4EIFehhxSOCsE84Fn/yPp3oaQlyONQsJxCaXUYhRwJS6uHU/svw8/9ABEw 80fg== X-Gm-Message-State: ALoCoQl46X8jPWxKtJ8bNsW6YIMlhT7NX09ySfaA0289p9JjYOTRob/ywPTGJt6VTRHLHXqI5KMk X-Received: by 10.180.85.129 with SMTP id h1mr1704189wiz.6.1428928371893; Mon, 13 Apr 2015 05:32:51 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.224.165 with SMTP id rd5ls644889lac.77.gmail; Mon, 13 Apr 2015 05:32:51 -0700 (PDT) X-Received: by 10.152.36.2 with SMTP id m2mr12947046laj.72.1428928371740; Mon, 13 Apr 2015 05:32:51 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id vt12si8281232lac.164.2015.04.13.05.32.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Apr 2015 05:32:51 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbbzk7 with SMTP id zk7so57327069lbb.0 for ; Mon, 13 Apr 2015 05:32:51 -0700 (PDT) X-Received: by 10.152.23.70 with SMTP id k6mr12837832laf.76.1428928371655; Mon, 13 Apr 2015 05:32:51 -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.67.65 with SMTP id l1csp1175087lbt; Mon, 13 Apr 2015 05:32:51 -0700 (PDT) X-Received: by 10.180.82.97 with SMTP id h1mr8157347wiy.26.1428928365905; Mon, 13 Apr 2015 05:32:45 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com. [74.125.82.50]) by mx.google.com with ESMTPS id s5si17362881wjz.147.2015.04.13.05.32.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Apr 2015 05:32:45 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.50 as permitted sender) client-ip=74.125.82.50; Received: by wgyo15 with SMTP id o15so79102316wgy.2 for ; Mon, 13 Apr 2015 05:32:45 -0700 (PDT) X-Received: by 10.194.171.136 with SMTP id au8mr27938028wjc.6.1428928365621; Mon, 13 Apr 2015 05:32:45 -0700 (PDT) Received: from gnx2579.gnb.st.com (LCaen-156-56-7-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by mx.google.com with ESMTPSA id fl14sm2879910wjc.11.2015.04.13.05.32.44 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 13 Apr 2015 05:32:44 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, christoffer.dall@linaro.org, marc.zyngier@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, alex.williamson@redhat.com, pbonzini@redhat.com Cc: linux-kernel@vger.kernel.org, patches@linaro.org, feng.wu@intel.com, b.reynal@virtualopensystems.com Subject: [RFC v6 08/16] VFIO: platform: implement vfio_device_external_ops callbacks Date: Mon, 13 Apr 2015 14:29:23 +0200 Message-Id: <1428928171-18884-9-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1428928171-18884-1-git-send-email-eric.auger@linaro.org> References: <1428928171-18884-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.170 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 abcff7a..4113d46 100644 --- a/drivers/vfio/platform/vfio_platform_common.c +++ b/drivers/vfio/platform/vfio_platform_common.c @@ -471,6 +471,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, @@ -479,6 +485,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 eb91deb..253caa3 100644 --- a/drivers/vfio/platform/vfio_platform_private.h +++ b/drivers/vfio/platform/vfio_platform_private.h @@ -83,4 +83,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 */