Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/17148/?format=api
{ "id": 17148, "url": "https://patches.dpdk.org/api/patches/17148/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1479740470-6723-38-git-send-email-arybchenko@solarflare.com/", "project": { "id": 1, "url": "https://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": "<1479740470-6723-38-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1479740470-6723-38-git-send-email-arybchenko@solarflare.com", "date": "2016-11-21T15:00:51", "name": "[dpdk-dev,37/56] net/sfc: interrupts support sufficient for event queue init", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "111fbf957c85833253e02264b7f7b7e3f62e97fc", "submitter": { "id": 607, "url": "https://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1479740470-6723-38-git-send-email-arybchenko@solarflare.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/17148/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/17148/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id BE759D5FA;\n\tMon, 21 Nov 2016 16:03:38 +0100 (CET)", "from nbfkord-smmo02.seg.att.com (nbfkord-smmo02.seg.att.com\n\t[209.65.160.78]) by dpdk.org (Postfix) with ESMTP id F13D8377A\n\tfor <dev@dpdk.org>; Mon, 21 Nov 2016 16:01:43 +0100 (CET)", "from unknown [12.187.104.26]\n\tby nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-7) with SMTP id\n\t75c03385.0.1541294.00-2341.3424255.nbfkord-smmo02.seg.att.com\n\t(envelope-from <arybchenko@solarflare.com>); \n\tMon, 21 Nov 2016 15:01:44 +0000 (UTC)", "from ocex03.SolarFlarecom.com (10.20.40.36) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id 15.0.1044.25; Mon, 21 Nov 2016 07:01:22 -0800", "from opal.uk.solarflarecom.com (10.17.10.1) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id\n\t15.0.1044.25 via Frontend Transport; Mon, 21 Nov 2016 07:01:21 -0800", "from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com\n\t[10.17.10.10])\n\tby opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tuALF1Khq007209 for <dev@dpdk.org>; Mon, 21 Nov 2016 15:01:20 GMT", "from uklogin.uk.solarflarecom.com (localhost.localdomain\n\t[127.0.0.1])\n\tby uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tuALF1J3S006765 for <dev@dpdk.org>; Mon, 21 Nov 2016 15:01:20 GMT" ], "X-MXL-Hash": "58330c584edc5c61-70f7c6b3075a60118577884fb7187a1d8b8a57e1", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "Date": "Mon, 21 Nov 2016 15:00:51 +0000", "Message-ID": "<1479740470-6723-38-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.2.3", "In-Reply-To": "<1479740470-6723-1-git-send-email-arybchenko@solarflare.com>", "References": "<1479740470-6723-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-AnalysisOut": [ "[v=2.1 cv=UI/baXry c=1 sm=1 tr=0 a=8BlWFWvVlq5taO8ncb8nKg==]", "[:17 a=L24OOQBejmoA:10 a=zRKbQ67AAAAA:8 a=QtmSuGzYx-VwVVu5U]", "[-UA:9 a=PA03WX8tBzeizutn5_OT:22]" ], "X-Spam": "[F=0.2000000000; CM=0.500; S=0.200(2015072901)]", "X-MAIL-FROM": "<arybchenko@solarflare.com>", "X-SOURCE-IP": "[12.187.104.26]", "Subject": "[dpdk-dev] [PATCH 37/56] net/sfc: interrupts support sufficient for\n\tevent queue init", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Reviewed-by: Andy Moreton <amoreton@solarflare.com>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/efx/Makefile | 1 +\n drivers/net/sfc/efx/sfc.c | 22 +++++++\n drivers/net/sfc/efx/sfc.h | 12 ++++\n drivers/net/sfc/efx/sfc_intr.c | 129 +++++++++++++++++++++++++++++++++++++++++\n 4 files changed, 164 insertions(+)\n create mode 100644 drivers/net/sfc/efx/sfc_intr.c", "diff": "diff --git a/drivers/net/sfc/efx/Makefile b/drivers/net/sfc/efx/Makefile\nindex eadb1ea..2d2f9b8 100644\n--- a/drivers/net/sfc/efx/Makefile\n+++ b/drivers/net/sfc/efx/Makefile\n@@ -84,6 +84,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ethdev.c\n SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_kvargs.c\n SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc.c\n SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_mcdi.c\n+SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_intr.c\n \n VPATH += $(SRCDIR)/base\n \ndiff --git a/drivers/net/sfc/efx/sfc.c b/drivers/net/sfc/efx/sfc.c\nindex 6d5fb9a..d66ea4a 100644\n--- a/drivers/net/sfc/efx/sfc.c\n+++ b/drivers/net/sfc/efx/sfc.c\n@@ -257,10 +257,17 @@ sfc_start(struct sfc_adapter *sa)\n \tif (rc != 0)\n \t\tgoto fail_nic_init;\n \n+\trc = sfc_intr_start(sa);\n+\tif (rc != 0)\n+\t\tgoto fail_intr_start;\n+\n \tsa->state = SFC_ADAPTER_STARTED;\n \tsfc_log_init(sa, \"done\");\n \treturn 0;\n \n+fail_intr_start:\n+\tefx_nic_fini(sa->nic);\n+\n fail_nic_init:\n fail_set_drv_limits:\n \tsa->state = SFC_ADAPTER_CONFIGURED;\n@@ -290,6 +297,7 @@ sfc_stop(struct sfc_adapter *sa)\n \n \tsa->state = SFC_ADAPTER_STOPPING;\n \n+\tsfc_intr_stop(sa);\n \tefx_nic_fini(sa->nic);\n \n \tsa->state = SFC_ADAPTER_CONFIGURED;\n@@ -312,10 +320,15 @@ sfc_configure(struct sfc_adapter *sa)\n \tif (rc != 0)\n \t\tgoto fail_check_conf;\n \n+\trc = sfc_intr_init(sa);\n+\tif (rc != 0)\n+\t\tgoto fail_intr_init;\n+\n \tsa->state = SFC_ADAPTER_CONFIGURED;\n \tsfc_log_init(sa, \"done\");\n \treturn 0;\n \n+fail_intr_init:\n fail_check_conf:\n \tsa->state = SFC_ADAPTER_INITIALIZED;\n \tsfc_log_init(sa, \"failed %d\", rc);\n@@ -332,6 +345,8 @@ sfc_close(struct sfc_adapter *sa)\n \tSFC_ASSERT(sa->state == SFC_ADAPTER_CONFIGURED);\n \tsa->state = SFC_ADAPTER_CLOSING;\n \n+\tsfc_intr_fini(sa);\n+\n \tsa->state = SFC_ADAPTER_INITIALIZED;\n \tsfc_log_init(sa, \"done\");\n }\n@@ -423,6 +438,10 @@ sfc_attach(struct sfc_adapter *sa)\n \tif (rc != 0)\n \t\tgoto fail_estimate_rsrc_limits;\n \n+\trc = sfc_intr_attach(sa);\n+\tif (rc != 0)\n+\t\tgoto fail_intr_attach;\n+\n \tsfc_log_init(sa, \"fini nic\");\n \tefx_nic_fini(enp);\n \n@@ -431,6 +450,7 @@ sfc_attach(struct sfc_adapter *sa)\n \tsfc_log_init(sa, \"done\");\n \treturn 0;\n \n+fail_intr_attach:\n fail_estimate_rsrc_limits:\n fail_nic_reset:\n \tsfc_log_init(sa, \"unprobe nic\");\n@@ -462,6 +482,8 @@ sfc_detach(struct sfc_adapter *sa)\n \n \tSFC_ASSERT(sfc_adapter_is_locked(sa));\n \n+\tsfc_intr_detach(sa);\n+\n \tsfc_log_init(sa, \"unprobe nic\");\n \tefx_nic_unprobe(enp);\n \ndiff --git a/drivers/net/sfc/efx/sfc.h b/drivers/net/sfc/efx/sfc.h\nindex 42d6898..2b1c784 100644\n--- a/drivers/net/sfc/efx/sfc.h\n+++ b/drivers/net/sfc/efx/sfc.h\n@@ -109,6 +109,10 @@ struct sfc_mcdi {\n \tefx_mcdi_transport_t\t\ttransport;\n };\n \n+struct sfc_intr {\n+\tefx_intr_type_t\t\t\ttype;\n+};\n+\n /* Adapter private data */\n struct sfc_adapter {\n \t/*\n@@ -129,6 +133,7 @@ struct sfc_adapter {\n \trte_spinlock_t\t\t\tnic_lock;\n \n \tstruct sfc_mcdi\t\t\tmcdi;\n+\tstruct sfc_intr\t\t\tintr;\n \n \tunsigned int\t\t\trxq_max;\n \tunsigned int\t\t\ttxq_max;\n@@ -184,6 +189,13 @@ void sfc_mcdi_fini(struct sfc_adapter *sa);\n int sfc_configure(struct sfc_adapter *sa);\n void sfc_close(struct sfc_adapter *sa);\n \n+int sfc_intr_attach(struct sfc_adapter *sa);\n+void sfc_intr_detach(struct sfc_adapter *sa);\n+int sfc_intr_init(struct sfc_adapter *sa);\n+void sfc_intr_fini(struct sfc_adapter *sa);\n+int sfc_intr_start(struct sfc_adapter *sa);\n+void sfc_intr_stop(struct sfc_adapter *sa);\n+\n #ifdef __cplusplus\n }\n #endif\ndiff --git a/drivers/net/sfc/efx/sfc_intr.c b/drivers/net/sfc/efx/sfc_intr.c\nnew file mode 100644\nindex 0000000..ad92ada\n--- /dev/null\n+++ b/drivers/net/sfc/efx/sfc_intr.c\n@@ -0,0 +1,129 @@\n+/*-\n+ * Copyright (c) 2016 Solarflare Communications Inc.\n+ * All rights reserved.\n+ *\n+ * This software was jointly developed between OKTET Labs (under contract\n+ * for Solarflare) and Solarflare Communications, Inc.\n+ *\n+ * Redistribution and use in source and binary forms, with or without\n+ * modification, are permitted provided that the following conditions are met:\n+ *\n+ * 1. Redistributions of source code must retain the above copyright notice,\n+ * this list of conditions and the following disclaimer.\n+ * 2. Redistributions in binary form must reproduce the above copyright notice,\n+ * this list of conditions and the following disclaimer in the documentation\n+ * and/or other materials provided with the distribution.\n+ *\n+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,\n+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR\n+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,\n+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,\n+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;\n+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\n+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR\n+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,\n+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+ */\n+\n+#include \"efx.h\"\n+\n+#include \"sfc.h\"\n+#include \"sfc_log.h\"\n+\n+int\n+sfc_intr_start(struct sfc_adapter *sa)\n+{\n+\tstruct sfc_intr *intr = &sa->intr;\n+\tstruct rte_intr_handle *intr_handle;\n+\tint rc;\n+\n+\tsfc_log_init(sa, \"entry\");\n+\n+\t/*\n+\t * The EFX common code event queue module depends on the interrupt\n+\t * module. Ensure that the interrupt module is always initialized\n+\t * (even if interrupts are not used). Status memory is required\n+\t * for Siena only and may be NULL for EF10.\n+\t */\n+\tsfc_log_init(sa, \"efx_intr_init\");\n+\trc = efx_intr_init(sa->nic, intr->type, NULL);\n+\tif (rc != 0)\n+\t\tgoto fail_intr_init;\n+\n+\tintr_handle = &sa->eth_dev->pci_dev->intr_handle;\n+\n+\tsfc_log_init(sa, \"done type=%u max_intr=%d nb_efd=%u vec=%p\",\n+\t\t intr_handle->type, intr_handle->max_intr,\n+\t\t intr_handle->nb_efd, intr_handle->intr_vec);\n+\treturn 0;\n+\n+fail_intr_init:\n+\tsfc_log_init(sa, \"failed %d\", rc);\n+\treturn rc;\n+}\n+\n+void\n+sfc_intr_stop(struct sfc_adapter *sa)\n+{\n+\tsfc_log_init(sa, \"entry\");\n+\n+\tefx_intr_fini(sa->nic);\n+\n+\tsfc_log_init(sa, \"done\");\n+}\n+\n+int\n+sfc_intr_init(struct sfc_adapter *sa)\n+{\n+\tsfc_log_init(sa, \"entry\");\n+\n+\tsfc_log_init(sa, \"done\");\n+\treturn 0;\n+}\n+\n+void\n+sfc_intr_fini(struct sfc_adapter *sa)\n+{\n+\tsfc_log_init(sa, \"entry\");\n+\n+\tsfc_log_init(sa, \"done\");\n+}\n+\n+int\n+sfc_intr_attach(struct sfc_adapter *sa)\n+{\n+\tstruct sfc_intr *intr = &sa->intr;\n+\tint rc;\n+\n+\tsfc_log_init(sa, \"entry\");\n+\n+\tswitch (sa->eth_dev->pci_dev->intr_handle.type) {\n+#ifdef RTE_EXEC_ENV_LINUXAPP\n+\tcase RTE_INTR_HANDLE_VFIO_LEGACY:\n+\t\tintr->type = EFX_INTR_LINE;\n+\t\tbreak;\n+\tcase RTE_INTR_HANDLE_VFIO_MSI:\n+\tcase RTE_INTR_HANDLE_VFIO_MSIX:\n+\t\tintr->type = EFX_INTR_MESSAGE;\n+\t\tbreak;\n+#endif\n+\tdefault:\n+\t\tintr->type = EFX_INTR_INVALID;\n+\t\tbreak;\n+\t}\n+\n+\tsfc_log_init(sa, \"done\");\n+\treturn 0;\n+}\n+\n+void\n+sfc_intr_detach(struct sfc_adapter *sa)\n+{\n+\tsfc_log_init(sa, \"entry\");\n+\n+\tsa->intr.type = EFX_INTR_INVALID;\n+\n+\tsfc_log_init(sa, \"done\");\n+}\n", "prefixes": [ "dpdk-dev", "37/56" ] }