From patchwork Mon Jul 6 13:24:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 6723931 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 012619F731 for ; Mon, 6 Jul 2015 13:27:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 237BB205ED for ; Mon, 6 Jul 2015 13:27:31 +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 20D89205EB for ; Mon, 6 Jul 2015 13:27:30 +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 1ZC6Oy-0000PU-GV; Mon, 06 Jul 2015 13:25:40 +0000 Received: from mail-wi0-f180.google.com ([209.85.212.180]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZC6Oq-0000FN-04 for linux-arm-kernel@lists.infradead.org; Mon, 06 Jul 2015 13:25:32 +0000 Received: by wifm2 with SMTP id m2so29737873wif.1 for ; Mon, 06 Jul 2015 06:25:10 -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=MS+SWtR2e6NFC46QRBWWr6FRFyYj5BtUUtTcOy32Gk0=; b=ItUaKZt5ixO1qjhCmcQdXHmTDdmOGP11v+g03saVAA9xIgglNZNmCQPpsJdbo6/zlT Ro04xCNRQPUJKaUuz7JfRtancEQ+JT3F8BTihVf6Zdm/SJHCe2FYjf7UwziftEsWR2rS 7nrozcuUGyw/Ch+OnGYdKY0/dGQcycUqVuBVlc9ro1qf2mAflyZu5MWsJtRGfMJi7KIG rVR0v4kz8T1oWR51jia11ZHK2/vfvb5BL/FprDU0gaaSHhmK+XOc66WSeLDUXSaLYxHH c+J6HWCGRC5ElwHWFsqa9pvlS/QVVtqx+f8Smqcd1IC/dSodpPnfo8tdpwCm9jg4jIPP r8Iw== X-Gm-Message-State: ALoCoQl84Rxla4BErvg5ylruCkasKcQW7qZLYaxg6E5NcnJP7fnXL9MhtG4H9KlplBVw090c6Ns4 X-Received: by 10.180.82.230 with SMTP id l6mr87914111wiy.61.1436189109968; Mon, 06 Jul 2015 06:25:09 -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 q4sm28148131wju.14.2015.07.06.06.25.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jul 2015 06:25:09 -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, avi.kivity@gmail.com, mtosatti@redhat.com, feng.wu@intel.com, joro@8bytes.org, b.reynal@virtualopensystems.com Subject: [RFC v2 1/9] VFIO: platform: registration of a dummy IRQ bypass producer Date: Mon, 6 Jul 2015 15:24:35 +0200 Message-Id: <1436189083-32527-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436189083-32527-1-git-send-email-eric.auger@linaro.org> References: <1436189083-32527-1-git-send-email-eric.auger@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150706_062532_192708_36A01450 X-CRM114-Status: GOOD ( 12.96 ) 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: pbonzini@redhat.com, alex.williamson@redhat.com, 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.9 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 Register a dummy producer with void callbacks Signed-off-by: Eric Auger --- drivers/vfio/platform/vfio_platform_irq.c | 31 +++++++++++++++++++++++++++ drivers/vfio/platform/vfio_platform_private.h | 2 ++ 2 files changed, 33 insertions(+) diff --git a/drivers/vfio/platform/vfio_platform_irq.c b/drivers/vfio/platform/vfio_platform_irq.c index 88bba57..4b059bf 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,26 @@ 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_resume(struct irq_bypass_producer *prod) +{ +} + +static void vfio_platform_irq_bypass_add_consumer( + struct irq_bypass_producer *prod, + struct irq_bypass_consumer *cons) +{ +} + +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 +207,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 +238,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.resume = vfio_platform_irq_bypass_resume; + 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 {