From patchwork Mon Aug 10 13:20:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 6984111 Return-Path: X-Original-To: patchwork-kvm@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 3E5819F344 for ; Mon, 10 Aug 2015 13:25:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 529BE20734 for ; Mon, 10 Aug 2015 13:25:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D431204A2 for ; Mon, 10 Aug 2015 13:25:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753247AbbHJNZ3 (ORCPT ); Mon, 10 Aug 2015 09:25:29 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:34133 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751592AbbHJNVy (ORCPT ); Mon, 10 Aug 2015 09:21:54 -0400 Received: by wicne3 with SMTP id ne3so135765659wic.1 for ; Mon, 10 Aug 2015 06:21:53 -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=8J06j06IAfZniyuhdecBOX9T/F5NJrzGeMzZVCnVRfo=; b=hbWSjmgTfBCD1VfXst4uW3qOXpeoHrUmtEOaGIEjL8UVRY29nPleGZB6ibFnD78+ts x8tWTt25H5NbOW+t4P5A6CLGnCn3OZoav52W1MGLDXaPFUFo2Z/0htaXlGnhyWZAMMw5 xX/rZcbudd0s+vpB6HjICLfKzL5aX+sRcVhptczr5bw98dCFKDCTAr3y2YHAv3lI+l1k 4hKifFEY8LjxyafpPiwFryfWiD9OlDI74gvHYyW18lBMcI68iS+oeqOoMYII5Pk48H9S 6/BVIfYzBZidHko/2vhSQeRV6EvB8+tomEztLsLfW/eyVS5Pd5O1xKGv705EyY81zESt 1dbA== X-Gm-Message-State: ALoCoQm3ox/hKId7beolMGVZ2vzJ93ZRKZeXHIxcYJj4HWynZDWR8x4lBOCv9pznzlurvKrZCEFE X-Received: by 10.194.238.193 with SMTP id vm1mr43580279wjc.57.1439212913325; Mon, 10 Aug 2015 06:21:53 -0700 (PDT) Received: from gnx2579.home (LCaen-156-56-7-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id fq15sm29517024wjc.12.2015.08.10.06.21.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Aug 2015 06:21:52 -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, feng.wu@intel.com Cc: linux-kernel@vger.kernel.org, patches@linaro.org, pbonzini@redhat.com Subject: [PATCH v3 01/10] VFIO: platform: registration of a dummy IRQ bypass producer Date: Mon, 10 Aug 2015 15:20:55 +0200 Message-Id: <1439212864-12954-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439212864-12954-1-git-send-email-eric.auger@linaro.org> References: <1439212864-12954-1-git-send-email-eric.auger@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Register a dummy producer with void callbacks Signed-off-by: Eric Auger --- v2 -> v3: - rename vfio_platform_irq_bypass_resume into *_start --- drivers/vfio/platform/vfio_platform_irq.c | 32 +++++++++++++++++++++++++++ drivers/vfio/platform/vfio_platform_private.h | 2 ++ 2 files changed, 34 insertions(+) diff --git a/drivers/vfio/platform/vfio_platform_irq.c b/drivers/vfio/platform/vfio_platform_irq.c index 88bba57..b5cb8c7 100644 --- a/drivers/vfio/platform/vfio_platform_irq.c +++ b/drivers/vfio/platform/vfio_platform_irq.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "vfio_platform_private.h" @@ -177,6 +178,27 @@ static irqreturn_t vfio_irq_handler(int irq, void *dev_id) return IRQ_HANDLED; } +static void vfio_platform_irq_bypass_stop(struct irq_bypass_producer *prod) +{ +} + +static void vfio_platform_irq_bypass_start(struct irq_bypass_producer *prod) +{ +} + +static int vfio_platform_irq_bypass_add_consumer( + struct irq_bypass_producer *prod, + struct irq_bypass_consumer *cons) +{ + return 0; +} + +static void vfio_platform_irq_bypass_del_consumer( + struct irq_bypass_producer *prod, + struct irq_bypass_consumer *cons) +{ +} + static int vfio_set_trigger(struct vfio_platform_device *vdev, int index, int fd, irq_handler_t handler) { @@ -186,6 +208,7 @@ static int vfio_set_trigger(struct vfio_platform_device *vdev, int index, if (irq->trigger) { free_irq(irq->hwirq, irq); + irq_bypass_unregister_producer(&irq->producer); kfree(irq->name); eventfd_ctx_put(irq->trigger); irq->trigger = NULL; @@ -216,6 +239,15 @@ static int vfio_set_trigger(struct vfio_platform_device *vdev, int index, return ret; } + irq->producer.token = (void *)trigger; + irq->producer.irq = irq->hwirq; + irq->producer.add_consumer = vfio_platform_irq_bypass_add_consumer; + irq->producer.del_consumer = vfio_platform_irq_bypass_del_consumer; + irq->producer.stop = vfio_platform_irq_bypass_stop; + irq->producer.start = vfio_platform_irq_bypass_start; + ret = irq_bypass_register_producer(&irq->producer); + WARN_ON(ret); + if (!irq->masked) enable_irq(irq->hwirq); diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h index 1c9b3d5..1d2d4d6 100644 --- a/drivers/vfio/platform/vfio_platform_private.h +++ b/drivers/vfio/platform/vfio_platform_private.h @@ -17,6 +17,7 @@ #include #include +#include #define VFIO_PLATFORM_OFFSET_SHIFT 40 #define VFIO_PLATFORM_OFFSET_MASK (((u64)(1) << VFIO_PLATFORM_OFFSET_SHIFT) - 1) @@ -37,6 +38,7 @@ struct vfio_platform_irq { spinlock_t lock; struct virqfd *unmask; struct virqfd *mask; + struct irq_bypass_producer producer; }; struct vfio_platform_region {