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: Auger Eric X-Patchwork-Id: 57003 Delivered-To: patches@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp3226987lbb; Thu, 19 Nov 2015 06:54:13 -0800 (PST) X-Received: by 10.194.185.6 with SMTP id ey6mr8962654wjc.42.1447944853709; Thu, 19 Nov 2015 06:54:13 -0800 (PST) Return-Path: Received: from mail-wm0-x22e.google.com (mail-wm0-x22e.google.com. [2a00:1450:400c:c09::22e]) by mx.google.com with ESMTPS id e17si11809836wjr.24.2015.11.19.06.54.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Nov 2015 06:54:13 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22e as permitted sender) client-ip=2a00:1450:400c:c09::22e; Authentication-Results: mx.google.com; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22e as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dkim=pass header.i=@linaro-org.20150623.gappssmtp.com Received: by wmdw130 with SMTP id w130so243635053wmd.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=HyHE1ACt72eSr6jMNTXe/0GavN0Nfhf9bsmBRgIfScIUtm5w/6pf3vzHRk11AUPMLf 9StqREoSnpNbYNayeDXXts18yDr88rr5M32kJA4phktKySLKlGoXjTtdYTdKIgiBJe7w xBxAfypSAxnM1tF7S3gOK8uAy1ZpQRm21MVvzgAgE1z2jiYyb0fzYJBqxR+F1otL6mDx CFpdxy2ShgUXqirboLM314T4JwHYwM8J73dWz9EIEcuSSCtkn2v2l02gEecBFNhkSdUD rw2O+I+qTbj4cIoLf005AQvBVDCbF06ZQg8VffZvsbKCtiPsbyx1AknwfiHwBHkdKI2w 7O2g== X-Gm-Message-State: ALoCoQlPZXBGRxDmx9+z3xUyXsrR1zNAkZ8CXWjtN4E+vzaL8MC2XYzaJN22ekcnYrs8TidnRYUo X-Received: by 10.194.2.193 with SMTP id 1mr3114551wjw.26.1447944853458; Thu, 19 Nov 2015 06:54:13 -0800 (PST) Return-Path: 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> 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(+) -- 1.9.1 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 {