| Message ID | 1498441938-14046-14-git-send-email-hao.wu@intel.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Sun, Jun 25, 2017 at 8:52 PM, Wu Hao <hao.wu@intel.com> wrote: > FPGA_GET_API_VERSION and FPGA_CHECK_EXTENSION ioctls are common ones which > need to be supported by all feature devices drivers including FME and AFU. > Userspace application can use these ioctl interfaces to get the API info > and check if specific extension is supported or not in current driver. > > This patch implements above 2 ioctls in Intel FPGA Management Engine (FME) > driver. > > Signed-off-by: Tim Whisonant <tim.whisonant@intel.com> > Signed-off-by: Enno Luebbers <enno.luebbers@intel.com> > Signed-off-by: Shiva Rao <shiva.rao@intel.com> > Signed-off-by: Christopher Rauer <christopher.rauer@intel.com> > Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> > Signed-off-by: Wu Hao <hao.wu@intel.com> Acked-by: Alan Tull <atull@kernel.org> > --- > v2: switched to GPLv2 license. > --- > Documentation/ioctl/ioctl-number.txt | 1 + > drivers/fpga/intel-fme-main.c | 12 +++++++++ > include/uapi/linux/intel-fpga.h | 50 ++++++++++++++++++++++++++++++++++++ > 3 files changed, 63 insertions(+) > create mode 100644 include/uapi/linux/intel-fpga.h > > diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt > index 1e9fcb4..a0d8be5 100644 > --- a/Documentation/ioctl/ioctl-number.txt > +++ b/Documentation/ioctl/ioctl-number.txt > @@ -324,6 +324,7 @@ Code Seq#(hex) Include File Comments > 0xB3 00 linux/mmc/ioctl.h > 0xB4 00-0F linux/gpio.h <mailto:linux-gpio@vger.kernel.org> > 0xB5 00-0F uapi/linux/rpmsg.h <mailto:linux-remoteproc@vger.kernel.org> > +0xB6 all linux/intel-fpga.h > 0xC0 00-0F linux/usb/iowarrior.h > 0xCA 00-0F uapi/misc/cxl.h > 0xCA 80-8F uapi/scsi/cxlflash_ioctl.h > diff --git a/drivers/fpga/intel-fme-main.c b/drivers/fpga/intel-fme-main.c > index dfbb17c..9fd0baf 100644 > --- a/drivers/fpga/intel-fme-main.c > +++ b/drivers/fpga/intel-fme-main.c > @@ -18,6 +18,7 @@ > > #include <linux/kernel.h> > #include <linux/module.h> > +#include <linux/intel-fpga.h> > > #include "intel-feature-dev.h" > > @@ -102,6 +103,13 @@ struct feature_ops fme_hdr_ops = { > }, > }; > > +static long fme_ioctl_check_extension(struct feature_platform_data *pdata, > + unsigned long arg) > +{ > + /* No extension support for now */ > + return 0; > +} > + > static int fme_open(struct inode *inode, struct file *filp) > { > struct platform_device *fdev = fpga_inode_to_feature_dev(inode); > @@ -140,6 +148,10 @@ static long fme_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) > dev_dbg(&pdev->dev, "%s cmd 0x%x\n", __func__, cmd); > > switch (cmd) { > + case FPGA_GET_API_VERSION: > + return FPGA_API_VERSION; > + case FPGA_CHECK_EXTENSION: > + return fme_ioctl_check_extension(pdata, arg); > default: > /* > * Let sub-feature's ioctl function to handle the cmd > diff --git a/include/uapi/linux/intel-fpga.h b/include/uapi/linux/intel-fpga.h > new file mode 100644 > index 0000000..e340ef9 > --- /dev/null > +++ b/include/uapi/linux/intel-fpga.h > @@ -0,0 +1,50 @@ > +/* > + * Header File for Intel FPGA User API > + * > + * Copyright (C) 2017 Intel Corporation, Inc. > + * > + * Authors: > + * Kang Luwei <luwei.kang@intel.com> > + * Zhang Yi <yi.z.zhang@intel.com> > + * Wu Hao <hao.wu@intel.com> > + * Xiao Guangrong <guangrong.xiao@linux.intel.com> > + * > + * This work is licensed under the terms of the GNU GPL version 2. See > + * the COPYING file in the top-level directory. > + */ > + > +#ifndef _UAPI_LINUX_INTEL_FPGA_H > +#define _UAPI_LINUX_INTEL_FPGA_H > + > +#define FPGA_API_VERSION 0 > + > +/* > + * The IOCTL interface for Intel FPGA is designed for extensibility by > + * embedding the structure length (argsz) and flags into structures passed > + * between kernel and userspace. This design referenced the VFIO IOCTL > + * interface (include/uapi/linux/vfio.h). > + */ > + > +#define FPGA_MAGIC 0xB6 > + > +#define FPGA_BASE 0 > + > +/** > + * FPGA_GET_API_VERSION - _IO(FPGA_MAGIC, FPGA_BASE + 0) > + * > + * Report the version of the driver API. > + * Return: Driver API Version. > + */ > + > +#define FPGA_GET_API_VERSION _IO(FPGA_MAGIC, FPGA_BASE + 0) > + > +/** > + * FPGA_CHECK_EXTENSION - _IO(FPGA_MAGIC, FPGA_BASE + 1) > + * > + * Check whether an extension is supported. > + * Return: 0 if not supported, otherwise the extension is supported. > + */ > + > +#define FPGA_CHECK_EXTENSION _IO(FPGA_MAGIC, FPGA_BASE + 1) > + > +#endif /* _UAPI_INTEL_FPGA_H */ > -- > 1.8.3.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-fpga" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt index 1e9fcb4..a0d8be5 100644 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt @@ -324,6 +324,7 @@ Code Seq#(hex) Include File Comments 0xB3 00 linux/mmc/ioctl.h 0xB4 00-0F linux/gpio.h <mailto:linux-gpio@vger.kernel.org> 0xB5 00-0F uapi/linux/rpmsg.h <mailto:linux-remoteproc@vger.kernel.org> +0xB6 all linux/intel-fpga.h 0xC0 00-0F linux/usb/iowarrior.h 0xCA 00-0F uapi/misc/cxl.h 0xCA 80-8F uapi/scsi/cxlflash_ioctl.h diff --git a/drivers/fpga/intel-fme-main.c b/drivers/fpga/intel-fme-main.c index dfbb17c..9fd0baf 100644 --- a/drivers/fpga/intel-fme-main.c +++ b/drivers/fpga/intel-fme-main.c @@ -18,6 +18,7 @@ #include <linux/kernel.h> #include <linux/module.h> +#include <linux/intel-fpga.h> #include "intel-feature-dev.h" @@ -102,6 +103,13 @@ struct feature_ops fme_hdr_ops = { }, }; +static long fme_ioctl_check_extension(struct feature_platform_data *pdata, + unsigned long arg) +{ + /* No extension support for now */ + return 0; +} + static int fme_open(struct inode *inode, struct file *filp) { struct platform_device *fdev = fpga_inode_to_feature_dev(inode); @@ -140,6 +148,10 @@ static long fme_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) dev_dbg(&pdev->dev, "%s cmd 0x%x\n", __func__, cmd); switch (cmd) { + case FPGA_GET_API_VERSION: + return FPGA_API_VERSION; + case FPGA_CHECK_EXTENSION: + return fme_ioctl_check_extension(pdata, arg); default: /* * Let sub-feature's ioctl function to handle the cmd diff --git a/include/uapi/linux/intel-fpga.h b/include/uapi/linux/intel-fpga.h new file mode 100644 index 0000000..e340ef9 --- /dev/null +++ b/include/uapi/linux/intel-fpga.h @@ -0,0 +1,50 @@ +/* + * Header File for Intel FPGA User API + * + * Copyright (C) 2017 Intel Corporation, Inc. + * + * Authors: + * Kang Luwei <luwei.kang@intel.com> + * Zhang Yi <yi.z.zhang@intel.com> + * Wu Hao <hao.wu@intel.com> + * Xiao Guangrong <guangrong.xiao@linux.intel.com> + * + * This work is licensed under the terms of the GNU GPL version 2. See + * the COPYING file in the top-level directory. + */ + +#ifndef _UAPI_LINUX_INTEL_FPGA_H +#define _UAPI_LINUX_INTEL_FPGA_H + +#define FPGA_API_VERSION 0 + +/* + * The IOCTL interface for Intel FPGA is designed for extensibility by + * embedding the structure length (argsz) and flags into structures passed + * between kernel and userspace. This design referenced the VFIO IOCTL + * interface (include/uapi/linux/vfio.h). + */ + +#define FPGA_MAGIC 0xB6 + +#define FPGA_BASE 0 + +/** + * FPGA_GET_API_VERSION - _IO(FPGA_MAGIC, FPGA_BASE + 0) + * + * Report the version of the driver API. + * Return: Driver API Version. + */ + +#define FPGA_GET_API_VERSION _IO(FPGA_MAGIC, FPGA_BASE + 0) + +/** + * FPGA_CHECK_EXTENSION - _IO(FPGA_MAGIC, FPGA_BASE + 1) + * + * Check whether an extension is supported. + * Return: 0 if not supported, otherwise the extension is supported. + */ + +#define FPGA_CHECK_EXTENSION _IO(FPGA_MAGIC, FPGA_BASE + 1) + +#endif /* _UAPI_INTEL_FPGA_H */