From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21DAFC43331 for ; Tue, 31 Mar 2020 05:32:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E0A1920675 for ; Tue, 31 Mar 2020 05:32:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726455AbgCaFcF (ORCPT ); Tue, 31 Mar 2020 01:32:05 -0400 Received: from mga03.intel.com ([134.134.136.65]:55437 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726001AbgCaFcF (ORCPT ); Tue, 31 Mar 2020 01:32:05 -0400 IronPort-SDR: I3u6n3m4xSzq3L/iOKcRpbqSnMpCaV3/ELfFltvGXcdcXiFlpT/IO4bturFwIraeEwvDeaGFbz theEZVlnZOrw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2020 22:32:04 -0700 IronPort-SDR: SBkuA8p6OeShhufll+XxCy0kKHHejl7vhjrXSvL6B2Ghv6rC1xEIQB+AWCt2r0WHZv5AoeIRAH WeAESTGWhqhg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,327,1580803200"; d="scan'208";a="237592794" Received: from hao-dev.bj.intel.com (HELO localhost) ([10.238.157.65]) by orsmga007.jf.intel.com with ESMTP; 30 Mar 2020 22:32:02 -0700 Date: Tue, 31 Mar 2020 13:10:45 +0800 From: Wu Hao To: Xu Yilun Cc: mdf@kernel.org, linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org, trix@redhat.com, bhu@redhat.com, Luwei Kang Subject: Re: [PATCH v3 4/7] fpga: dfl: afu: add interrupt support for error reporting Message-ID: <20200331051045.GD8468@hao-dev> References: <1585038763-22944-1-git-send-email-yilun.xu@intel.com> <1585038763-22944-5-git-send-email-yilun.xu@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1585038763-22944-5-git-send-email-yilun.xu@intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 24, 2020 at 04:32:40PM +0800, Xu Yilun wrote: > Error reporting interrupt is very useful to notify users that some > errors are detected by the hardware. Once users are notified, they > could query hardware logged error states, no need to continuously > poll on these states. > > This patch follows the common DFL interrupt notification and handling > mechanism, implements two ioctl commands below for user to query > number of irqs supported, and set/unset interrupt triggers. > > Ioctls: > * DFL_FPGA_PORT_ERR_GET_IRQ_NUM > get the number of irqs, which is used to determine whether/how many > interrupts error reporting feature supports. > > * DFL_FPGA_PORT_ERR_SET_IRQ > set/unset given eventfds as error interrupt triggers. > > Signed-off-by: Luwei Kang > Signed-off-by: Wu Hao > Signed-off-by: Xu Yilun > ---- > v2: use DFL_FPGA_PORT_ERR_GET_IRQ_NUM instead of > DFL_FPGA_PORT_ERR_GET_INFO > Delete flag field for DFL_FPGA_PORT_ERR_SET_IRQ param > v3: put_user() instead of copy_to_user() > improves comments > --- > drivers/fpga/dfl-afu-error.c | 60 +++++++++++++++++++++++++++++++++++++++++++ > drivers/fpga/dfl-afu-main.c | 4 +++ > include/uapi/linux/fpga-dfl.h | 29 +++++++++++++++++++++ > 3 files changed, 93 insertions(+) > > diff --git a/drivers/fpga/dfl-afu-error.c b/drivers/fpga/dfl-afu-error.c > index c1467ae..757f9f5 100644 > --- a/drivers/fpga/dfl-afu-error.c > +++ b/drivers/fpga/dfl-afu-error.c > @@ -15,6 +15,7 @@ > */ > > #include > +#include > > #include "dfl-afu.h" > > @@ -219,6 +220,64 @@ static void port_err_uinit(struct platform_device *pdev, > afu_port_err_mask(&pdev->dev, true); > } > > +static long > +port_err_get_num_irqs(struct platform_device *pdev, > + struct dfl_feature *feature, unsigned long arg) > +{ > + return put_user(feature->nr_irqs, (__u32 __user *)arg); > +} Looks like this function is same in patch 5 and 6 too. Is it possible, we can share the common code? same case for below set irq function, right? Thanks Hao > + > +static long port_err_set_irq(struct platform_device *pdev, > + struct dfl_feature *feature, unsigned long arg) > +{ > + struct dfl_feature_platform_data *pdata = dev_get_platdata(&pdev->dev); > + struct dfl_fpga_irq_set hdr; > + s32 *fds; > + long ret; > + > + if (!feature->nr_irqs) > + return -ENOENT; > + > + if (copy_from_user(&hdr, (void __user *)arg, sizeof(hdr))) > + return -EFAULT; > + > + if (!hdr.count || (hdr.start + hdr.count > feature->nr_irqs) || > + (hdr.start + hdr.count < hdr.start)) > + return -EINVAL; > + > + fds = memdup_user((void __user *)(arg + sizeof(hdr)), > + hdr.count * sizeof(s32)); > + if (IS_ERR(fds)) > + return PTR_ERR(fds); > + > + mutex_lock(&pdata->lock); > + ret = dfl_fpga_set_irq_triggers(feature, hdr.start, hdr.count, fds); > + mutex_unlock(&pdata->lock); > + > + kfree(fds); > + return ret; > +} > + > +static long > +port_err_ioctl(struct platform_device *pdev, struct dfl_feature *feature, > + unsigned int cmd, unsigned long arg) > +{ > + long ret = -ENODEV; > + > + switch (cmd) { > + case DFL_FPGA_PORT_ERR_GET_IRQ_NUM: > + ret = port_err_get_num_irqs(pdev, feature, arg); > + break; > + case DFL_FPGA_PORT_ERR_SET_IRQ: > + ret = port_err_set_irq(pdev, feature, arg); > + break; > + default: > + dev_dbg(&pdev->dev, "%x cmd not handled", cmd); > + } > + > + return ret; > +} > + > const struct dfl_feature_id port_err_id_table[] = { > {.id = PORT_FEATURE_ID_ERROR,}, > {0,} > @@ -227,4 +286,5 @@ const struct dfl_feature_id port_err_id_table[] = { > const struct dfl_feature_ops port_err_ops = { > .init = port_err_init, > .uinit = port_err_uinit, > + .ioctl = port_err_ioctl, > }; > diff --git a/drivers/fpga/dfl-afu-main.c b/drivers/fpga/dfl-afu-main.c > index b0c3178..357cd5d 100644 > --- a/drivers/fpga/dfl-afu-main.c > +++ b/drivers/fpga/dfl-afu-main.c > @@ -577,6 +577,7 @@ static int afu_release(struct inode *inode, struct file *filp) > { > struct platform_device *pdev = filp->private_data; > struct dfl_feature_platform_data *pdata; > + struct dfl_feature *feature; > > dev_dbg(&pdev->dev, "Device File Release\n"); > > @@ -586,6 +587,9 @@ static int afu_release(struct inode *inode, struct file *filp) > dfl_feature_dev_use_end(pdata); > > if (!dfl_feature_dev_use_count(pdata)) { > + dfl_fpga_dev_for_each_feature(pdata, feature) > + dfl_fpga_set_irq_triggers(feature, 0, > + feature->nr_irqs, NULL); > __port_reset(pdev); > afu_dma_region_destroy(pdata); > } > diff --git a/include/uapi/linux/fpga-dfl.h b/include/uapi/linux/fpga-dfl.h > index ec70a0746..9ade943 100644 > --- a/include/uapi/linux/fpga-dfl.h > +++ b/include/uapi/linux/fpga-dfl.h > @@ -151,6 +151,35 @@ struct dfl_fpga_port_dma_unmap { > > #define DFL_FPGA_PORT_DMA_UNMAP _IO(DFL_FPGA_MAGIC, DFL_PORT_BASE + 4) > > +/** > + * DFL_FPGA_PORT_ERR_GET_IRQ_NUM - _IOR(DFL_FPGA_MAGIC, DFL_PORT_BASE + 5, > + * __u32 num_irqs) > + * > + * Get the number of irqs supported by the fpga port error reporting private > + * feature. Currently hardware supports up to 1 irq. > + * Return: 0 on success, -errno on failure. > + */ > +#define DFL_FPGA_PORT_ERR_GET_IRQ_NUM _IOR(DFL_FPGA_MAGIC, \ > + DFL_PORT_BASE + 5, __u32) > + > +/** > + * DFL_FPGA_PORT_ERR_SET_IRQ - _IOW(DFL_FPGA_MAGIC, DFL_PORT_BASE + 6, > + * struct dfl_fpga_irq_set) > + * > + * Set fpga port error reporting interrupt trigger if evtfds[n] is valid. > + * Unset related interrupt trigger if evtfds[n] is a negative value. > + * Return: 0 on success, -errno on failure. > + */ > +struct dfl_fpga_irq_set { > + __u32 start; /* Index of the first irq */ > + __u32 count; /* The number of eventfd handler */ > + __s32 evtfds[]; /* Eventfd handler */ > +}; > + > +#define DFL_FPGA_PORT_ERR_SET_IRQ _IOW(DFL_FPGA_MAGIC, \ > + DFL_PORT_BASE + 6, \ > + struct dfl_fpga_irq_set) > + > /* IOCTLs for FME file descriptor */ > > /** > -- > 2.7.4