From patchwork Thu Nov 19 14:53:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 7658041 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9B02BBF90C for ; Thu, 19 Nov 2015 14:59:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C6B5C2063C for ; Thu, 19 Nov 2015 14:59:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D1E96204D9 for ; Thu, 19 Nov 2015 14:59:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758728AbbKSOyR (ORCPT ); Thu, 19 Nov 2015 09:54:17 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:33721 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758719AbbKSOyO (ORCPT ); Thu, 19 Nov 2015 09:54:14 -0500 Received: by wmec201 with SMTP id c201so29562177wme.0 for ; Thu, 19 Nov 2015 06:54:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=N47qEFQKrlGuq77GFQ0+PzXE4TIn6DNetVWf1scVfwE=; b=nJg422CQ5HSesIuMfSiAssDSDqhSciK5U1NNZ7N5cBz55RTG6si7/6EeJIWBoG1j+b 5aO47qSWmz5U2cGXPl684FBFqmbheVhfUgj8v5q/P+DlPFBNp6VpSJbY1m5+elCWWp6q h0VsP+6wijXZhS7ffa1soqcWlTsxvztoayn6RJuIbburjjYPm2xDvRnkYxjtoqd/NoGF nPLmsTfWad/eMnQCV1PoXrlNHEkVBHj+WdG5imsKVk8NyFoBKbqFOndYWK9HWHYfvbfg PjO2GwCBP/wrXTfnbQbZTLlOVR9uZHxlEfSm9VB3tTEYa36/ZS1TwieVJ8l4m4wZ0u66 Jkzg== 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=N47qEFQKrlGuq77GFQ0+PzXE4TIn6DNetVWf1scVfwE=; b=BiXvZt8YpY6yQwm1wenibmu0BuuQzghQBp5sUvkc48WatgyKdEYNYI16GFnmUrJZ/4 LNkUHtj/1YCHwT3yE2kbY/0Yp8hWoR6UYHEqMuZOhWhCvsAtqh0aEn4R6jOnPEmVdSpW Xet7vU2Yw6G8QmXxPeLyKP3ZdAHHrqWtjSVIDRqaicXWfd/gcHR6USf2D1nG+smV268x T1xG1ycLnJk9qe/2bleoEnSrpbpziPRaa3H5tEPDhLW/O+hMABHL6UmvszCE5RCDL2rp /zCKUHS8agWntawKgcRPyd/Dt9NeLicbfxT4dSAYJPhC2nwE5yUzbui4iIsR6EP2YWnZ FKgw== X-Gm-Message-State: ALoCoQlKyMsgWyeIboJJ4X76PveSQ7iKwWFUlf72K0Ytkubl0YJtvf5Z/TF1gepmVodHtSVTThCw X-Received: by 10.194.2.193 with SMTP id 1mr3114551wjw.26.1447944853458; Thu, 19 Nov 2015 06:54:13 -0800 (PST) Received: from new-host-3.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id h67sm34493865wmf.17.2015.11.19.06.54.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Nov 2015 06:54:12 -0800 (PST) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, alex.williamson@redhat.com, b.reynal@virtualopensystems.com, christoffer.dall@linaro.org, marc.zyngier@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: andre.przywara@arm.com, linux-kernel@vger.kernel.org, patches@linaro.org Subject: [PATCH v4 02/13] VFIO: platform: registration of a dummy IRQ bypass producer Date: Thu, 19 Nov 2015 14:53:52 +0000 Message-Id: <1447944843-17731-3-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1447944843-17731-1-git-send-email-eric.auger@linaro.org> References: <1447944843-17731-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=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 --- v3 -> v3: - replace WARN_ON by pr_info() in case irq_bypass_register_producer fails v2 -> v3: - rename vfio_platform_irq_bypass_resume into *_start --- drivers/vfio/platform/vfio_platform_irq.c | 34 +++++++++++++++++++++++++++ drivers/vfio/platform/vfio_platform_private.h | 2 ++ 2 files changed, 36 insertions(+) diff --git a/drivers/vfio/platform/vfio_platform_irq.c b/drivers/vfio/platform/vfio_platform_irq.c index 46d4750..ab7658a 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) { @@ -187,6 +209,7 @@ static int vfio_set_trigger(struct vfio_platform_device *vdev, int index, if (irq->trigger) { irq_clear_status_flags(irq->hwirq, IRQ_NOAUTOEN); free_irq(irq->hwirq, irq); + irq_bypass_unregister_producer(&irq->producer); kfree(irq->name); eventfd_ctx_put(irq->trigger); irq->trigger = NULL; @@ -217,6 +240,17 @@ 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); + if (ret) + pr_info("irq bypass producer (token %p) registration fails: %d\n", + irq->producer.token, 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 42816dd..979c191 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 {