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: Eric Auger X-Patchwork-Id: 6709291 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2A0B19F74E for ; Thu, 2 Jul 2015 13:21:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2C6FF206E0 for ; Thu, 2 Jul 2015 13:21:28 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C6807206F8 for ; Thu, 2 Jul 2015 13:21:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZAeOR-0005E4-BF; Thu, 02 Jul 2015 13:19:07 +0000 Received: from mail-wg0-f47.google.com ([74.125.82.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZAeNm-0004Gh-OI for linux-arm-kernel@lists.infradead.org; Thu, 02 Jul 2015 13:18:27 +0000 Received: by wgjx7 with SMTP id x7so62917990wgj.2 for ; Thu, 02 Jul 2015 06:18:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9IdQ6lT/7K/2GpzxpmibOPdwVhDdU0tQuwVofHUpJPs=; b=BCycyC8ppjii4GbKWmZDH7rKFR7IXDQ3S1EDeacz08X+6//Ob6XEUK5oDsTD4R6Ql4 YnSkFVbGBvMpD0uFA5GThIhKxyfSIUriwPT76JDi2LA5Y10qVIAqeMkPCDZ/23nUt32A XDPXycsRUEjYLm4UU9Rx706gImncTF6YGXOok1dwfUGdndemrl7r5KbEo/SzQW01R3CT huyki6t/yOkMbUViI1W2QSuhEMIrdFHXzMmbeGs12TV5wF+q8JtHILWCRGJxmvYWtPsi UM1ZwJgEXLcSQw46v8cS0F1h8IOOUtHHxdfrxvcFL6bq96gx774z+uu8ABNiJF+BYIq9 +yJw== X-Gm-Message-State: ALoCoQldm04ArF2AieSC8njgjobLtJnyjZF9anbxCH1v+8h7708qMnRJ86zxSlBf8PsBlmPq8/ES 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150702_061826_941789_870EBF28 X-CRM114-Status: GOOD ( 14.57 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, patches@linaro.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 */