Received: by 10.223.185.116 with SMTP id b49csp3391827wrg; Tue, 13 Feb 2018 01:41:42 -0800 (PST) X-Google-Smtp-Source: AH8x227j977REVeKR7S9eF0nnjN87MAy5QwUmeww6bHJC7dsjBNm/Yo9aYGs7x1xdfktmOdoZXEI X-Received: by 10.98.13.196 with SMTP id 65mr627885pfn.139.1518514902135; Tue, 13 Feb 2018 01:41:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518514902; cv=none; d=google.com; s=arc-20160816; b=CSM+drFs1TyTE13JIkYOQLstmPaOUpWU2i4iPZZNWLLhDXnZwnrNUiFhss1k1LHjEa tsE4sFf2v0xybQDqpmd7+qbd3GH3Zdxa5lKkN9anmdNffB+j5NAP3XOA872J/I9pYqAY mrClJXFH3cIgLUae1fb4QizV0J7uVb5+x7qrAIvjprd1VFnncbBjccDOwNkeSdGwpS9h iyXZzaPox2NmwcDTO/IrqOBR+eP5TAIpQIVgfHSXMSwkdoj/wrmBMADKW6YCR8tkXyVM 15u2a6bc2YiG5NNJ4CvdJhma0kuDOKTa+oKwVtU7lAgjV3X79/k/IzLjqImXE2FP/dpG qhTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=/XoprWWYYd1UyPC12SxdKdCWOBP5FaGmD0pgNSp2Fi0=; b=pUIQ8GHwUVAqHgtn0T3DsVzAiF+Nq3uFh4jCg+Y2Y8g01nQwkN5gARSoW18s1WwLNC iFx/Ie9SHHJoiRuaUHo88gd1RGMOKL0MLElizGg4eai1iIBz5i0NNeRS7p/xvoX1jNOI D3RB7dR7R2/zBzuRvBWCPc1McIGjgw6Xasfn4q2T7LxYXyUpkkK6RUyVdD94gwMN6Oe0 Jp4VHGkfCAx+p2iEi4xw4x2SDGU6mtsTjSxMBT9g9UiRtHhqTjfBb5/xUtEGP1r0torv BAeuZwa46+TNO1BrzJOFBMBmvZNizCc8GlVKk9q0DMkrczloFfJGhlDxyoPQdqIVsT5o 2PCA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c23-v6si867079plk.567.2018.02.13.01.41.27; Tue, 13 Feb 2018 01:41:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934790AbeBMJfv (ORCPT + 99 others); Tue, 13 Feb 2018 04:35:51 -0500 Received: from mga03.intel.com ([134.134.136.65]:27121 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934370AbeBMJfp (ORCPT ); Tue, 13 Feb 2018 04:35:45 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Feb 2018 01:35:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,507,1511856000"; d="scan'208";a="26889565" Received: from hao-dev.bj.intel.com ([10.238.157.61]) by FMSMGA003.fm.intel.com with ESMTP; 13 Feb 2018 01:35:40 -0800 From: Wu Hao To: atull@kernel.org, mdf@kernel.org, linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-api@vger.kernel.org, luwei.kang@intel.com, yi.z.zhang@intel.com, hao.wu@intel.com, Tim Whisonant , Enno Luebbers , Shiva Rao , Christopher Rauer , Xiao Guangrong Subject: [PATCH v4 12/24] fpga: dfl: fme: add FPGA_GET_API_VERSION/CHECK_EXTENSION ioctls support Date: Tue, 13 Feb 2018 17:24:41 +0800 Message-Id: <1518513893-4719-13-git-send-email-hao.wu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518513893-4719-1-git-send-email-hao.wu@intel.com> References: <1518513893-4719-1-git-send-email-hao.wu@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 FPGA Management Engine (FME) driver. Signed-off-by: Tim Whisonant Signed-off-by: Enno Luebbers Signed-off-by: Shiva Rao Signed-off-by: Christopher Rauer Signed-off-by: Xiao Guangrong Signed-off-by: Wu Hao Acked-by: Alan Tull Acked-by: Moritz Fischer --- v2: switched to GPLv2 license. v3: rename intel-fpga.h to fpga-dfl.h and rebased. v4: fix SPDX license issue. add Acked-by from Alan and Moritz. --- Documentation/ioctl/ioctl-number.txt | 1 + drivers/fpga/dfl-fme-main.c | 12 +++++++++ include/uapi/linux/fpga-dfl.h | 48 ++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 include/uapi/linux/fpga-dfl.h diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt index 6501389..f1e7baa 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 0xB5 00-0F uapi/linux/rpmsg.h +0xB6 all linux/fpga-dfl.h 0xC0 00-0F linux/usb/iowarrior.h 0xCA 00-0F uapi/misc/cxl.h 0xCA 10-2F uapi/misc/ocxl.h diff --git a/drivers/fpga/dfl-fme-main.c b/drivers/fpga/dfl-fme-main.c index 056ae24..1a9929c 100644 --- a/drivers/fpga/dfl-fme-main.c +++ b/drivers/fpga/dfl-fme-main.c @@ -16,6 +16,7 @@ #include #include +#include #include "dfl.h" @@ -114,6 +115,13 @@ static struct feature_driver fme_feature_drvs[] = { }, }; +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); @@ -154,6 +162,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/fpga-dfl.h b/include/uapi/linux/fpga-dfl.h new file mode 100644 index 0000000..9321ee9 --- /dev/null +++ b/include/uapi/linux/fpga-dfl.h @@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * Header File for FPGA DFL User API + * + * Copyright (C) 2017 Intel Corporation, Inc. + * + * Authors: + * Kang Luwei + * Zhang Yi + * Wu Hao + * Xiao Guangrong + */ + +#ifndef _UAPI_LINUX_FPGA_DFL_H +#define _UAPI_LINUX_FPGA_DFL_H + +#define FPGA_API_VERSION 0 + +/* + * The IOCTL interface for DFL based 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_LINUX_FPGA_DFL_H */ -- 2.7.4