Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/63016/?format=api
{ "id": 63016, "url": "http://patches.dpdk.org/api/patches/63016/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1573722187-148846-20-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-20-git-send-email-rosen.xu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1573722187-148846-20-git-send-email-rosen.xu@intel.com", "date": "2019-11-14T09:03:07", "name": "[v18,19/19] raw/ifpga: introducing new irq API", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "4dc8348cefdb86294948d424016d9c0346cf0755", "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-20-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/63016/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/63016/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 3788AA04C2;\n\tThu, 14 Nov 2019 10:07:32 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 6BF401BF19;\n\tThu, 14 Nov 2019 10:05:13 +0100 (CET)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n by dpdk.org (Postfix) with ESMTP id AA74D1BEF1\n for <dev@dpdk.org>; Thu, 14 Nov 2019 10:05:02 +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:05:02 -0800", "from dpdk-rosen-02.sh.intel.com ([10.67.110.156])\n by fmsmga006.fm.intel.com with ESMTP; 14 Nov 2019 01:05:01 -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=\"406259696\"", "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:03:07 +0800", "Message-Id": "<1573722187-148846-20-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 19/19] raw/ifpga: introducing new irq API", "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\nIntroducing new register and unregister API for ifpga interrupt.\n1. register FME and AFU interrupt\n ifpga_register_msix_irq()\n\n2. unregister FME and AFU interrupt\n ifpga_unregister_msix_irq()\n\nOn PAC N3000 card, there is one PCIe MSIX interrupt for FME managerment,\nlike the error report, thermal management, we use this interrupt in\nifpga_rawdev device driver. on the other hand, there are about 4 PCIe\nMSIX interrupts are reserved for AFU which end-user can use those\ninterrupts in their AFU logic design. End-user can use those APIs to\nregister interrupt handler in their AFU drivers.\n\nSigned-off-by: Tianfei zhang <tianfei.zhang@intel.com>\nSigned-off-by: Andy Pei <andy.pei@intel.com>\n---\n drivers/raw/ifpga/ifpga_rawdev.c | 105 +++++++++++++++++++++++++++------------\n drivers/raw/ifpga/ifpga_rawdev.h | 14 ++++++\n 2 files changed, 88 insertions(+), 31 deletions(-)", "diff": "diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c\nindex 775731c..e083fc5 100644\n--- a/drivers/raw/ifpga/ifpga_rawdev.c\n+++ b/drivers/raw/ifpga/ifpga_rawdev.c\n@@ -79,6 +79,10 @@\n static int ifpga_monitor_start;\n static pthread_t ifpga_monitor_start_thread;\n \n+#define IFPGA_MAX_IRQ 12\n+/* 0 for FME interrupt, others are reserved for AFU irq */\n+static struct rte_intr_handle ifpga_irq_handle[IFPGA_MAX_IRQ];\n+\n static struct ifpga_rawdev *\n ifpga_rawdev_allocate(struct rte_rawdev *rawdev);\n static int set_surprise_link_check_aer(\n@@ -1328,53 +1332,90 @@ static int fme_clean_fme_error(struct opae_manager *mgr)\n \tfme_err_handle_catfatal_error(mgr);\n }\n \n-static struct rte_intr_handle fme_intr_handle;\n+int\n+ifpga_unregister_msix_irq(enum ifpga_irq_type type,\n+\t\tint vec_start, rte_intr_callback_fn handler, void *arg)\n+{\n+\tstruct rte_intr_handle intr_handle;\n+\n+\tif (type == IFPGA_FME_IRQ)\n+\t\tintr_handle = ifpga_irq_handle[0];\n+\telse if (type == IFPGA_AFU_IRQ)\n+\t\tintr_handle = ifpga_irq_handle[vec_start + 1];\n \n-static int ifpga_register_fme_interrupt(struct opae_manager *mgr)\n+\trte_intr_efd_disable(&intr_handle);\n+\n+\treturn rte_intr_callback_unregister(&intr_handle,\n+\t\t\thandler, arg);\n+}\n+\n+int\n+ifpga_register_msix_irq(struct rte_rawdev *dev, int port_id,\n+\t\tenum ifpga_irq_type type, int vec_start, int count,\n+\t\trte_intr_callback_fn handler, const char *name,\n+\t\tvoid *arg)\n {\n \tint ret;\n-\tstruct fpga_fme_err_irq_set err_irq_set;\n+\tstruct rte_intr_handle intr_handle;\n+\tstruct opae_adapter *adapter;\n+\tstruct opae_manager *mgr;\n+\tstruct opae_accelerator *acc;\n \n-\tfme_intr_handle.type = RTE_INTR_HANDLE_VFIO_MSIX;\n+\tadapter = ifpga_rawdev_get_priv(dev);\n+\tif (!adapter)\n+\t\treturn -ENODEV;\n \n-\tret = rte_intr_efd_enable(&fme_intr_handle, 1);\n-\tif (ret)\n-\t\treturn -EINVAL;\n+\tmgr = opae_adapter_get_mgr(adapter);\n+\tif (!mgr)\n+\t\treturn -ENODEV;\n \n-\tfme_intr_handle.fd = fme_intr_handle.efds[0];\n+\tif (type == IFPGA_FME_IRQ) {\n+\t\tintr_handle = ifpga_irq_handle[0];\n+\t\tcount = 1;\n+\t} else if (type == IFPGA_AFU_IRQ)\n+\t\tintr_handle = ifpga_irq_handle[vec_start + 1];\n \n-\tIFPGA_RAWDEV_PMD_DEBUG(\"vfio_dev_fd=%d, efd=%d, fd=%d\\n\",\n-\t\t\tfme_intr_handle.vfio_dev_fd,\n-\t\t\tfme_intr_handle.efds[0], fme_intr_handle.fd);\n+\tintr_handle.type = RTE_INTR_HANDLE_VFIO_MSIX;\n \n-\terr_irq_set.evtfd = fme_intr_handle.efds[0];\n-\tret = opae_manager_ifpga_set_err_irq(mgr, &err_irq_set);\n+\tret = rte_intr_efd_enable(&intr_handle, count);\n \tif (ret)\n-\t\treturn -EINVAL;\n+\t\treturn -ENODEV;\n+\n+\tintr_handle.fd = intr_handle.efds[0];\n+\n+\tIFPGA_RAWDEV_PMD_DEBUG(\"register %s irq, vfio_fd=%d, fd=%d\\n\",\n+\t\t\tname, intr_handle.vfio_dev_fd,\n+\t\t\tintr_handle.fd);\n+\n+\tif (type == IFPGA_FME_IRQ) {\n+\t\tstruct fpga_fme_err_irq_set err_irq_set;\n+\t\terr_irq_set.evtfd = intr_handle.efds[0];\n+\n+\t\tret = opae_manager_ifpga_set_err_irq(mgr, &err_irq_set);\n+\t\tif (ret)\n+\t\t\treturn -EINVAL;\n+\t} else if (type == IFPGA_AFU_IRQ) {\n+\t\tacc = opae_adapter_get_acc(adapter, port_id);\n+\t\tif (!acc)\n+\t\t\treturn -EINVAL;\n \n-\t/* register FME interrupt using DPDK API */\n-\tret = rte_intr_callback_register(&fme_intr_handle,\n-\t\t\tfme_interrupt_handler,\n-\t\t\t(void *)mgr);\n+\t\tret = opae_acc_set_irq(acc, vec_start, count, intr_handle.efds);\n+\t\tif (ret)\n+\t\t\treturn -EINVAL;\n+\t}\n+\n+\t/* register interrupt handler using DPDK API */\n+\tret = rte_intr_callback_register(&intr_handle,\n+\t\t\thandler, (void *)arg);\n \tif (ret)\n \t\treturn -EINVAL;\n \n-\tIFPGA_RAWDEV_PMD_INFO(\"success register fme interrupt\\n\");\n+\tIFPGA_RAWDEV_PMD_INFO(\"success register %s interrupt\\n\", name);\n \n \treturn 0;\n }\n \n static int\n-ifpga_unregister_fme_interrupt(struct opae_manager *mgr)\n-{\n-\trte_intr_efd_disable(&fme_intr_handle);\n-\n-\treturn rte_intr_callback_unregister(&fme_intr_handle,\n-\t\t\tfme_interrupt_handler,\n-\t\t\t(void *)mgr);\n-}\n-\n-static int\n ifpga_rawdev_create(struct rte_pci_device *pci_dev,\n \t\t\tint socket_id)\n {\n@@ -1463,7 +1504,8 @@ static int ifpga_register_fme_interrupt(struct opae_manager *mgr)\n \t\tIFPGA_RAWDEV_PMD_INFO(\"this is a PF function\");\n \t}\n \n-\tret = ifpga_register_fme_interrupt(mgr);\n+\tret = ifpga_register_msix_irq(rawdev, 0, IFPGA_FME_IRQ, 0, 0,\n+\t\t\tfme_interrupt_handler, \"fme_irq\", mgr);\n \tif (ret)\n \t\tgoto free_adapter_data;\n \n@@ -1515,7 +1557,8 @@ static int ifpga_register_fme_interrupt(struct opae_manager *mgr)\n \tif (!mgr)\n \t\treturn -ENODEV;\n \n-\tif (ifpga_unregister_fme_interrupt(mgr))\n+\tif (ifpga_unregister_msix_irq(IFPGA_FME_IRQ, 0,\n+\t\t\t\tfme_interrupt_handler, mgr))\n \t\treturn -EINVAL;\n \n \topae_adapter_data_free(adapter->data);\ndiff --git a/drivers/raw/ifpga/ifpga_rawdev.h b/drivers/raw/ifpga/ifpga_rawdev.h\nindex bd42083..7754beb 100644\n--- a/drivers/raw/ifpga/ifpga_rawdev.h\n+++ b/drivers/raw/ifpga/ifpga_rawdev.h\n@@ -62,4 +62,18 @@ struct ifpga_rawdev {\n struct ifpga_rawdev *\n ifpga_rawdev_get(const struct rte_rawdev *rawdev);\n \n+enum ifpga_irq_type {\n+\tIFPGA_FME_IRQ = 0,\n+\tIFPGA_AFU_IRQ = 1,\n+};\n+\n+int\n+ifpga_register_msix_irq(struct rte_rawdev *dev, int port_id,\n+\t\tenum ifpga_irq_type type, int vec_start, int count,\n+\t\trte_intr_callback_fn handler, const char *name,\n+\t\tvoid *arg);\n+int\n+ifpga_unregister_msix_irq(enum ifpga_irq_type type,\n+\t\tint vec_start, rte_intr_callback_fn handler, void *arg);\n+\n #endif /* _IFPGA_RAWDEV_H_ */\n", "prefixes": [ "v18", "19/19" ] }