Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/62999/?format=api
{ "id": 62999, "url": "http://patches.dpdk.org/api/patches/62999/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1573722187-148846-3-git-send-email-rosen.xu@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1573722187-148846-3-git-send-email-rosen.xu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1573722187-148846-3-git-send-email-rosen.xu@intel.com", "date": "2019-11-14T09:02:50", "name": "[v18,02/19] raw/ifpga/base: add irq support", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "35e97005659f1154b60f8f67dfd01c2d0e642670", "submitter": { "id": 946, "url": "http://patches.dpdk.org/api/people/946/?format=api", "name": "Xu, Rosen", "email": "rosen.xu@intel.com" }, "delegate": { "id": 31221, "url": "http://patches.dpdk.org/api/users/31221/?format=api", "username": "yexl", "first_name": "xiaolong", "last_name": "ye", "email": "xiaolong.ye@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1573722187-148846-3-git-send-email-rosen.xu@intel.com/mbox/", "series": [ { "id": 7455, "url": "http://patches.dpdk.org/api/series/7455/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7455", "date": "2019-11-14T09:02:48", "name": "add PCIe AER disable and IRQ support for ipn3ke", "version": 18, "mbox": "http://patches.dpdk.org/series/7455/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/62999/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/62999/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 107C1A04C2;\n\tThu, 14 Nov 2019 10:04:45 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 863194C9D;\n\tThu, 14 Nov 2019 10:04:31 +0100 (CET)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n by dpdk.org (Postfix) with ESMTP id 7F23E49DF\n for <dev@dpdk.org>; Thu, 14 Nov 2019 10:04:29 +0100 (CET)", "from fmsmga006.fm.intel.com ([10.253.24.20])\n by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n 14 Nov 2019 01:04:29 -0800", "from dpdk-rosen-02.sh.intel.com ([10.67.110.156])\n by fmsmga006.fm.intel.com with ESMTP; 14 Nov 2019 01:04:28 -0800" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.68,302,1569308400\"; d=\"scan'208\";a=\"406259469\"", "From": "Rosen Xu <rosen.xu@intel.com>", "To": "dev@dpdk.org", "Cc": "rosen.xu@intel.com, tianfei.zhang@intel.com, andy.pei@intel.com,\n xiaolong.ye@intel.com, ferruh.yigit@intel.com", "Date": "Thu, 14 Nov 2019 17:02:50 +0800", "Message-Id": "<1573722187-148846-3-git-send-email-rosen.xu@intel.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1573722187-148846-1-git-send-email-rosen.xu@intel.com>", "References": "<1571917119-149534-2-git-send-email-andy.pei@intel.com>\n <1573722187-148846-1-git-send-email-rosen.xu@intel.com>", "Subject": "[dpdk-dev] [PATCH v18 02/19] raw/ifpga/base: add irq support", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Tianfei zhang <tianfei.zhang@intel.com>\n\nAdd irq support for ifpga FME global error, port error and uint unit.\nWe implmented this feature by vfio interrupt mechanism.\n\nTo build this feature, CONFIG_RTE_EAL_VFIO should be enabled.\n\nSigned-off-by: Tianfei zhang <tianfei.zhang@intel.com>\nSigned-off-by: Andy Pei <andy.pei@intel.com>\n---\n config/common_base | 2 +-\n config/common_linux | 6 +++\n drivers/raw/ifpga/base/ifpga_feature_dev.c | 59 ++++++++++++++++++++++++++++++\n drivers/raw/ifpga/base/ifpga_fme_error.c | 19 ++++++++++\n drivers/raw/ifpga/base/ifpga_port.c | 18 +++++++++\n drivers/raw/ifpga/base/ifpga_port_error.c | 19 ++++++++++\n 6 files changed, 122 insertions(+), 1 deletion(-)", "diff": "diff --git a/config/common_base b/config/common_base\nindex 9142778..36ab13d 100644\n--- a/config/common_base\n+++ b/config/common_base\n@@ -788,7 +788,7 @@ CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=n\n #\n # Compile PMD for Intel FPGA raw device\n #\n-CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV=y\n+CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV=n\n \n #\n # Compile PMD for Intel IOAT raw device\ndiff --git a/config/common_linux b/config/common_linux\nindex 96e2e1f..a78b8c6 100644\n--- a/config/common_linux\n+++ b/config/common_linux\n@@ -68,3 +68,9 @@ CONFIG_RTE_LIBRTE_HINIC_PMD=y\n # Hisilicon HNS3 PMD driver\n #\n CONFIG_RTE_LIBRTE_HNS3_PMD=y\n+\n+#\n+# Compile PMD for Intel FPGA raw device\n+# To compile, CONFIG_RTE_EAL_VFIO should be enabled.\n+#\n+CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV=y\ndiff --git a/drivers/raw/ifpga/base/ifpga_feature_dev.c b/drivers/raw/ifpga/base/ifpga_feature_dev.c\nindex 63c8bcc..0f852a7 100644\n--- a/drivers/raw/ifpga/base/ifpga_feature_dev.c\n+++ b/drivers/raw/ifpga/base/ifpga_feature_dev.c\n@@ -3,6 +3,7 @@\n */\n \n #include <sys/ioctl.h>\n+#include <rte_vfio.h>\n \n #include \"ifpga_feature_dev.h\"\n \n@@ -331,3 +332,61 @@ int port_hw_init(struct ifpga_port_hw *port)\n \tport_hw_uinit(port);\n \treturn ret;\n }\n+\n+#define FPGA_MAX_MSIX_VEC_COUNT\t128\n+/* irq set buffer length for interrupt */\n+#define MSIX_IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + \\\n+\t\t\t\tsizeof(int) * FPGA_MAX_MSIX_VEC_COUNT)\n+\n+/* only support msix for now*/\n+static int vfio_msix_enable_block(s32 vfio_dev_fd, unsigned int vec_start,\n+\t\t\t\t unsigned int count, s32 *fds)\n+{\n+\tchar irq_set_buf[MSIX_IRQ_SET_BUF_LEN];\n+\tstruct vfio_irq_set *irq_set;\n+\tint len, ret;\n+\tint *fd_ptr;\n+\n+\tlen = sizeof(irq_set_buf);\n+\n+\tirq_set = (struct vfio_irq_set *)irq_set_buf;\n+\tirq_set->argsz = len;\n+\t/* 0 < irq_set->count < FPGA_MAX_MSIX_VEC_COUNT */\n+\tirq_set->count = count ?\n+\t\t(count > FPGA_MAX_MSIX_VEC_COUNT ?\n+\t\t FPGA_MAX_MSIX_VEC_COUNT : count) : 1;\n+\tirq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD |\n+\t\t\t\tVFIO_IRQ_SET_ACTION_TRIGGER;\n+\tirq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;\n+\tirq_set->start = vec_start;\n+\n+\tfd_ptr = (int *)&irq_set->data;\n+\topae_memcpy(fd_ptr, fds, sizeof(int) * count);\n+\n+\tret = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);\n+\tif (ret)\n+\t\tprintf(\"Error enabling MSI-X interrupts\\n\");\n+\n+\treturn ret;\n+}\n+\n+int fpga_msix_set_block(struct ifpga_feature *feature, unsigned int start,\n+\t\t\tunsigned int count, s32 *fds)\n+{\n+\tstruct feature_irq_ctx *ctx = feature->ctx;\n+\tunsigned int i;\n+\tint ret;\n+\n+\tif (start >= feature->ctx_num || start + count > feature->ctx_num)\n+\t\treturn -EINVAL;\n+\n+\t/* assume that each feature has continuous vector space in msix*/\n+\tret = vfio_msix_enable_block(feature->vfio_dev_fd,\n+\t\t\t\t ctx[start].idx, count, fds);\n+\tif (!ret) {\n+\t\tfor (i = 0; i < count; i++)\n+\t\t\tctx[i].eventfd = fds[i];\n+\t}\n+\n+\treturn ret;\n+}\ndiff --git a/drivers/raw/ifpga/base/ifpga_fme_error.c b/drivers/raw/ifpga/base/ifpga_fme_error.c\nindex 3794564..2978c79 100644\n--- a/drivers/raw/ifpga/base/ifpga_fme_error.c\n+++ b/drivers/raw/ifpga/base/ifpga_fme_error.c\n@@ -373,9 +373,28 @@ static int fme_global_error_set_prop(struct ifpga_feature *feature,\n \treturn -ENOENT;\n }\n \n+static int fme_global_err_set_irq(struct ifpga_feature *feature, void *irq_set)\n+{\n+\tstruct fpga_fme_err_irq_set *err_irq_set = irq_set;\n+\tstruct ifpga_fme_hw *fme;\n+\tint ret;\n+\n+\tfme = (struct ifpga_fme_hw *)feature->parent;\n+\n+\tif (!(fme->capability & FPGA_FME_CAP_ERR_IRQ))\n+\t\treturn -ENODEV;\n+\n+\tspinlock_lock(&fme->lock);\n+\tret = fpga_msix_set_block(feature, 0, 1, &err_irq_set->evtfd);\n+\tspinlock_unlock(&fme->lock);\n+\n+\treturn ret;\n+}\n+\n struct ifpga_feature_ops fme_global_err_ops = {\n \t.init = fme_global_error_init,\n \t.uinit = fme_global_error_uinit,\n \t.get_prop = fme_global_error_get_prop,\n \t.set_prop = fme_global_error_set_prop,\n+\t.set_irq = fme_global_err_set_irq,\n };\ndiff --git a/drivers/raw/ifpga/base/ifpga_port.c b/drivers/raw/ifpga/base/ifpga_port.c\nindex 6c41164..c0aaf01 100644\n--- a/drivers/raw/ifpga/base/ifpga_port.c\n+++ b/drivers/raw/ifpga/base/ifpga_port.c\n@@ -384,9 +384,27 @@ static void port_uint_uinit(struct ifpga_feature *feature)\n \tdev_info(NULL, \"PORT UINT UInit.\\n\");\n }\n \n+static int port_uint_set_irq(struct ifpga_feature *feature, void *irq_set)\n+{\n+\tstruct fpga_uafu_irq_set *uafu_irq_set = irq_set;\n+\tstruct ifpga_port_hw *port = feature->parent;\n+\tint ret;\n+\n+\tif (!(port->capability & FPGA_PORT_CAP_UAFU_IRQ))\n+\t\treturn -ENODEV;\n+\n+\tspinlock_lock(&port->lock);\n+\tret = fpga_msix_set_block(feature, uafu_irq_set->start,\n+\t\t\t\t uafu_irq_set->count, uafu_irq_set->evtfds);\n+\tspinlock_unlock(&port->lock);\n+\n+\treturn ret;\n+}\n+\n struct ifpga_feature_ops ifpga_rawdev_port_uint_ops = {\n \t.init = port_uint_init,\n \t.uinit = port_uint_uinit,\n+\t.set_irq = port_uint_set_irq,\n };\n \n static int port_afu_init(struct ifpga_feature *feature)\ndiff --git a/drivers/raw/ifpga/base/ifpga_port_error.c b/drivers/raw/ifpga/base/ifpga_port_error.c\nindex 138284e..189f762 100644\n--- a/drivers/raw/ifpga/base/ifpga_port_error.c\n+++ b/drivers/raw/ifpga/base/ifpga_port_error.c\n@@ -136,9 +136,28 @@ static int port_error_set_prop(struct ifpga_feature *feature,\n \treturn -ENOENT;\n }\n \n+static int port_error_set_irq(struct ifpga_feature *feature, void *irq_set)\n+{\n+\tstruct fpga_port_err_irq_set *err_irq_set = irq_set;\n+\tstruct ifpga_port_hw *port;\n+\tint ret;\n+\n+\tport = feature->parent;\n+\n+\tif (!(port->capability & FPGA_PORT_CAP_ERR_IRQ))\n+\t\treturn -ENODEV;\n+\n+\tspinlock_lock(&port->lock);\n+\tret = fpga_msix_set_block(feature, 0, 1, &err_irq_set->evtfd);\n+\tspinlock_unlock(&port->lock);\n+\n+\treturn ret;\n+}\n+\n struct ifpga_feature_ops ifpga_rawdev_port_error_ops = {\n \t.init = port_error_init,\n \t.uinit = port_error_uinit,\n \t.get_prop = port_error_get_prop,\n \t.set_prop = port_error_set_prop,\n+\t.set_irq = port_error_set_irq,\n };\n", "prefixes": [ "v18", "02/19" ] }