From patchwork Wed Oct 3 13:36:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 45958 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ECBD21B2AF; Wed, 3 Oct 2018 15:37:20 +0200 (CEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70043.outbound.protection.outlook.com [40.107.7.43]) by dpdk.org (Postfix) with ESMTP id A6F6F1B274 for ; Wed, 3 Oct 2018 15:37:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qYwUH5gTAKr27+ID9f6DJ6zTXqBhOGTuEQhRb5+NsOc=; b=OCqmJbnHsgjLSMvwrY6DDInnCsGax+hjKw9QhFVh1TFf361NUDfJLUemOifF3PM0MAUdh3VS7mhODmU987CnFzDZf35CFl1EJlj8ux9DdBYczNTZpQeWCubxtCFnkIuEtw+yXVPIrLlXxMoWObURemzc7yUPfnhvml2A6L+7uqc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=G.Singh@nxp.com; Received: from Tophie.ap.freescale.net (14.142.187.166) by AM4PR04MB1521.eurprd04.prod.outlook.com (2a01:111:e400:59e4::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.25; Wed, 3 Oct 2018 13:37:10 +0000 From: Gagandeep Singh To: dev@dpdk.org, ferruh.yigit@intel.com Cc: pankaj.chauhan@nxp.com, Gagandeep Singh Date: Wed, 3 Oct 2018 19:06:05 +0530 Message-Id: <20181003133608.3605-2-g.singh@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003133608.3605-1-g.singh@nxp.com> References: <20180928074601.4287-1-g.singh@nxp.com> <20181003133608.3605-1-g.singh@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: MA1PR01CA0095.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:1::11) To AM4PR04MB1521.eurprd04.prod.outlook.com (2a01:111:e400:59e4::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 03c6cfaa-e410-48d9-7cc1-08d629355309 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM4PR04MB1521; X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1521; 3:kz9Ia5I2jeo8wQEE1MWgbI7uELHjTFPvjocSZEdh/UbR6B6LLrqm069PIDHFXSv8xXfA2zOOnt5dkrIFMiBks6Z9Y+G9U8Nlb/0hn8KFuizo9kF+KiButNtTfPMqubyJefemqEaFZaEAJcP5vL2OeOg+lqVJygETUpZzb+uLFkHfX5V6TNSsrjBWYjW7DK5bNqI3mEo5a3xy12jmBbqu541GKDZeQaqog3YlDI+EfNQX4ug/4t6SFC8Ii0AJP1/R; 25:CjkQI7mTp38rBs2cgJ0EqZITDwVEiDxjJJOjGFC1T8+qBY97UOpKnJur17LAW+/6w+9nHG3XMzDtrOmh9JNMalEEP9mizl2Ld29uH28hLc68SsVLZyQEpr611Crk1ZIWLJS/AR8uQptc86br72A5NhWSc9spHP2ON9F+XMH2KemPfBk2CF62sh9aKfye28qcJl5MKtXSjpypJdTnstPWFfkmApntwBqiFCbVQfy/+Hhj8vM5EKBzmQnNtJPNPbRVlUQLochFLG/dImnw3fu/zlwWsqw2GRjrlRGlRyiGMas37RRyW8mfV61Qng0W2aY9pL91cVwGOONcCUqzvfQHCw==; 31:UKsi3z4E7mo1rlsCSv+z455hqFzhHjsU+T/QpJB5hL2TiXg5TOetkWm0Y3xSADA8GehDLYGpCgRJ92W4gZJWo6K6I3NdbQ0B1PxawgX7sWtPnNHa/WdlepMLc7eo49F8XMZsm7yt5E2K+ZD7bXFQRJx2D0g+aie+tDlzMgyXM3+yOq+IZH+a8L29Xv7BPSiOwBgdUQaRTGN6mJAWziXoDM35mS59Y8HU1t1pLDUXkaY= X-MS-TrafficTypeDiagnostic: AM4PR04MB1521: X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1521; 20:A0KMOw8mOJzasNp7ZZjLnq8s6I4kEKxC61U1dj5zGpSWfP0y3G040sqG+sVj5ruTN+5DIcauc0YfEfAueMIrTM4EI0TXLSbnzHEU7jtpz23dIHAsLLrM+J+DVs+ubmM2hqsziqWnEhPcPtSpxdWkZfdTXIyfNo70EB99bjfTEBoIYrms1EXG1uN0renTa9s0bK0R9V6eJz6fuJECB/GjdNwA2QsrTKO8xqEJRZr+nTwsNQX3UvMyDnyTrWMVsiNTr23gNV1EfQz+Phdy5WWv/SIE9JziU0xG/u/gVR9mbd75NEIzFOJrM3LXDwEiqw/l1f0g4WRSLwQY8uEqEZj455lVPJ6hDC2uoVcLl1SptPjn81EcZbWZlz8uo+ekGQrlbMSH0X5nzxI7ekGIAmcuKqNKK2j+FUA8tUMWGqcVNy2SvZzmQFiKt6K4mljH8OUUiyrDykmMcZpZn8C5bfEm5xXtcr8FBw4RyMLZDCy6lZu7LqwSpWOZaRh48hxKwXR4; 4:uTzQ0yWBviexhpOT5AUnI9ylrKYo2YhEGe8fWEwWuE0WCRGcsOiSp47wE8vY597tbbg3kwl0fFWEdFRbDfIe6Jz+7wZc9xhbQ5i+0gK213DrGx1yJd4yI/A5Xz0awVls0gT+g8OLfjomAD9Vn7lQeVV35Z2KYrvXff/+rxwv/w1lX+86qTPiS9F/iRv2V3UTRcJLFhOp65JjcNF8xU9jyBxMk0ZapKtD3WK78yekRXrFr2oV1U1WdmdKXesgBD63rCyuvQAu4Z/vmmZPYs4QrFKrrvmMFS4pOlHfrR64Ab28qCrTmp3txUDlS08FmyPV X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231355)(944501410)(52105095)(10201501046)(3002001)(6055026)(149066)(150057)(6041310)(20161123560045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699051); SRVR:AM4PR04MB1521; BCL:0; PCL:0; RULEID:; SRVR:AM4PR04MB1521; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(346002)(136003)(396003)(366004)(199004)(189003)(6486002)(97736004)(6116002)(3846002)(86362001)(575784001)(106356001)(1076002)(55236004)(217873002)(14444005)(53936002)(6512007)(4326008)(2906002)(52116002)(476003)(6506007)(105586002)(386003)(25786009)(956004)(81166006)(2616005)(81156014)(47776003)(51416003)(8936002)(11346002)(446003)(8676002)(66066001)(305945005)(5009440100003)(68736007)(72206003)(26005)(5660300001)(7736002)(76176011)(50226002)(36756003)(486006)(316002)(4744004)(48376002)(16526019)(186003)(50466002)(16586007)(6666003)(478600001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR04MB1521; H:Tophie.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR04MB1521; 23:IXX9L9b+/pQKXi3x109oqAkX5JDuCZaE3I7I4IavK?= 1//umqZ/wQjQwi2ozZQnHAe3T7GikJOEDXZKu2N6Is5549oqYHmCpeMbvekBahgwoWxbrYkBOvpIsBrHmH8NbxBPSv1cgcRo7C9DueSUDBUqY3Ac/FNYAOSo3zsBJKIYpwsVpcJxFMLIEAIEbpLVlGqVSymlIsqFESCSLyb7s4trdedZMHXPqRZyulFugmpk68CFFxd+VeIo4HIQnk9jnqy61QIuhd/g5WV3Yh/dpOcCJaR3Q4mzhH4sdxASOLfX74/TktmumbAsL85iZ+WO4ds5KnQFfTG6rfuPbjXRFCRFKfoVSUbY45ZlNf6T/uinrSvtVJNhRDtp58E+bydJCKdUpC2MqzocwXZbWGr3WCgPX/gK1eznjmYESaS/fMgfCEe594Y88othL9nYAXQ9R3XEXYFUdMNX3y7GSAIUOdQz59MQdBxLdFfomtq0i7PpKXsU5jM7AU+7hBj3x1LQb3Ej+vwMeoGbvOxLDvWCWepx3MkuqsfhS4QQ7Os3QZRGMXnhGviZ0AqwxHQ1+1uWUxzj+XEQclbxXjot2XA1gfK6BGm5uCEWEqagdVrfS8sHlQDrPKQrIc+GXq/KRONZhoH5tcIk/5iMqLITuoyxwOJPwwTuBkIVLySIN9Uj0bTMgY4/r5jRh66wv7nlRGERNWLQk/Ark4L6Xg0I47jJ/0mef0C3SQutOAE8cj5PLdvbC+xMvYSlSrigrXXekK2Kp9yI2+S23qsndfD0jnTVvkC4ymYbkAZ7RIfYCDbn93Z5zNCGJvF/iJChbrLZnem4GAXjI5EoGY4DNa7xPbCCu+75uiIL/G1H2J0ljN5vTd+82cwQPecp736TRMY24AMIN0OYnqs7GJVY1Zr4pchP5Hn+3NAy17TGJ9V6wWZ1cXgcqVqT6/ILHuO8QXqRiQkkI/8LjYSOic0eEcJCDnCEMCaoGRbIncn4zKD8PvjxqMYO6sYJB5E7j1jatAU3r3nlh+tprUmUVIPvXWmnRwC/AS7QLP72HXidzMlO19E7tDD23P7O7PixxleTKs+CaMaoaUZ7KB/2Eb+3dLsx2vT6A6qAKqQOjisPuPc26WlmNtWRZJYdjuv7q0l7KoaSKFgJUAYTSFcRLEneKV6XCDkkjhcJ4uxvRSBqdsDovekvdZhoJLmvV4sbZH0AWAGltb1SdM9Y4qYRc0/tDgHfCqAaipxBNrnuUYl10FPd1e2towf1RaQyurWL3thOca/EirSI2yfmHfJEV/D7cS6+TTltwonXUONvHQIN4YlyhL5RG5cRm/gAung+13KQSEV2BcYr2Wm18BK3c2mrWZftMB1uSaMfw== X-Microsoft-Antispam-Message-Info: v0GiUtcBUBhPWSqvhDB338FuT/KjRbyNQe7Gkr3rNnxQSgYDodcrLz6Z4dWNhzUGPnkS5pEA1eXSWIMUkHerKnbxmB8rp/0p6dAR7/zQb7UmN049ST6SuNNEdDDxXFzCnImMMGOInIYnRXdY6P01AaTadCjQXJhSjdBElIpMljQ27eNfj6vQfkmGlC4yG25trU8vhUJvnY8ny8Avg4aJPB/jt4gfrudKqb7AztpRRiC+DzncDB1TbI+04QChlTsawSrsUd/qcp9wLqapJAkamR3MGx+YomsvV6VL3vmrjVnqnWlkZ5magAzjdKigPrpCyf1hfC5aNxsPACxX3jwOvP6H/mWn6KTOCNLb3+ys5vM= X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1521; 6:6QsXOlHrcuneUn5FJ/wfLnJxloCGHHTOHwcAIX51d9fZ+jxnWTBNEfwu9DRpwVe8p3lf8FAmkYcYTMnc1kA/IBm2ugUJv51T3V5dwK9T7BG2AGavS4pP5ZD/8sFsyVjYUL4Cu+uw9yjnMfeHxz7O+okmJ4+PVjIIj9ST5qpMTIpK43/7AAslOZaDiwFfHPo2u5Ux59DoxtDQAf7OQV+g99Mz2SzD61sVi7SIC03H13l/K1p2Sk9WthS+jwLFlVjGFos/kQ0ILNB+KlBAIEtscN5lqESnlFx2oRSssB3aFC4tsHFgp8ASjy2iSC3oUTpgmLiAOIsOBevE99w6ilDSYNzUhI9sBjQ9B8hHxCV1OxL3uxcg1vPVvGxtKdM34SMCvcZNeUp8Y3mb9VBVBmaS2pgGry3cE/Qd7qvBDEj8uLbvT3qRxHez1jfnCktAm/tu2YMs0hkkK6dq8hfSW/Wg3A==; 5:qVOGSlKP+gptnsqu+nlxWjn7uX7TLeHA6xpAR0R3DenFNIHoj27+CVqD+D3r+RAq/IHsGjwQIjeP/7cFOwG9NM9ggiXiAY2MPMrzo3YOStaio/mfhWlaCFYRp9A4PKjdl2VIE5k7pgT8O/9vwaYczOj8Avvq+feSHkOKf38NLb8=; 7:suNMQK3u+nqnHWrMOaIrsFfphnKvRPjUv9j6F0zHSIQaCv+KhStkegZSI0BJhtHweSLzNbqlVmGCW6QtEcCqbvRU75kGmaFhYZnsOo5C58XlSTZA55boUm9rTRsqreNVtaLuqI/PI23DkKSDGU60TCBSZnvRrgPVjk8776SQ2i1WYyoCRpo5V/Yo9xWv6ZwmSAK45uWyTv4F5k9BjrmhIlgzcszPu4KM73Z0hhoWtStymTiZE/YewVkezJ1SZh3H SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 13:37:10.8527 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 03c6cfaa-e410-48d9-7cc1-08d629355309 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR04MB1521 Subject: [dpdk-dev] [PATCH v5 1/4] net/enetc: add ENETC PMD with basic operations X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch introduces the enetc PMD with basic initialisation functions includes probe, teardown, hardware initialisation Signed-off-by: Gagandeep Singh --- MAINTAINERS | 6 + config/common_base | 5 + config/common_linuxapp | 5 + doc/guides/nics/features/enetc.ini | 9 + drivers/net/Makefile | 1 + drivers/net/enetc/Makefile | 22 ++ drivers/net/enetc/base/enetc_hw.h | 226 ++++++++++++++++ drivers/net/enetc/enetc.h | 87 +++++++ drivers/net/enetc/enetc_ethdev.c | 275 ++++++++++++++++++++ drivers/net/enetc/enetc_logs.h | 29 +++ drivers/net/enetc/meson.build | 10 + drivers/net/enetc/rte_pmd_enetc_version.map | 4 + drivers/net/meson.build | 1 + mk/rte.app.mk | 1 + 14 files changed, 681 insertions(+) create mode 100644 doc/guides/nics/features/enetc.ini create mode 100644 drivers/net/enetc/Makefile create mode 100644 drivers/net/enetc/base/enetc_hw.h create mode 100644 drivers/net/enetc/enetc.h create mode 100644 drivers/net/enetc/enetc_ethdev.c create mode 100644 drivers/net/enetc/enetc_logs.h create mode 100644 drivers/net/enetc/meson.build create mode 100644 drivers/net/enetc/rte_pmd_enetc_version.map diff --git a/MAINTAINERS b/MAINTAINERS index 9fd258fad..0443addc0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -643,6 +643,12 @@ F: drivers/net/dpaa2/ F: doc/guides/nics/dpaa2.rst F: doc/guides/nics/features/dpaa2.ini +NXP enetc +M: Gagandeep Singh +M: Pankaj Chauhan +F: drivers/net/enetc/ +F: doc/guides/nics/features/enetc.ini + QLogic bnx2x M: Harish Patil M: Rasesh Mody diff --git a/config/common_base b/config/common_base index 4bcbaf923..a7fc48667 100644 --- a/config/common_base +++ b/config/common_base @@ -217,6 +217,11 @@ CONFIG_RTE_LIBRTE_DPAA2_USE_PHYS_IOVA=y CONFIG_RTE_LIBRTE_DPAA2_PMD=n CONFIG_RTE_LIBRTE_DPAA2_DEBUG_DRIVER=n +# +# Compile NXP ENETC PMD Driver +# +CONFIG_RTE_LIBRTE_ENETC_PMD=n + # # Compile burst-oriented Amazon ENA PMD driver # diff --git a/config/common_linuxapp b/config/common_linuxapp index 9c5ea9d89..485e1467d 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -44,3 +44,8 @@ CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=y CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=y CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=y CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=y + +# +# NXP ENETC PMD Driver +# +CONFIG_RTE_LIBRTE_ENETC_PMD=y diff --git a/doc/guides/nics/features/enetc.ini b/doc/guides/nics/features/enetc.ini new file mode 100644 index 000000000..f780404b8 --- /dev/null +++ b/doc/guides/nics/features/enetc.ini @@ -0,0 +1,9 @@ +; +; Supported features of the 'enetc' network poll mode driver. +; +; Refer to default.ini for the full list of available PMD features. +; +[Features] +Link status = Y +Linux VFIO = Y +ARMv8 = Y diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 664398de9..3ad436045 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -24,6 +24,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2 endif DIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000 DIRS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena +DIRS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic DIRS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k diff --git a/drivers/net/enetc/Makefile b/drivers/net/enetc/Makefile new file mode 100644 index 000000000..519153868 --- /dev/null +++ b/drivers/net/enetc/Makefile @@ -0,0 +1,22 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 NXP + +include $(RTE_SDK)/mk/rte.vars.mk + +# +# library name +# +LIB = librte_pmd_enetc.a + +CFLAGS += -O3 +CFLAGS += $(WERROR_FLAGS) +EXPORT_MAP := rte_pmd_enetc_version.map +LIBABIVER := 1 + +SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_ethdev.c + +LDLIBS += -lrte_eal +LDLIBS += -lrte_ethdev +LDLIBS += -lrte_bus_pci + +include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/enetc/base/enetc_hw.h b/drivers/net/enetc/base/enetc_hw.h new file mode 100644 index 000000000..f36fa11e0 --- /dev/null +++ b/drivers/net/enetc/base/enetc_hw.h @@ -0,0 +1,226 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2018 NXP + */ + +#ifndef _ENETC_HW_H_ +#define _ENETC_HW_H_ +#include + +#define BIT(x) ((uint64_t)1 << ((x))) + +/* ENETC device IDs */ +#define ENETC_DEV_ID_VF 0xef00 +#define ENETC_DEV_ID 0xe100 + +/* ENETC register block BAR */ +#define ENETC_BAR_REGS 0x0 + +/* SI regs, offset: 0h */ +#define ENETC_SIMR 0x0 +#define ENETC_SIMR_EN BIT(31) + +#define ENETC_SIPMAR0 0x80 +#define ENETC_SIPMAR1 0x84 + +#define ENETC_SICAPR0 0x900 +#define ENETC_SICAPR1 0x904 + +#define ENETC_SIMSITRV(n) (0xB00 + (n) * 0x4) +#define ENETC_SIMSIRRV(n) (0xB80 + (n) * 0x4) + +#define ENETC_SICCAPR 0x1200 + +/* enum for BD type */ +enum enetc_bdr_type {TX, RX}; + +#define ENETC_BDR(type, n, off) (0x8000 + (type) * 0x100 + (n) * 0x200 \ + + (off)) +/* RX BDR reg offsets */ +#define ENETC_RBMR 0x0 /* RX BDR mode register*/ +#define ENETC_RBMR_EN BIT(31) + +#define ENETC_RBSR 0x4 /* Rx BDR status register*/ +#define ENETC_RBBSR 0x8 /* Rx BDR buffer size register*/ +#define ENETC_RBCIR 0xc /* Rx BDR consumer index register*/ +#define ENETC_RBBAR0 0x10 /* Rx BDR base address register 0 */ +#define ENETC_RBBAR1 0x14 /* Rx BDR base address register 1*/ +#define ENETC_RBPIR 0x18 /* Rx BDR producer index register*/ +#define ENETC_RBLENR 0x20 /* Rx BDR length register*/ +#define ENETC_RBIER 0xa0 /* Rx BDR interrupt enable register*/ +#define ENETC_RBIER_RXTIE BIT(0) +#define ENETC_RBIDR 0xa4 /* Rx BDR interrupt detect register*/ +#define ENETC_RBICIR0 0xa8 /* Rx BDR inetrrupt coalescing register 0*/ +#define ENETC_RBICIR0_ICEN BIT(31) + + +#define ENETC_TBMR 0x0 /* Tx BDR mode register (TBMR) 32 RW */ +#define ENETC_TBSR 0x4 /* x BDR status register (TBSR) 32 RO */ +#define ENETC_TBBAR0 0x10 /* Tx BDR base address register 0 (TBBAR0) 32 RW */ +#define ENETC_TBBAR1 0x14 /* Tx BDR base address register 1 (TBBAR1) 32 RW */ +#define ENETC_TBCIR 0x18 /* Tx BDR consumer index register (TBCIR) 32 RW */ +#define ENETC_TBCISR 0x1C /* Tx BDR consumer index shadow register 32 RW */ +#define ENETC_TBIER 0xA0 /* Tx BDR interrupt enable register 32 RW */ +#define ENETC_TBIDR 0xA4 /* Tx BDR interrupt detect register 32 RO */ +#define ENETC_TBICR0 0xA8 /* Tx BDR interrupt coalescing register 0 32 RW */ +#define ENETC_TBICR1 0xAC /* Tx BDR interrupt coalescing register 1 32 RW */ +#define ENETC_TBLENR 0x20 + +#define ENETC_TBCISR_IDX_MASK 0xffff +#define ENETC_TBIER_TXFIE BIT(1) + +#define ENETC_RTBLENR_LEN(n) ((n) & ~0x7) +#define ENETC_TBMR_EN BIT(31) + +/* Port regs, offset: 1_0000h */ +#define ENETC_PORT_BASE 0x10000 +#define ENETC_PMR 0x00000 +#define ENETC_PMR_EN (BIT(16) | BIT(17) | BIT(18)) +#define ENETC_PSR 0x00004 /* RO */ +#define ENETC_PSIPMR 0x00018 +#define ENETC_PSIPMR_SET_UP(n) (0x1 << (n)) /* n = SI index */ +#define ENETC_PSIPMR_SET_MP(n) (0x1 << ((n) + 8)) +#define ENETC_PSIPMR_SET_VLAN_MP(n) (0x1 << ((n) + 16)) +#define ENETC_PSIPMAR0(n) (0x00100 + (n) * 0x20) +#define ENETC_PSIPMAR1(n) (0x00104 + (n) * 0x20) +#define ENETC_PCAPR0 0x00900 +#define ENETC_PCAPR1 0x00904 + +#define ENETC_PV0CFGR(n) (0x00920 + (n) * 0x10) +#define ENETC_PVCFGR_SET_TXBDR(val) ((val) & 0xff) +#define ENETC_PVCFGR_SET_RXBDR(val) (((val) & 0xff) << 16) + +#define ENETC_PM0_CMD_CFG 0x08008 +#define ENETC_PM0_TX_EN BIT(0) +#define ENETC_PM0_RX_EN BIT(1) + +#define ENETC_PM0_MAXFRM 0x08014 +#define ENETC_SET_MAXFRM(val) ((val) << 16) + +#define ENETC_PM0_STATUS 0x08304 +#define ENETC_LINK_MODE 0x0000000000080000ULL +#define ENETC_LINK_STATUS 0x0000000000010000ULL +#define ENETC_LINK_SPEED_MASK 0x0000000000060000ULL +#define ENETC_LINK_SPEED_10M 0x0ULL +#define ENETC_LINK_SPEED_100M 0x0000000000020000ULL +#define ENETC_LINK_SPEED_1G 0x0000000000040000ULL + +/* Global regs, offset: 2_0000h */ +#define ENETC_GLOBAL_BASE 0x20000 +#define ENETC_G_EIPBRR0 0x00bf8 +#define ENETC_G_EIPBRR1 0x00bfc + +/* general register accessors */ +#define enetc_rd_reg(reg) rte_read32((void *)(reg)) +#define enetc_wr_reg(reg, val) rte_write32((val), (void *)(reg)) +#define enetc_rd(hw, off) enetc_rd_reg((size_t)(hw)->reg + (off)) +#define enetc_wr(hw, off, val) enetc_wr_reg((size_t)(hw)->reg + (off), val) +/* port register accessors - PF only */ +#define enetc_port_rd(hw, off) enetc_rd_reg((size_t)(hw)->port + (off)) +#define enetc_port_wr(hw, off, val) \ + enetc_wr_reg((size_t)(hw)->port + (off), val) +/* global register accessors - PF only */ +#define enetc_global_rd(hw, off) \ + enetc_rd_reg((size_t)(hw)->global + (off)) +#define enetc_global_wr(hw, off, val) \ + enetc_wr_reg((size_t)(hw)->global + (off), val) +/* BDR register accessors, see ENETC_BDR() */ +#define enetc_bdr_rd(hw, t, n, off) \ + enetc_rd(hw, ENETC_BDR(t, n, off)) +#define enetc_bdr_wr(hw, t, n, off, val) \ + enetc_wr(hw, ENETC_BDR(t, n, off), val) + +#define enetc_txbdr_rd(hw, n, off) enetc_bdr_rd(hw, TX, n, off) +#define enetc_rxbdr_rd(hw, n, off) enetc_bdr_rd(hw, RX, n, off) +#define enetc_txbdr_wr(hw, n, off, val) \ + enetc_bdr_wr(hw, TX, n, off, val) +#define enetc_rxbdr_wr(hw, n, off, val) \ + enetc_bdr_wr(hw, RX, n, off, val) + +#define ENETC_TX_ADDR(txq, addr) ((void *)((txq)->enetc_txbdr + (addr))) + +#define ENETC_TXBD_FLAGS_IE BIT(13) +#define ENETC_TXBD_FLAGS_F BIT(15) + +/* ENETC Parsed values (Little Endian) */ +#define ENETC_PKT_TYPE_ETHER 0x0060 +#define ENETC_PKT_TYPE_IPV4 0x0000 +#define ENETC_PKT_TYPE_IPV6 0x0020 +#define ENETC_PKT_TYPE_IPV4_TCP \ + (0x0010 | ENETC_PKT_TYPE_IPV4) +#define ENETC_PKT_TYPE_IPV6_TCP \ + (0x0010 | ENETC_PKT_TYPE_IPV6) +#define ENETC_PKT_TYPE_IPV4_UDP \ + (0x0011 | ENETC_PKT_TYPE_IPV4) +#define ENETC_PKT_TYPE_IPV6_UDP \ + (0x0011 | ENETC_PKT_TYPE_IPV6) +#define ENETC_PKT_TYPE_IPV4_SCTP \ + (0x0013 | ENETC_PKT_TYPE_IPV4) +#define ENETC_PKT_TYPE_IPV6_SCTP \ + (0x0013 | ENETC_PKT_TYPE_IPV6) +#define ENETC_PKT_TYPE_IPV4_ICMP \ + (0x0003 | ENETC_PKT_TYPE_IPV4) +#define ENETC_PKT_TYPE_IPV6_ICMP \ + (0x0003 | ENETC_PKT_TYPE_IPV6) + +/* PCI device info */ +struct enetc_hw { + void *reg; /* SI registers, used by all PCI functions */ + void *port; /* Port registers, PF only */ + void *global; /* IP global registers, PF only */ +}; + +struct enetc_eth_mac_info { + uint8_t addr[ETHER_ADDR_LEN]; + uint8_t perm_addr[ETHER_ADDR_LEN]; + uint8_t get_link_status; +}; + +struct enetc_eth_hw { + struct rte_eth_dev *ndev; + struct enetc_hw hw; + uint16_t device_id; + uint16_t vendor_id; + uint8_t revision_id; + struct enetc_eth_mac_info mac; +}; + +/* Transmit Descriptor */ +struct enetc_tx_desc { + uint64_t addr; + uint16_t frm_len; + uint16_t buf_len; + uint32_t flags_errors; +}; + +/* TX Buffer Descriptors (BD) */ +struct enetc_tx_bd { + uint64_t addr; + uint16_t buf_len; + uint16_t frm_len; + uint16_t err_csum; + uint16_t flags; +}; + +/* RX buffer descriptor */ +union enetc_rx_bd { + struct { + uint64_t addr; + uint8_t reserved[8]; + } w; + struct { + uint16_t inet_csum; + uint16_t parse_summary; + uint32_t rss_hash; + uint16_t buf_len; + uint16_t vlan_opt; + union { + struct { + uint16_t flags; + uint16_t error; + }; + uint32_t lstatus; + }; + } r; +}; + +#endif diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h new file mode 100644 index 000000000..817e4b434 --- /dev/null +++ b/drivers/net/enetc/enetc.h @@ -0,0 +1,87 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2018 NXP + */ + +#ifndef _ENETC_H_ +#define _ENETC_H_ + +#include + +#include "base/enetc_hw.h" + +#define PCI_VENDOR_ID_FREESCALE 0x1957 + +/* Max TX rings per ENETC. */ +#define MAX_TX_RINGS 2 + +/* Max RX rings per ENTEC. */ +#define MAX_RX_RINGS 1 + +/* + * upper_32_bits - return bits 32-63 of a number + * @n: the number we're accessing + * + * A basic shift-right of a 64- or 32-bit quantity. Use this to suppress + * the "right shift count >= width of type" warning when that quantity is + * 32-bits. + */ +#define upper_32_bits(n) ((uint32_t)(((n) >> 16) >> 16)) + +/* + * lower_32_bits - return bits 0-31 of a number + * @n: the number we're accessing + */ +#define lower_32_bits(n) ((uint32_t)(n)) + +#define ENETC_TXBD(BDR, i) (&(((struct enetc_tx_bd *)((BDR).bd_base))[i])) +#define ENETC_RXBD(BDR, i) (&(((union enetc_rx_bd *)((BDR).bd_base))[i])) + +struct enetc_swbd { + struct rte_mbuf *buffer_addr; +}; + +struct enetc_bdr { + struct rte_eth_dev *ndev; + struct rte_mempool *mb_pool; /* mbuf pool to populate RX ring. */ + void *bd_base; /* points to Rx or Tx BD ring */ + union { + void *tcir; + void *rcir; + }; + uint16_t index; + int bd_count; /* # of BDs */ + int next_to_use; + int next_to_clean; + struct enetc_swbd *q_swbd; + union { + void *tcisr; /* Tx */ + int next_to_alloc; /* Rx */ + }; +}; + +/* + * Structure to store private data for each driver instance (for each port). + */ +struct enetc_eth_adapter { + struct rte_eth_dev *ndev; + struct enetc_eth_hw hw; +}; + +#define ENETC_DEV_PRIVATE(adapter) \ + ((struct enetc_eth_adapter *)adapter) + +#define ENETC_DEV_PRIVATE_TO_HW(adapter) \ + (&((struct enetc_eth_adapter *)adapter)->hw) + +#define ENETC_DEV_PRIVATE_TO_STATS(adapter) \ + (&((struct enetc_eth_adapter *)adapter)->stats) + +#define ENETC_DEV_PRIVATE_TO_INTR(adapter) \ + (&((struct enetc_eth_adapter *)adapter)->intr) + +#define ENETC_GET_HW_ADDR(reg, addr) ((void *)(((size_t)reg) + (addr))) +#define ENETC_REG_READ(addr) (*(uint32_t *)addr) +#define ENETC_REG_WRITE(addr, val) (*(uint32_t *)addr = val) +#define ENETC_REG_WRITE_RELAXED(addr, val) (*(uint32_t *)addr = val) + +#endif /* _ENETC_H_ */ diff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_ethdev.c new file mode 100644 index 000000000..f465f286f --- /dev/null +++ b/drivers/net/enetc/enetc_ethdev.c @@ -0,0 +1,275 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2018 NXP + */ + +#include +#include + +#include "enetc_logs.h" +#include "enetc.h" + +int enetc_logtype_pmd; + +/* Functions Prototypes */ +static int enetc_dev_configure(struct rte_eth_dev *dev); +static int enetc_dev_start(struct rte_eth_dev *dev); +static void enetc_dev_stop(struct rte_eth_dev *dev); +static void enetc_dev_close(struct rte_eth_dev *dev); +static void enetc_dev_infos_get(struct rte_eth_dev *dev, + struct rte_eth_dev_info *dev_info); +static int enetc_link_update(struct rte_eth_dev *dev, int wait_to_complete); +static int enetc_hardware_init(struct enetc_eth_hw *hw); + +/* + * The set of PCI devices this driver supports + */ +static const struct rte_pci_id pci_id_enetc_map[] = { + { RTE_PCI_DEVICE(PCI_VENDOR_ID_FREESCALE, ENETC_DEV_ID) }, + { RTE_PCI_DEVICE(PCI_VENDOR_ID_FREESCALE, ENETC_DEV_ID_VF) }, + { .vendor_id = 0, /* sentinel */ }, +}; + +/* Features supported by this driver */ +static const struct eth_dev_ops enetc_ops = { + .dev_configure = enetc_dev_configure, + .dev_start = enetc_dev_start, + .dev_stop = enetc_dev_stop, + .dev_close = enetc_dev_close, + .link_update = enetc_link_update, + .dev_infos_get = enetc_dev_infos_get, +}; + +/** + * Initialisation of the enetc device + * + * @param eth_dev + * - Pointer to the structure rte_eth_dev + * + * @return + * - On success, zero. + * - On failure, negative value. + */ +static int +enetc_dev_init(struct rte_eth_dev *eth_dev) +{ + int error = 0; + struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev); + struct enetc_eth_hw *hw = + ENETC_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); + + PMD_INIT_FUNC_TRACE(); + eth_dev->dev_ops = &enetc_ops; + eth_dev->rx_pkt_burst = NULL; + eth_dev->tx_pkt_burst = NULL; + + /* Retrieving and storing the HW base address of device */ + hw->hw.reg = (void *)pci_dev->mem_resource[0].addr; + hw->device_id = pci_dev->id.device_id; + + error = enetc_hardware_init(hw); + if (error != 0) { + ENETC_PMD_ERR("Hardware initialization failed"); + return -1; + } + + /* Allocate memory for storing MAC addresses */ + eth_dev->data->mac_addrs = rte_zmalloc("enetc_eth", ETHER_ADDR_LEN, 0); + if (!eth_dev->data->mac_addrs) { + ENETC_PMD_ERR("Failed to allocate %d bytes needed to " + "store MAC addresses", + ETHER_ADDR_LEN * 1); + error = -ENOMEM; + return -1; + } + + /* Copy the permanent MAC address */ + ether_addr_copy((struct ether_addr *)hw->mac.addr, + ð_dev->data->mac_addrs[0]); + + ENETC_PMD_DEBUG("port_id %d vendorID=0x%x deviceID=0x%x", + eth_dev->data->port_id, pci_dev->id.vendor_id, + pci_dev->id.device_id); + return 0; +} + +static int +enetc_dev_uninit(struct rte_eth_dev *eth_dev) +{ + PMD_INIT_FUNC_TRACE(); + rte_free(eth_dev->data->mac_addrs); + + return 0; +} + +static int +enetc_dev_configure(struct rte_eth_dev *dev __rte_unused) +{ + PMD_INIT_FUNC_TRACE(); + return 0; +} + +static int +enetc_dev_start(struct rte_eth_dev *dev) +{ + struct enetc_eth_hw *hw = + ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private); + uint32_t val; + + PMD_INIT_FUNC_TRACE(); + val = ENETC_REG_READ(ENETC_GET_HW_ADDR(hw->hw.port, + ENETC_PM0_CMD_CFG)); + ENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PM0_CMD_CFG), + val | ENETC_PM0_TX_EN | ENETC_PM0_RX_EN); + + /* Enable port */ + val = ENETC_REG_READ(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PMR)); + ENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PMR), + val | ENETC_PMR_EN); + + return 0; +} + +static void +enetc_dev_stop(struct rte_eth_dev *dev) +{ + struct enetc_eth_hw *hw = + ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private); + uint32_t val; + + PMD_INIT_FUNC_TRACE(); + /* Disable port */ + val = ENETC_REG_READ(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PMR)); + ENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PMR), + val & (~ENETC_PMR_EN)); + + val = ENETC_REG_READ(ENETC_GET_HW_ADDR(hw->hw.port, + ENETC_PM0_CMD_CFG)); + ENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PM0_CMD_CFG), + val & (~(ENETC_PM0_TX_EN | ENETC_PM0_RX_EN))); +} + +static void +enetc_dev_close(struct rte_eth_dev *dev __rte_unused) +{ + PMD_INIT_FUNC_TRACE(); +} + +/* return 0 means link status changed, -1 means not changed */ +static int +enetc_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused) +{ + struct enetc_eth_hw *hw = + ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private); + struct rte_eth_link link; + uint32_t status; + + PMD_INIT_FUNC_TRACE(); + + memset(&link, 0, sizeof(link)); + + status = ENETC_REG_READ(ENETC_GET_HW_ADDR(hw->hw.port, + ENETC_PM0_STATUS)); + + if (status & ENETC_LINK_MODE) + link.link_duplex = ETH_LINK_FULL_DUPLEX; + else + link.link_duplex = ETH_LINK_HALF_DUPLEX; + + if (status & ENETC_LINK_STATUS) + link.link_status = ETH_LINK_UP; + else + link.link_status = ETH_LINK_DOWN; + + switch (status & ENETC_LINK_SPEED_MASK) { + case ENETC_LINK_SPEED_1G: + link.link_speed = ETH_SPEED_NUM_1G; + break; + + case ENETC_LINK_SPEED_100M: + link.link_speed = ETH_SPEED_NUM_100M; + break; + + default: + case ENETC_LINK_SPEED_10M: + link.link_speed = ETH_SPEED_NUM_10M; + } + + return rte_eth_linkstatus_set(dev, &link); +} + +static int +enetc_hardware_init(struct enetc_eth_hw *hw) +{ + uint32_t psipmr = 0; + + PMD_INIT_FUNC_TRACE(); + /* Calculating and storing the base HW addresses */ + hw->hw.port = (void *)((size_t)hw->hw.reg + ENETC_PORT_BASE); + hw->hw.global = (void *)((size_t)hw->hw.reg + ENETC_GLOBAL_BASE); + + /* Enabling Station Interface */ + ENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.reg, ENETC_SIMR), + ENETC_SIMR_EN); + + /* Setting to accept broadcast packets for each inetrface */ + psipmr |= ENETC_PSIPMR_SET_UP(0) | ENETC_PSIPMR_SET_MP(0) | + ENETC_PSIPMR_SET_VLAN_MP(0); + psipmr |= ENETC_PSIPMR_SET_UP(1) | ENETC_PSIPMR_SET_MP(1) | + ENETC_PSIPMR_SET_VLAN_MP(1); + psipmr |= ENETC_PSIPMR_SET_UP(2) | ENETC_PSIPMR_SET_MP(2) | + ENETC_PSIPMR_SET_VLAN_MP(2); + + ENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PSIPMR), + psipmr); + + /* Enabling broadcast address */ + ENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PSIPMAR0(0)), + 0xFFFFFFFF); + ENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PSIPMAR1(0)), + 0xFFFF << 16); + + return 0; +} + +static void +enetc_dev_infos_get(struct rte_eth_dev *dev __rte_unused, + struct rte_eth_dev_info *dev_info) +{ + PMD_INIT_FUNC_TRACE(); + dev_info->max_rx_queues = MAX_RX_RINGS; + dev_info->max_tx_queues = MAX_TX_RINGS; + dev_info->max_rx_pktlen = 1500; +} + +static int +enetc_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, + struct rte_pci_device *pci_dev) +{ + return rte_eth_dev_pci_generic_probe(pci_dev, + sizeof(struct enetc_eth_adapter), + enetc_dev_init); +} + +static int +enetc_pci_remove(struct rte_pci_device *pci_dev) +{ + return rte_eth_dev_pci_generic_remove(pci_dev, enetc_dev_uninit); +} + +static struct rte_pci_driver rte_enetc_pmd = { + .id_table = pci_id_enetc_map, + .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_IOVA_AS_VA, + .probe = enetc_pci_probe, + .remove = enetc_pci_remove, +}; + +RTE_PMD_REGISTER_PCI(net_enetc, rte_enetc_pmd); +RTE_PMD_REGISTER_PCI_TABLE(net_enetc, pci_id_enetc_map); +RTE_PMD_REGISTER_KMOD_DEP(net_enetc, "* vfio-pci"); + +RTE_INIT(enetc_pmd_init_log) +{ + enetc_logtype_pmd = rte_log_register("pmd.net.enetc"); + if (enetc_logtype_pmd >= 0) + rte_log_set_level(enetc_logtype_pmd, RTE_LOG_NOTICE); +} diff --git a/drivers/net/enetc/enetc_logs.h b/drivers/net/enetc/enetc_logs.h new file mode 100644 index 000000000..f5d37c005 --- /dev/null +++ b/drivers/net/enetc/enetc_logs.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2018 NXP + */ + +#ifndef _ENETC_LOGS_H_ +#define _ENETC_LOGS_H_ + +extern int enetc_logtype_pmd; + +#define ENETC_PMD_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, enetc_logtype_pmd, "enetc_net: " \ + fmt "\n", ##args) + +#define ENETC_PMD_DEBUG(fmt, args...) \ + rte_log(RTE_LOG_DEBUG, enetc_logtype_pmd, "enetc_net: %s(): "\ + fmt "\n", __func__, ##args) + +#define PMD_INIT_FUNC_TRACE() ENETC_PMD_DEBUG(">>") + +#define ENETC_PMD_CRIT(fmt, args...) \ + ENETC_PMD_LOG(CRIT, fmt, ## args) +#define ENETC_PMD_INFO(fmt, args...) \ + ENETC_PMD_LOG(INFO, fmt, ## args) +#define ENETC_PMD_ERR(fmt, args...) \ + ENETC_PMD_LOG(ERR, fmt, ## args) +#define ENETC_PMD_WARN(fmt, args...) \ + ENETC_PMD_LOG(WARNING, fmt, ## args) + +#endif /* _ENETC_LOGS_H_*/ diff --git a/drivers/net/enetc/meson.build b/drivers/net/enetc/meson.build new file mode 100644 index 000000000..506b174ed --- /dev/null +++ b/drivers/net/enetc/meson.build @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 NXP + +if host_machine.system() != 'linux' + build = false +endif + +sources = files('enetc_ethdev.c') + +includes += include_directories('base') diff --git a/drivers/net/enetc/rte_pmd_enetc_version.map b/drivers/net/enetc/rte_pmd_enetc_version.map new file mode 100644 index 000000000..521e51f41 --- /dev/null +++ b/drivers/net/enetc/rte_pmd_enetc_version.map @@ -0,0 +1,4 @@ +DPDK_18.11 { + + local: *; +}; diff --git a/drivers/net/meson.build b/drivers/net/meson.build index 9c28ed4da..65aa6f60c 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -11,6 +11,7 @@ drivers = ['af_packet', 'dpaa', 'dpaa2', 'e1000', 'ena', + 'enetc', 'enic', 'failsafe', 'fm10k', 'i40e', diff --git a/mk/rte.app.mk b/mk/rte.app.mk index de33883be..154ae3b2c 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -135,6 +135,7 @@ endif _LDLIBS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += -lrte_pmd_e1000 _LDLIBS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += -lrte_pmd_ena _LDLIBS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += -lrte_pmd_enic +_LDLIBS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += -lrte_pmd_enetc _LDLIBS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += -lrte_pmd_fm10k _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += -lrte_pmd_failsafe _LDLIBS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += -lrte_pmd_i40e From patchwork Wed Oct 3 13:36:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 45959 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B572C1B398; Wed, 3 Oct 2018 15:37:22 +0200 (CEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70043.outbound.protection.outlook.com [40.107.7.43]) by dpdk.org (Postfix) with ESMTP id 047181B276 for ; Wed, 3 Oct 2018 15:37:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=v3cwdnWtPbE6yqvxRCP+cRxtKLHl6/LsdZAm5WTIdmQ=; b=kDeSucIptOxt/KUEJMQvU0wtuspqJiEROrlt8sxmeOjkH195h8/IyzqGdV/aI3chjwEtPsu0bne92ZNLDb9hT4z2E7srp1euZ7LtwGDrOTklGG1Me7C3ptLiCKq89RTujzHg6MnBXTX/mjmhCmUFWdjs4ugGMvYEK2QDjTNsBI0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=G.Singh@nxp.com; Received: from Tophie.ap.freescale.net (14.142.187.166) by AM4PR04MB1521.eurprd04.prod.outlook.com (2a01:111:e400:59e4::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.25; Wed, 3 Oct 2018 13:37:13 +0000 From: Gagandeep Singh To: dev@dpdk.org, ferruh.yigit@intel.com Cc: pankaj.chauhan@nxp.com, Gagandeep Singh Date: Wed, 3 Oct 2018 19:06:06 +0530 Message-Id: <20181003133608.3605-3-g.singh@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003133608.3605-1-g.singh@nxp.com> References: <20180928074601.4287-1-g.singh@nxp.com> <20181003133608.3605-1-g.singh@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: MA1PR01CA0095.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:1::11) To AM4PR04MB1521.eurprd04.prod.outlook.com (2a01:111:e400:59e4::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 545e2e56-ae86-4a2d-eea7-08d62935546d X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM4PR04MB1521; X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1521; 3:hda6XGd8IEzRyXAFjDRnPgnV54QaH5U1XG5gl0H8siG/c80DlBdAm51xOVdeuFm4B7j5z2F6+q4ux3U+uWLvKZpivwi+zRDwr6QFDsXPi96Ffx8/dpo30ljdHQArNUNHDCOdX4iSuZFTNYlyKCYs5JUxuCksmBszD+pRNnq01P68+KuujoriwTeY8YXAfy5T25PbUO/3uDBdKLzT4nwsjMnQhtfAEKrb0lWO4+JCN2Opg63Ce/ErP/mjVi/u5v51; 25:aOlGkDv0SoqhtosAwTjL1j1u/SHUcZe9chPgZguMeePHpm5bHdhPVQ4pPWvoXZwMpv3QYPmuK8fnlm6/lCpIcgnD19+/TjOI8pp9Sj0UhH/y560rt8YaWDrzz9flT+oT5Lgj1q/fOIGyRrEIeH+hr/dK4Gdck7Z5oa8pYF17/MWQLTwIzSgLplRDUveY4X88LwcTpfSjLxVQjJoRp3Hrc+3cWDAXuB0yC1rPuwja0tktsRQJCz8ppDGsfF4+sHzT24ap83fInR6cU7tNIJjo88y7ZIDuiER6t7isV+R7Xxy1QxGfxXU/tkKrb8TFaaYsGxlOxH7foWNzesst2gdJCA==; 31:SEIY2z1XlM3ghqETrcmBUkB1GFWigPwtd6iEqa3uf0LELEf/15NL7T9yIcHUWqLUKBpwzifMgzZUUzJa9ZpvK8tsfPoy++ZPshA5Q5oL+2d6KZ8VjSJOg7S3fVtoHUMtlTwzeWPYxcZLdem6blzwM/cnMl4jF+Eez2L7R2YF2zHNPqV7X5lQWNX/mUzlqDwQMiA/x4+si4hSj/h2hNNw/L3YsMpJ1sHSrXXfCO9a/kI= X-MS-TrafficTypeDiagnostic: AM4PR04MB1521: X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1521; 20:h0ZJHyRBXYbt1P4jP0YiQi8PKD8IwpxfFZL5vlPkH7sRHcpTPmJz0FbZY+xFA83tBTlw9dUlbrav6rUj8XNr0nD18bZ1zum2kj1LDO78gS+uekV1VVxah8vKeH5a9G0HT8joC/7vdTKieTB6y9wBl9JC+QY/PnhoZuDQtTwd0oBhTtzrYrpEA9fIgFlfnGQj5YZUzJxdfSP0EmDua5XNGsUrAi8PGEmDQWKGYkcTlKgQBg7KkRrBdL18vYEfJaEmU6dHlAUWv/KDIdt5eus89noTZ0rAe4FDitUKOawR8fof2YHC7aWHsqU1mRQFG9S6yU0yZfGrNCUD6/d01p9/p3MSzCrgUCEhZZMB7gffmOGupuwIVMHDlZjJJFMGaDapK2v/EYvkSSvUTx88GGIZYWZe5v9TMgliZ9cOoQvzcHzYxd48RQ+qZhNF2O51eBJzo/8skbkxjE4szdGbgE6rtKM1AY/M4BQchnh352oxWnLA3HRCTWsfckfZHOJ1HK0Q; 4:7wYdySuC6O/0bkzysvCuNjQyKWZ4Y0eIUUdO47Qh0lp2WvHHST2Bbmm/+yAY1gOd0hArd45yVnPku6+74Hwn+YAIXsS/fGJmO8mRGdRUwDrrNAgaQcwyGxzkgI2FHaQmEIJ7g7dZ0ob96cHMnd0HvQC6Qr6IkWQQmx1TvWjAWn5GIp747gHylXJTk9G2diRfW/TVqsV372FktEMa8aTcEJ7cUM6gxv8XltHL59WE2Ar3atsewoRAyEGIeuHG1tnK1OIqUlnRq4rIN16dSwlNgaXfuT1p/QSmUjtUG+gNrQ4i+mRnuiweMsKXJ9spDyMO X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231355)(944501410)(52105095)(10201501046)(3002001)(6055026)(149066)(150057)(6041310)(20161123560045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699051); SRVR:AM4PR04MB1521; BCL:0; PCL:0; RULEID:; SRVR:AM4PR04MB1521; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(346002)(136003)(396003)(366004)(199004)(189003)(22813001)(6486002)(97736004)(6116002)(3846002)(86362001)(575784001)(106356001)(1076002)(55236004)(14444005)(53936002)(6512007)(4326008)(2906002)(52116002)(476003)(6506007)(105586002)(386003)(25786009)(956004)(81166006)(2616005)(81156014)(47776003)(51416003)(8936002)(11346002)(446003)(8676002)(66066001)(305945005)(5009440100003)(68736007)(72206003)(26005)(5660300001)(7736002)(76176011)(50226002)(36756003)(486006)(316002)(4744004)(48376002)(16526019)(186003)(50466002)(16586007)(6666003)(478600001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR04MB1521; H:Tophie.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR04MB1521; 23:ZoK4Td7auwey/gVmOayQq6QhMLWMLpPAbZgtoda0W?= CZBPbzyt7/W5t6stc6Xt5o15aAB5JXY/EMpiZdne6cqJdzjyLdEpUgkm6VEWF4TSx1oCXUdd0YHrxyUUXDvc/D1QPoMcrlzmF9yrcCILD2JhgCJcyqAXXKViecZ5mchYpMIJy5ba+gItLwvgoYdAwxAyvsW/b6xjVgQpTH8LipQ0f1CcQVof4zIn4ilzKz3k+6ymQOd1jTPmzTq3L4q9NbFB4JOlNUfaP1WTihmiNiNzGkFYAqIKhi4/PDKwcramp/xDN9tc9edxBJn3bJhdFU59IfGf0lothvHqnbm2PM2nTCRfNXHZs9j2e3d2KxgQzOVUU4YHXPMrIUXHJyPRW1pHTBFh6VU0U8GN1BhoIyCFfeEqYnKYgHlbHXHCA3idVz5DaJmyK/Hwie+0KDoGVNWRCmKc5V23UIaxoYZl+QVCP45it7HjkIIBZxFH1/ltQW4pxojdhCELNhKebxHCtywCjyWJdpDSTWgwQLgFX6ows+Nbro4Pkpewak38NV5j81svp/UHbxFTSovUptD66oy/FbkWeX8OBPT0rwCNY/gGk5kiAwaaafl3epJ50jjTd3nBIObyxqTSIN1bMoW0/t/2RZ1Ycyn/bSfo+a+pbYkHVmOe4KVc5VKHg+yqRFPL8zWazwvRrXwtx1/Ek8kRUeDsswqd9gFR2/qfMH8rKJPkhM7AETS/eOzZ/gWFNyFdtuK7p9ry1nvWJfPXe6SJyPK2m8o4MRHl1JU6Drqm4IR2JFqNAIyq8t28hrvN55bN2S7n+/YGgzt02c6ka1fZWr7b7WzECyHS2fyq+iePsz+QKO2hJwmFpJMiDZsvQOMH7XyufRI8laT2pe3ZZiQ3fBFT/KLfNyZgIAy3FPj/fAueN/ee2QXEDQBFY6nwmcgH3IQcWDmdxYBbt57TjtYSlULkWePNdXsebdyBYlEJGKyrgblYHN/BTgqvahaM8sqzY+ZNmv52KQaYSUAv09rIhdj3ZDcGuOBsEyl9O4l5nNC6bVbb0Zm+j7LOE4wenBbpYTJSaAc3m2CAbFvvsmyGna8XB55myIowB/N+wk77x51LdyOCEgoeEJq9F4XMWFGRBbGZYWcIviwgZYVLCBXiHlj7jVJ33WBCEJms3/nNvjJ/vog7Fyv8mAREHkmevH8d5cxhJYJ4s25i5wLvcRtmd8F0cfQzpKkZ8Hqyzg2pviyT+TKTf+qEDxjIjX/qvtFOdh438R19Qqp70hsG7WYyslcM7OVglY2I4afWYVxcr1dk7qrn5JVgqOoRztxm1lKcpRyy8IzkoPjZAAdkpUl6jGRKJ8QLrSgTiFI3JIXOnvJMw== X-Microsoft-Antispam-Message-Info: 6d1J+RgPkjYuqJGLK6eG7j7Hv6J40yNCBJb3pUYJ7FyE9Qrd0C//agkK45T/ZvqBn0CiyXD+nAY5G/iL7k+k2+BQOPVoUEBRITy7GW2B8icaHlA8CCwizv6/diB5CBYbhHb7ejeI6vEzEwO8xMGXRiGzvPN9Hve7wVtwWek8PrtLS91XXQ1zg+hcI/WNapFbhvmU6/QuoWcBvRwR/QakJlhLsJx0mr/m0gia82JyO9GycIJDGOQQGXgIaae0fciwXhepAvNZrrNxRMg7APRA5TxpHa7T0HPq7psgZ9jV7vipeQlcwi4wbbeIhGIZwVE2fngwW2jYJaNBnrRmp37vLFJ2DExg6fTULk7CfN3KFl0= X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1521; 6:FzNNxpjs+YL6kXVPXPkwiTYHr/pu+aYW1ajGGqYa87Yj2eR9uM4dzLgyXZxu92l9Kap51FVbdlEUGnpXuZKU6Utxs+mvBi2CnFiyf+tuHXZK2D4wYsjbqw5Nuv7Cw0TxB3sac2qj6VnEE5d1ckl2ogyTOEUkWeKzEDSH5waw/wg8qVEbypOq6uGcVWdyt+7MebdhtQtqOp76cnR5bIBalWQ3wphJmrmz2h7Ehz0f0tSeHhU9P46Jk4+jcKsC88RNPa4VL1nYj0BsUumcgf8bE3q2WfrkwvFmCj/UsJhJELbqskTBRkC1Ah0LwTCOOudgMHxB361Rq4i1mbUjLoPTwlTTlelb4qOURUId38onTyzfE0jOqro/NmJVif23GDTY2sopovz8XHlo9DLHUmuBxzP7zLsWSqKgUqI0pCgByVVQ53/OKDTWJRbJCXakeas2OxyHpPgSP2FNTBbVV73L0g==; 5:znwKQwGVDLbcxpYCSscG3ra3df46XUvvsZ0nRnBgi/DRI69fl476DNU+/2Pd8n8VuWiIjUcEV/crMDv6/0TgZMLRIFWQK+DT/N9bYeGu0Br95s6UWQhHyf7rKdzgs1gpeVXI1VuGmWPEyGi5J4F1vkl64NSM00v64KHFHtqXcIA=; 7:w0X2ZN+MKD4zjOiwos53+4tTzKcd9t5J+1TNURPZhxWqF0yOGi1ChQ5FNQ7Qq4OQAa/gHNoitPc9yaQAOfa9B5layYWFROLXD2foAr+VrfWcKWxMEVLJWkHdfVhS/e9oD1Xzy/GQKFn9K7A/UBHRy3+nf9NoBVNqljzb26L2PfAe0zr0NZJ0hjLQg0g9//Roy+NoCQngn8K7grW9lHOPzmXw2872mS6s55oNz9DpvqjEcoDuiSwBG60rI5t9QVqZ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 13:37:13.1907 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 545e2e56-ae86-4a2d-eea7-08d62935546d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR04MB1521 Subject: [dpdk-dev] [PATCH v5 2/4] net/enetc: enable Rx and Tx X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add RX and TX queue setup, datapath functions Signed-off-by: Gagandeep Singh --- drivers/net/enetc/Makefile | 3 +- drivers/net/enetc/enetc.h | 26 +++ drivers/net/enetc/enetc_ethdev.c | 343 ++++++++++++++++++++++++++++++- drivers/net/enetc/enetc_logs.h | 11 + drivers/net/enetc/enetc_rxtx.c | 239 +++++++++++++++++++++ drivers/net/enetc/meson.build | 3 +- 6 files changed, 620 insertions(+), 5 deletions(-) create mode 100644 drivers/net/enetc/enetc_rxtx.c diff --git a/drivers/net/enetc/Makefile b/drivers/net/enetc/Makefile index 519153868..9895501db 100644 --- a/drivers/net/enetc/Makefile +++ b/drivers/net/enetc/Makefile @@ -14,8 +14,9 @@ EXPORT_MAP := rte_pmd_enetc_version.map LIBABIVER := 1 SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_ethdev.c +SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_rxtx.c -LDLIBS += -lrte_eal +LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool LDLIBS += -lrte_ethdev LDLIBS += -lrte_bus_pci diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h index 817e4b434..0e80d1c5b 100644 --- a/drivers/net/enetc/enetc.h +++ b/drivers/net/enetc/enetc.h @@ -17,6 +17,13 @@ /* Max RX rings per ENTEC. */ #define MAX_RX_RINGS 1 +/* Max BD counts per Ring. */ +#define MAX_BD_COUNT 64000 +/* Min BD counts per Ring. */ +#define MIN_BD_COUNT 32 +/* BD ALIGN */ +#define BD_ALIGN 8 + /* * upper_32_bits - return bits 32-63 of a number * @n: the number we're accessing @@ -84,4 +91,23 @@ struct enetc_eth_adapter { #define ENETC_REG_WRITE(addr, val) (*(uint32_t *)addr = val) #define ENETC_REG_WRITE_RELAXED(addr, val) (*(uint32_t *)addr = val) +/* + * RX/TX ENETC function prototypes + */ +uint16_t enetc_xmit_pkts(void *txq, struct rte_mbuf **tx_pkts, + uint16_t nb_pkts); +uint16_t enetc_recv_pkts(void *rxq, struct rte_mbuf **rx_pkts, + uint16_t nb_pkts); + + +int enetc_refill_rx_ring(struct enetc_bdr *rx_ring, const int buff_cnt); + +static inline int +enetc_bd_unused(struct enetc_bdr *bdr) +{ + if (bdr->next_to_clean > bdr->next_to_use) + return bdr->next_to_clean - bdr->next_to_use - 1; + + return bdr->bd_count + bdr->next_to_clean - bdr->next_to_use - 1; +} #endif /* _ENETC_H_ */ diff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_ethdev.c index f465f286f..dfe7ddaa1 100644 --- a/drivers/net/enetc/enetc_ethdev.c +++ b/drivers/net/enetc/enetc_ethdev.c @@ -19,6 +19,15 @@ static void enetc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info); static int enetc_link_update(struct rte_eth_dev *dev, int wait_to_complete); static int enetc_hardware_init(struct enetc_eth_hw *hw); +static int enetc_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, + uint16_t nb_rx_desc, unsigned int socket_id, + const struct rte_eth_rxconf *rx_conf, + struct rte_mempool *mb_pool); +static void enetc_rx_queue_release(void *rxq); +static int enetc_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, + uint16_t nb_tx_desc, unsigned int socket_id, + const struct rte_eth_txconf *tx_conf); +static void enetc_tx_queue_release(void *txq); /* * The set of PCI devices this driver supports @@ -37,6 +46,10 @@ static const struct eth_dev_ops enetc_ops = { .dev_close = enetc_dev_close, .link_update = enetc_link_update, .dev_infos_get = enetc_dev_infos_get, + .rx_queue_setup = enetc_rx_queue_setup, + .rx_queue_release = enetc_rx_queue_release, + .tx_queue_setup = enetc_tx_queue_setup, + .tx_queue_release = enetc_tx_queue_release, }; /** @@ -59,8 +72,8 @@ enetc_dev_init(struct rte_eth_dev *eth_dev) PMD_INIT_FUNC_TRACE(); eth_dev->dev_ops = &enetc_ops; - eth_dev->rx_pkt_burst = NULL; - eth_dev->tx_pkt_burst = NULL; + eth_dev->rx_pkt_burst = &enetc_recv_pkts; + eth_dev->tx_pkt_burst = &enetc_xmit_pkts; /* Retrieving and storing the HW base address of device */ hw->hw.reg = (void *)pci_dev->mem_resource[0].addr; @@ -149,9 +162,24 @@ enetc_dev_stop(struct rte_eth_dev *dev) } static void -enetc_dev_close(struct rte_eth_dev *dev __rte_unused) +enetc_dev_close(struct rte_eth_dev *dev) { + uint16_t i; + PMD_INIT_FUNC_TRACE(); + enetc_dev_stop(dev); + + for (i = 0; i < dev->data->nb_rx_queues; i++) { + enetc_rx_queue_release(dev->data->rx_queues[i]); + dev->data->rx_queues[i] = NULL; + } + dev->data->nb_rx_queues = 0; + + for (i = 0; i < dev->data->nb_tx_queues; i++) { + enetc_tx_queue_release(dev->data->tx_queues[i]); + dev->data->tx_queues[i] = NULL; + } + dev->data->nb_tx_queues = 0; } /* return 0 means link status changed, -1 means not changed */ @@ -236,11 +264,320 @@ enetc_dev_infos_get(struct rte_eth_dev *dev __rte_unused, struct rte_eth_dev_info *dev_info) { PMD_INIT_FUNC_TRACE(); + dev_info->rx_desc_lim = (struct rte_eth_desc_lim) { + .nb_max = MAX_BD_COUNT, + .nb_min = MIN_BD_COUNT, + .nb_align = BD_ALIGN, + }; + dev_info->tx_desc_lim = (struct rte_eth_desc_lim) { + .nb_max = MAX_BD_COUNT, + .nb_min = MIN_BD_COUNT, + .nb_align = BD_ALIGN, + }; dev_info->max_rx_queues = MAX_RX_RINGS; dev_info->max_tx_queues = MAX_TX_RINGS; dev_info->max_rx_pktlen = 1500; } +static int +enetc_alloc_txbdr(struct enetc_bdr *txr, uint16_t nb_desc) +{ + int size; + + size = nb_desc * sizeof(struct enetc_swbd); + txr->q_swbd = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE); + if (txr->q_swbd == NULL) + return -ENOMEM; + + size = nb_desc * sizeof(struct enetc_tx_bd); + txr->bd_base = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE); + if (txr->bd_base == NULL) { + rte_free(txr->q_swbd); + txr->q_swbd = NULL; + return -ENOMEM; + } + + txr->bd_count = nb_desc; + txr->next_to_clean = 0; + txr->next_to_use = 0; + + return 0; +} + +static void +enetc_free_bdr(struct enetc_bdr *rxr) +{ + rte_free(rxr->q_swbd); + rte_free(rxr->bd_base); + rxr->q_swbd = NULL; + rxr->bd_base = NULL; +} + +static void +enetc_setup_txbdr(struct enetc_hw *hw, struct enetc_bdr *tx_ring) +{ + int idx = tx_ring->index; + uintptr_t base_addr; + uint32_t tbmr; + + base_addr = (uintptr_t)tx_ring->bd_base; + enetc_txbdr_wr(hw, idx, ENETC_TBBAR0, + lower_32_bits((uint64_t)base_addr)); + enetc_txbdr_wr(hw, idx, ENETC_TBBAR1, + upper_32_bits((uint64_t)base_addr)); + enetc_txbdr_wr(hw, idx, ENETC_TBLENR, + ENETC_RTBLENR_LEN(tx_ring->bd_count)); + + tbmr = ENETC_TBMR_EN; + /* enable ring */ + enetc_txbdr_wr(hw, idx, ENETC_TBMR, tbmr); + enetc_txbdr_wr(hw, idx, ENETC_TBCIR, 0); + enetc_txbdr_wr(hw, idx, ENETC_TBCISR, 0); + tx_ring->tcir = (void *)((size_t)hw->reg + + ENETC_BDR(TX, idx, ENETC_TBCIR)); + tx_ring->tcisr = (void *)((size_t)hw->reg + + ENETC_BDR(TX, idx, ENETC_TBCISR)); +} + +static int +enetc_alloc_tx_resources(struct rte_eth_dev *dev, + uint16_t queue_idx, + uint16_t nb_desc) +{ + int err; + struct enetc_bdr *tx_ring; + struct rte_eth_dev_data *data = dev->data; + struct enetc_eth_adapter *priv = + ENETC_DEV_PRIVATE(data->dev_private); + + tx_ring = rte_zmalloc(NULL, sizeof(struct enetc_bdr), 0); + if (tx_ring == NULL) { + ENETC_PMD_ERR("Failed to allocate TX ring memory"); + err = -ENOMEM; + return -1; + } + + err = enetc_alloc_txbdr(tx_ring, nb_desc); + if (err) + goto fail; + + tx_ring->index = queue_idx; + tx_ring->ndev = dev; + enetc_setup_txbdr(&priv->hw.hw, tx_ring); + data->tx_queues[queue_idx] = tx_ring; + + return 0; +fail: + rte_free(tx_ring); + + return err; +} + +static int +enetc_tx_queue_setup(struct rte_eth_dev *dev, + uint16_t queue_idx, + uint16_t nb_desc, + unsigned int socket_id __rte_unused, + const struct rte_eth_txconf *tx_conf __rte_unused) +{ + int err = 0; + + PMD_INIT_FUNC_TRACE(); + if (nb_desc > MAX_BD_COUNT) + return -1; + + err = enetc_alloc_tx_resources(dev, queue_idx, nb_desc); + + return err; +} + +static void +enetc_tx_queue_release(void *txq) +{ + if (txq == NULL) + return; + + struct enetc_bdr *tx_ring = (struct enetc_bdr *)txq; + struct enetc_eth_hw *eth_hw = + ENETC_DEV_PRIVATE_TO_HW(tx_ring->ndev->data->dev_private); + struct enetc_hw *hw; + struct enetc_swbd *tx_swbd; + int i; + uint32_t val; + + /* Disable the ring */ + hw = ð_hw->hw; + val = enetc_txbdr_rd(hw, tx_ring->index, ENETC_TBMR); + val &= (~ENETC_TBMR_EN); + enetc_txbdr_wr(hw, tx_ring->index, ENETC_TBMR, val); + + /* clean the ring*/ + i = tx_ring->next_to_clean; + tx_swbd = &tx_ring->q_swbd[i]; + while (tx_swbd->buffer_addr != NULL) { + rte_pktmbuf_free(tx_swbd->buffer_addr); + tx_swbd->buffer_addr = NULL; + tx_swbd++; + i++; + if (unlikely(i == tx_ring->bd_count)) { + i = 0; + tx_swbd = &tx_ring->q_swbd[i]; + } + } + + enetc_free_bdr(tx_ring); + rte_free(tx_ring); +} + +static int +enetc_alloc_rxbdr(struct enetc_bdr *rxr, + uint16_t nb_rx_desc) +{ + int size; + + size = nb_rx_desc * sizeof(struct enetc_swbd); + rxr->q_swbd = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE); + if (rxr->q_swbd == NULL) + return -ENOMEM; + + size = nb_rx_desc * sizeof(union enetc_rx_bd); + rxr->bd_base = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE); + if (rxr->bd_base == NULL) { + rte_free(rxr->q_swbd); + rxr->q_swbd = NULL; + return -ENOMEM; + } + + rxr->bd_count = nb_rx_desc; + rxr->next_to_clean = 0; + rxr->next_to_use = 0; + rxr->next_to_alloc = 0; + + return 0; +} + +static void +enetc_setup_rxbdr(struct enetc_hw *hw, struct enetc_bdr *rx_ring, + struct rte_mempool *mb_pool) +{ + int idx = rx_ring->index; + uintptr_t base_addr; + uint16_t buf_size; + + base_addr = (uintptr_t)rx_ring->bd_base; + enetc_rxbdr_wr(hw, idx, ENETC_RBBAR0, + lower_32_bits((uint64_t)base_addr)); + enetc_rxbdr_wr(hw, idx, ENETC_RBBAR1, + upper_32_bits((uint64_t)base_addr)); + enetc_rxbdr_wr(hw, idx, ENETC_RBLENR, + ENETC_RTBLENR_LEN(rx_ring->bd_count)); + + rx_ring->mb_pool = mb_pool; + /* enable ring */ + enetc_rxbdr_wr(hw, idx, ENETC_RBMR, ENETC_RBMR_EN); + enetc_rxbdr_wr(hw, idx, ENETC_RBPIR, 0); + rx_ring->rcir = (void *)((size_t)hw->reg + + ENETC_BDR(RX, idx, ENETC_RBCIR)); + enetc_refill_rx_ring(rx_ring, (enetc_bd_unused(rx_ring))); + buf_size = (uint16_t)(rte_pktmbuf_data_room_size(rx_ring->mb_pool) - + RTE_PKTMBUF_HEADROOM); + enetc_rxbdr_wr(hw, idx, ENETC_RBBSR, buf_size); +} + +static int +enetc_alloc_rx_resources(struct rte_eth_dev *dev, + uint16_t rx_queue_id, + uint16_t nb_rx_desc, + struct rte_mempool *mb_pool) +{ + int err; + struct enetc_bdr *rx_ring; + struct rte_eth_dev_data *data = dev->data; + struct enetc_eth_adapter *adapter = + ENETC_DEV_PRIVATE(data->dev_private); + + rx_ring = rte_zmalloc(NULL, sizeof(struct enetc_bdr), 0); + if (rx_ring == NULL) { + ENETC_PMD_ERR("Failed to allocate RX ring memory"); + err = -ENOMEM; + return err; + } + + err = enetc_alloc_rxbdr(rx_ring, nb_rx_desc); + if (err) + goto fail; + + rx_ring->index = rx_queue_id; + rx_ring->ndev = dev; + enetc_setup_rxbdr(&adapter->hw.hw, rx_ring, mb_pool); + data->rx_queues[rx_queue_id] = rx_ring; + + return 0; +fail: + rte_free(rx_ring); + + return err; +} + +static int +enetc_rx_queue_setup(struct rte_eth_dev *dev, + uint16_t rx_queue_id, + uint16_t nb_rx_desc, + unsigned int socket_id __rte_unused, + const struct rte_eth_rxconf *rx_conf __rte_unused, + struct rte_mempool *mb_pool) +{ + int err = 0; + + PMD_INIT_FUNC_TRACE(); + if (nb_rx_desc > MAX_BD_COUNT) + return -1; + + err = enetc_alloc_rx_resources(dev, rx_queue_id, + nb_rx_desc, + mb_pool); + + return err; +} + +static void +enetc_rx_queue_release(void *rxq) +{ + if (rxq == NULL) + return; + + struct enetc_bdr *rx_ring = (struct enetc_bdr *)rxq; + struct enetc_eth_hw *eth_hw = + ENETC_DEV_PRIVATE_TO_HW(rx_ring->ndev->data->dev_private); + struct enetc_swbd *q_swbd; + struct enetc_hw *hw; + uint32_t val; + int i; + + /* Disable the ring */ + hw = ð_hw->hw; + val = enetc_rxbdr_rd(hw, rx_ring->index, ENETC_RBMR); + val &= (~ENETC_RBMR_EN); + enetc_rxbdr_wr(hw, rx_ring->index, ENETC_RBMR, val); + + /* Clean the ring */ + i = rx_ring->next_to_clean; + q_swbd = &rx_ring->q_swbd[i]; + while (i != rx_ring->next_to_use) { + rte_pktmbuf_free(q_swbd->buffer_addr); + q_swbd->buffer_addr = NULL; + q_swbd++; + i++; + if (unlikely(i == rx_ring->bd_count)) { + i = 0; + q_swbd = &rx_ring->q_swbd[i]; + } + } + + enetc_free_bdr(rx_ring); + rte_free(rx_ring); +} + static int enetc_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, struct rte_pci_device *pci_dev) diff --git a/drivers/net/enetc/enetc_logs.h b/drivers/net/enetc/enetc_logs.h index f5d37c005..c8a6c0cf3 100644 --- a/drivers/net/enetc/enetc_logs.h +++ b/drivers/net/enetc/enetc_logs.h @@ -26,4 +26,15 @@ extern int enetc_logtype_pmd; #define ENETC_PMD_WARN(fmt, args...) \ ENETC_PMD_LOG(WARNING, fmt, ## args) +/* DP Logs, toggled out at compile time if level lower than current level */ +#define ENETC_PMD_DP_LOG(level, fmt, args...) \ + RTE_LOG_DP(level, PMD, fmt, ## args) + +#define ENETC_PMD_DP_DEBUG(fmt, args...) \ + ENETC_PMD_DP_LOG(DEBUG, fmt, ## args) +#define ENETC_PMD_DP_INFO(fmt, args...) \ + ENETC_PMD_DP_LOG(INFO, fmt, ## args) +#define ENETC_PMD_DP_WARN(fmt, args...) \ + ENETC_PMD_DP_LOG(WARNING, fmt, ## args) + #endif /* _ENETC_LOGS_H_*/ diff --git a/drivers/net/enetc/enetc_rxtx.c b/drivers/net/enetc/enetc_rxtx.c new file mode 100644 index 000000000..631e2430d --- /dev/null +++ b/drivers/net/enetc/enetc_rxtx.c @@ -0,0 +1,239 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2018 NXP + */ + +#include +#include +#include + +#include "rte_ethdev.h" +#include "rte_malloc.h" +#include "rte_memzone.h" + +#include "base/enetc_hw.h" +#include "enetc.h" +#include "enetc_logs.h" + +#define ENETC_RXBD_BUNDLE 8 /* Number of BDs to update at once */ + +static int +enetc_clean_tx_ring(struct enetc_bdr *tx_ring) +{ + int tx_frm_cnt = 0; + struct enetc_swbd *tx_swbd; + int i; + + i = tx_ring->next_to_clean; + tx_swbd = &tx_ring->q_swbd[i]; + while ((int)(enetc_rd_reg(tx_ring->tcisr) & + ENETC_TBCISR_IDX_MASK) != i) { + rte_pktmbuf_free(tx_swbd->buffer_addr); + tx_swbd->buffer_addr = NULL; + tx_swbd++; + i++; + if (unlikely(i == tx_ring->bd_count)) { + i = 0; + tx_swbd = &tx_ring->q_swbd[0]; + } + + tx_frm_cnt++; + } + + tx_ring->next_to_clean = i; + return tx_frm_cnt++; +} + +uint16_t +enetc_xmit_pkts(void *tx_queue, + struct rte_mbuf **tx_pkts, + uint16_t nb_pkts) +{ + struct enetc_swbd *tx_swbd; + int i, start; + struct enetc_tx_bd *txbd; + struct enetc_bdr *tx_ring = (struct enetc_bdr *)tx_queue; + + i = tx_ring->next_to_use; + start = 0; + while (nb_pkts--) { + enetc_clean_tx_ring(tx_ring); + tx_ring->q_swbd[i].buffer_addr = tx_pkts[start]; + txbd = ENETC_TXBD(*tx_ring, i); + tx_swbd = &tx_ring->q_swbd[i]; + txbd->frm_len = tx_pkts[start]->pkt_len; + txbd->buf_len = txbd->frm_len; + txbd->flags = rte_cpu_to_le_16(ENETC_TXBD_FLAGS_F); + txbd->addr = (uint64_t)(uintptr_t) + rte_cpu_to_le_64((size_t)tx_swbd->buffer_addr->buf_addr + + tx_swbd->buffer_addr->data_off); + i++; + start++; + if (unlikely(i == tx_ring->bd_count)) + i = 0; + } + + tx_ring->next_to_use = i; + enetc_wr_reg(tx_ring->tcir, i); + return start; +} + +int +enetc_refill_rx_ring(struct enetc_bdr *rx_ring, const int buff_cnt) +{ + struct enetc_swbd *rx_swbd; + union enetc_rx_bd *rxbd; + int i, j; + + i = rx_ring->next_to_use; + rx_swbd = &rx_ring->q_swbd[i]; + rxbd = ENETC_RXBD(*rx_ring, i); + for (j = 0; j < buff_cnt; j++) { + rx_swbd->buffer_addr = + rte_cpu_to_le_64(rte_mbuf_raw_alloc(rx_ring->mb_pool)); + rxbd->w.addr = (uint64_t)(uintptr_t) + rx_swbd->buffer_addr->buf_addr + + rx_swbd->buffer_addr->data_off; + /* clear 'R" as well */ + rxbd->r.lstatus = 0; + rx_swbd++; + rxbd++; + i++; + if (unlikely(i == rx_ring->bd_count)) { + i = 0; + rxbd = ENETC_RXBD(*rx_ring, 0); + rx_swbd = &rx_ring->q_swbd[i]; + } + } + + if (likely(j)) { + rx_ring->next_to_alloc = i; + rx_ring->next_to_use = i; + enetc_wr_reg(rx_ring->rcir, i); + } + + return j; +} + + +static inline void __attribute__((hot)) +enetc_dev_rx_parse(struct rte_mbuf *m, uint16_t parse_results) +{ + ENETC_PMD_DP_DEBUG("parse summary = 0x%x ", parse_results); + + m->packet_type = RTE_PTYPE_UNKNOWN; + switch (parse_results) { + case ENETC_PKT_TYPE_ETHER: + m->packet_type = RTE_PTYPE_L2_ETHER; + break; + case ENETC_PKT_TYPE_IPV4: + m->packet_type = RTE_PTYPE_L2_ETHER | + RTE_PTYPE_L3_IPV4; + break; + case ENETC_PKT_TYPE_IPV6: + m->packet_type = RTE_PTYPE_L2_ETHER | + RTE_PTYPE_L3_IPV6; + break; + case ENETC_PKT_TYPE_IPV4_TCP: + m->packet_type = RTE_PTYPE_L2_ETHER | + RTE_PTYPE_L3_IPV4 | + RTE_PTYPE_L4_TCP; + break; + case ENETC_PKT_TYPE_IPV6_TCP: + m->packet_type = RTE_PTYPE_L2_ETHER | + RTE_PTYPE_L3_IPV6 | + RTE_PTYPE_L4_TCP; + break; + case ENETC_PKT_TYPE_IPV4_UDP: + m->packet_type = RTE_PTYPE_L2_ETHER | + RTE_PTYPE_L3_IPV4 | + RTE_PTYPE_L4_UDP; + break; + case ENETC_PKT_TYPE_IPV6_UDP: + m->packet_type = RTE_PTYPE_L2_ETHER | + RTE_PTYPE_L3_IPV6 | + RTE_PTYPE_L4_UDP; + break; + case ENETC_PKT_TYPE_IPV4_SCTP: + m->packet_type = RTE_PTYPE_L2_ETHER | + RTE_PTYPE_L3_IPV4 | + RTE_PTYPE_L4_SCTP; + break; + case ENETC_PKT_TYPE_IPV6_SCTP: + m->packet_type = RTE_PTYPE_L2_ETHER | + RTE_PTYPE_L3_IPV6 | + RTE_PTYPE_L4_SCTP; + break; + case ENETC_PKT_TYPE_IPV4_ICMP: + m->packet_type = RTE_PTYPE_L2_ETHER | + RTE_PTYPE_L3_IPV4 | + RTE_PTYPE_L4_ICMP; + break; + case ENETC_PKT_TYPE_IPV6_ICMP: + m->packet_type = RTE_PTYPE_L2_ETHER | + RTE_PTYPE_L3_IPV6 | + RTE_PTYPE_L4_ICMP; + break; + /* More switch cases can be added */ + default: + m->packet_type = RTE_PTYPE_UNKNOWN; + } +} + +static int +enetc_clean_rx_ring(struct enetc_bdr *rx_ring, + struct rte_mbuf **rx_pkts, + int work_limit) +{ + int rx_frm_cnt = 0; + int cleaned_cnt, i; + struct enetc_swbd *rx_swbd; + + cleaned_cnt = enetc_bd_unused(rx_ring); + /* next descriptor to process */ + i = rx_ring->next_to_clean; + rx_swbd = &rx_ring->q_swbd[i]; + while (likely(rx_frm_cnt < work_limit)) { + union enetc_rx_bd *rxbd; + uint32_t bd_status; + + if (cleaned_cnt >= ENETC_RXBD_BUNDLE) { + int count = enetc_refill_rx_ring(rx_ring, cleaned_cnt); + + cleaned_cnt -= count; + } + + rxbd = ENETC_RXBD(*rx_ring, i); + bd_status = rte_le_to_cpu_32(rxbd->r.lstatus); + if (!bd_status) + break; + + rx_swbd->buffer_addr->pkt_len = rxbd->r.buf_len; + rx_swbd->buffer_addr->data_len = rxbd->r.buf_len; + rx_swbd->buffer_addr->hash.rss = rxbd->r.rss_hash; + rx_swbd->buffer_addr->ol_flags = 0; + enetc_dev_rx_parse(rx_swbd->buffer_addr, + rxbd->r.parse_summary); + rx_pkts[rx_frm_cnt] = rx_swbd->buffer_addr; + cleaned_cnt++; + rx_swbd++; + i++; + if (unlikely(i == rx_ring->bd_count)) { + i = 0; + rx_swbd = &rx_ring->q_swbd[i]; + } + + rx_ring->next_to_clean = i; + rx_frm_cnt++; + } + + return rx_frm_cnt; +} + +uint16_t +enetc_recv_pkts(void *rxq, struct rte_mbuf **rx_pkts, + uint16_t nb_pkts) +{ + struct enetc_bdr *rx_ring = (struct enetc_bdr *)rxq; + + return enetc_clean_rx_ring(rx_ring, rx_pkts, nb_pkts); +} diff --git a/drivers/net/enetc/meson.build b/drivers/net/enetc/meson.build index 506b174ed..733156bbf 100644 --- a/drivers/net/enetc/meson.build +++ b/drivers/net/enetc/meson.build @@ -5,6 +5,7 @@ if host_machine.system() != 'linux' build = false endif -sources = files('enetc_ethdev.c') +sources = files('enetc_ethdev.c', + 'enetc_rxtx.c') includes += include_directories('base') From patchwork Wed Oct 3 13:36:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 45957 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6F04C1B276; Wed, 3 Oct 2018 15:37:19 +0200 (CEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70073.outbound.protection.outlook.com [40.107.7.73]) by dpdk.org (Postfix) with ESMTP id 1D78E1B274 for ; Wed, 3 Oct 2018 15:37:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eR6Zfi7WvCJq0M15L+Y305R8fxTs9fvIrQPraeYpyzA=; b=GRrHmBsuWdUPOTdOOVt2ca2MBJpwzSbvTxSK/JGaSxOhpzdCefmEo/ytoOrcsGt4ER/7mMPNqJbWWAmCLVhmdEXFGoJI/NOuGJjmVf/kxlH8kRzKMbWDgY1E01dfsOccEv95XjaKVWwpEZqfIaHA+y0VvAFmD+ApxkMpBCn2Cxc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=G.Singh@nxp.com; Received: from Tophie.ap.freescale.net (14.142.187.166) by AM4PR04MB1521.eurprd04.prod.outlook.com (2a01:111:e400:59e4::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.25; Wed, 3 Oct 2018 13:37:15 +0000 From: Gagandeep Singh To: dev@dpdk.org, ferruh.yigit@intel.com Cc: pankaj.chauhan@nxp.com, Gagandeep Singh Date: Wed, 3 Oct 2018 19:06:07 +0530 Message-Id: <20181003133608.3605-4-g.singh@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003133608.3605-1-g.singh@nxp.com> References: <20180928074601.4287-1-g.singh@nxp.com> <20181003133608.3605-1-g.singh@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: MA1PR01CA0095.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:1::11) To AM4PR04MB1521.eurprd04.prod.outlook.com (2a01:111:e400:59e4::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4f48a7e8-1c76-4009-d127-08d629355596 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM4PR04MB1521; X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1521; 3:ypqyP4vd7bR007UjKQGEPG9/kaJl8RrVL7ijs2/0HJMW4fNw6wR/PWyVuiBLbjR07zFN+Vf6mAw9Tu3K6muAxx3e66cwSC19HEn2n/osSGPBO/cLGbyqUXGtu0830BpVhSVjQobFvXkGHukpEhhjL5b+e1vAI5IUrxFsl9mAs83UPIVN3WmncTOFvshS6r3m+pHvQN4odLVXZSsyOhSgxg9k379JVZ71BdaZmCzGjxrq1Wf3ieM+S0j/hw4fXBq7; 25:33Hg00bO4vhewatu3/Yc3tC1P+ihcQflWx+n/0QPTjQejmaSeH1uEoPje5mhBh33XpC4f7Ncf31BoLTu4j4cNMnbfphLfQnd9mtk50IwF+Z/saQ8m7u5ltfDVU86ji12Kwq2fonIzQnT/b0UHxV3LpWkmhSiniV7ZQoegwBZ42eRcuD8peIeN0irq5DZpZ+XvaZ9Fh1p6t8QLp+Lr6xNH5/HrnUziCxXz+LVAvGU7jn836elVg7i/KBhviy4lWnzZUCw6695xEIff8s5WTH5pwTq3Litwuen0aNovPSZ0VpchpvS7TEXEXrOjbdcWvSN7F+jUrP6lxfqqVRmWS38yw==; 31:iC5YUREG7k3ERjS66TfOsq4m0Kn3VotDPkiMjmGVoS8TpP0DWR0hDiLf0UdP3K/bl+3f+LaH6PZDCvDrH7IqAtfL4pYvUsQ7cY/q8wKSnZMEtJZoP6WdxG/VX8dyGBtW2f6Aq0CJJn7disLav6t4sI8sZ5Kg0xwhhJg7Rzgbnxw1o00IW3XfJbhL9SjrA4pqtuR/nBx//vNf3tfFJ0zFtrXVe2BxRpX5gq55Y22IONs= X-MS-TrafficTypeDiagnostic: AM4PR04MB1521: X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1521; 20:FwD0OV6S7jRS2InFYH2frodSFzluy35nXZfAoi5d60k4SspMlz2MR88J7+zEYm7KMox9IPx0hPg4Nei1OU7F4RMhPOSc76Yl1FsPL9li/6JOWpSF04V/2Sh2kOvs+UH7H11NLA7tJqOhsH8XRWOzrEf4p2BOjQniepSpE0sZlk97sYBxUospyQDPGCbakghfZoVpNoxgNHVThFBBXk/rKwhYevb4eRtI+fSzGAjJjb2/YBurzaH6Upa8YStRfOaEHxjprg+rPpKvGRh6VgURRsxA1dENj3QrFhMu61tHLHeoAV4sR8PvXIkWZxkbisbbATdMkZVEZhJYGYcEZk355stpWAMlD8clrR1qijk1UvZN5NtcEQJlNSM3nj0y+9ykz0LKG1WCDR0XPrfrHOOqY8yseFclkOB8dDrQoyUB9z6DbCz4Nl5+18yoTk0752dWyjXb8dA/VnUJvq8oorEYuuhjLPz/4FExRQKlceiXFGn5psS00vkXd1GnP2Pz0ITe; 4:VBs9JAn75Excp5ioDUgA5I9zvP51wKxcSFwXNjZ/kwd8BSv0XnJOglc4o49yeWQtJtxkV7qsj/sxpiqbLJ7t2//i3gmxDX2dRovacJ6gP9JfCU6Q8NxnOBj2Ql7m/MNrYsvyw0dgQLTlmud/2wZgzJ0tODJL48ilNFv6owH+M12j4WbKWQ/l3eJaT7rxaxVpKh6gtwX5qnVz/5Cs40vETQDnBVlCiVt5bQ2R02DEtiG6dYft+IywC1o9L+JBRXBH4TGaa+4+85fUTeFf/CzfNTRzfWETkHJXaw0nRFEwXFpmy0thmEoj0wq2LMONUFgi X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231355)(944501410)(52105095)(10201501046)(3002001)(6055026)(149066)(150057)(6041310)(20161123560045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699051); SRVR:AM4PR04MB1521; BCL:0; PCL:0; RULEID:; SRVR:AM4PR04MB1521; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(346002)(136003)(396003)(366004)(199004)(189003)(6486002)(97736004)(6116002)(3846002)(86362001)(575784001)(106356001)(1076002)(55236004)(14444005)(53936002)(6512007)(4326008)(2906002)(52116002)(476003)(6506007)(105586002)(386003)(25786009)(956004)(81166006)(2616005)(81156014)(47776003)(51416003)(8936002)(11346002)(446003)(8676002)(66066001)(305945005)(5009440100003)(68736007)(72206003)(26005)(5660300001)(7736002)(76176011)(50226002)(36756003)(486006)(316002)(48376002)(16526019)(186003)(50466002)(16586007)(6666003)(478600001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR04MB1521; H:Tophie.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR04MB1521; 23:kmgG9Oa0hHptxPB9SBrXk3rTEslyT0Nt9VvmxfE0o?= hUn1rl4WTvlMfvbPmvobszoBbBhCgu9P0kfDPaUiDETVPwPXa0/L1yGUVd3c+iAyE5dPZjobKALSVpIokXbQ02ryoPBJvny0OqoUYdQhRRNFsK0QP6zWI9s+RtA3K15Kk0jfR0183YID+FWdSQnTU2MMSJQCxtCLLrmxj11Dx70a9SpSEtGrJhDTjTkImmCqo5CiyUb69cq9Mz4RFx20yPcFe6VVajS4oRYw/dKGak0WM3y1Oy1F/qdEHiSG3OdnpGI90il0Fxt0kdJxloagtsra4g4Co4LiC7sOw85EshZAEBQPm3h8syLUflqUQtcvN+QuMl964Sud09SfpUALyPs3IP9T/PMoi7KlsAwXJmeD7BBPPq9FqZ1njcEjO25KPXI0D9YbIpR3mIfgrD/0JBb29EVPI5/KbuqJTPMSOb11EM3Y2oCP7CvMkZ0x9hSZzeIMq1e/AazXh2prTp7r+mrB0rJF6q0uK9CnroOWuPQnX68Ayj/Nqq+/dbp/HLkMUSQ84OuaLIa8ftldYLMLTf+C6TCvcXA5Yc1Vv94PK9KQRus6hvgCA0ntWZVA4owdNMpArlMHQDf60D94MBmC4cc5hHcoeImH76q/i5EaeLt9jKBRoK+2br5hVIwPm9ZvLalQezJJc9EKbA5Exz9//g8YPmNf7PlU6+n/Gzm2x8NfVjLV/T7nhRlFedswymG8o55HIrqZPCWEL94Y8Z3F0iaGtAWN6o0sqEXSu5l8UKFD4SOvidLNA3+IqU/EPzTjolDeZa1bGTVFQeP33jFa+b9k7x/4DHPn/tyo+LOEkjQzGqeXPmbQK4JPfEy/E5voniEv+a+yLbklPIG3Taho8e3HqxVZbmOijuCdtSfiQi2amD64Viu5YLPYtrkjzqplFTlLkAgg2nLdLxGw1rLJ4VenBgOo7h39yK2iIvbB5Ev2Q03CTzj0PuIzfMr1W8s9b65pIP2WbG9XC+3J6k3W7ZosvqJhzVRmFu0Flzl8wAw/1VgupYxH6NfRs6f2ga8uOn2PWS8ViVFXxmsLSQTVWitk8LigLQDelhcEKBCC3tETY83AELT6/v/h3+fsBi1fP/OWfQjODPK6n8AgNvZEOZtRgrw8MsStQsgFiCzbxiDWqmLKsbK3FxRLzjfSoSmDM4mIDhb/rTDMg4vNB8NYpO1Kl6sqGB3S0YsPrOpO8i6SHc1BEJ0mY3aSkYtFWL1nANBODtjg1sDyBPj9mhRDPSQDg53HYb+ZqG6TP05SG7sJIxAOSXlPQ5V2e1Tu8b604U= X-Microsoft-Antispam-Message-Info: 4OFqpjMyD3KfmyX9UxfpRkX8ZO3y1SVXPcwqwXVpRVnYulZtYIAHoBSF0H0wXqbDLNGOwOq/pE/gT0rmkFuWfqGYMDuz+Dm+1+3e917+hMqa6VwCFKJx42ZyZnVSlv1MaJTpthsTOBtaTKNEf8tRuKYAgMmsa1sFASwaRRZarZrgWitu/zjkpT2Elet5n1+XKaVbSHKiI/EnKVKPI3A2VZKJcq8qsh/M4wXIVbG31jIyx/HtX7Megn7iJA4jrUVCYKImPNTyftf9oW0DsUFRqpg3kRXIRKtyOTCI7Hcbee/Fx60BT5k7OJaQxUccQ/V4c8RYSnKgJIGqrK24Fiy92lSwe38U9A6tPKgKAJ3jRDA= X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1521; 6:ebE9nu9K7vOlouOKhv/p/+RXQQSuxlIC9jvaKAZ35H97wyV+UicM3do2mM+AOsgenaWS2c824SVyMzOmibiYCkuJNYOgkicOIPfFe/OhbZv4EytspolQgBrjEMznhVfx4u8k5TSDMLlYRHW9AG4X7gPkSeydSDOZ7TZGDVc9b5AYaqTitCZcUSrvl/tFVMLUb3zmr6J/wbzpxHJkAyJGNyhu5S7KqybEZSUZoNBV77iqUgjTlh0hYsJv7arCLpAAQekQfkpmSTx4fGlCgGKLwGfZnpzPQWKqkaLb/npJ966g1yIi4OE0E0CVCDfg/YqILoEH2q+C14UVPvuFZ2goG71sZcT/nYKd/zEUany9VGAo51dAPmBIPM4lEP/wA8jEZP2BYtZKDPCCeLiI53VGWp//8iqv0FPduGsZOobgcyCyRG2A07J7S6DbCAq4NUd7xPjZpO8S+1g9/4rUDAV5XQ==; 5:UPvgsTB5nejCAwzmw7ohf8oKPKT7ztpjkyTF/VOapivXp/e+zc3aCo/rvZAiCfC+bCd4isCB/B2g60Og/jYqdJ2lYKzPkAFFHPmAwOSbNzHnZv4AUlZFIDMNo8mhefxHwHDC5LuDcYSyr2CtIWKieggyyoTgLgjgZZT9e37VWmE=; 7:Uv1F0Pc4rDgDfF4tbh7ga0T38hLN53rEkM25HGUWVDsJqnOIMvY24JXOD9payZns1udzUIkkPek7HQDJLKBGEmuTPSZvzMrXYoRYYISy2at7DF25bludtun4Kng/FmW0Z0SvfCqDP9aovfqtusE+6uM3t9mDbnhMH8W2NSHRHrT1x1opZc/3lvuWf5jhLxDqnEGJTZdllceYRykzEsBmry/RUMAs6JqaL3QDEyL8wIif4gO8Z+PdwgYLdfpHN0KY SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 13:37:15.1354 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4f48a7e8-1c76-4009-d127-08d629355596 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR04MB1521 Subject: [dpdk-dev] [PATCH v5 3/4] net/enetc: support packet parse type X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" enable supported packet parse types feature Signed-off-by: Gagandeep Singh --- doc/guides/nics/features/enetc.ini | 1 + drivers/net/enetc/enetc_ethdev.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/doc/guides/nics/features/enetc.ini b/doc/guides/nics/features/enetc.ini index f780404b8..bd9cb0bc0 100644 --- a/doc/guides/nics/features/enetc.ini +++ b/doc/guides/nics/features/enetc.ini @@ -4,6 +4,7 @@ ; Refer to default.ini for the full list of available PMD features. ; [Features] +Packet type parsing = Y Link status = Y Linux VFIO = Y ARMv8 = Y diff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_ethdev.c index dfe7ddaa1..3ee7bb446 100644 --- a/drivers/net/enetc/enetc_ethdev.c +++ b/drivers/net/enetc/enetc_ethdev.c @@ -28,6 +28,7 @@ static int enetc_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, uint16_t nb_tx_desc, unsigned int socket_id, const struct rte_eth_txconf *tx_conf); static void enetc_tx_queue_release(void *txq); +static const uint32_t *enetc_supported_ptypes_get(struct rte_eth_dev *dev); /* * The set of PCI devices this driver supports @@ -50,6 +51,7 @@ static const struct eth_dev_ops enetc_ops = { .rx_queue_release = enetc_rx_queue_release, .tx_queue_setup = enetc_tx_queue_setup, .tx_queue_release = enetc_tx_queue_release, + .dev_supported_ptypes_get = enetc_supported_ptypes_get, }; /** @@ -182,6 +184,23 @@ enetc_dev_close(struct rte_eth_dev *dev) dev->data->nb_tx_queues = 0; } +static const uint32_t * +enetc_supported_ptypes_get(struct rte_eth_dev *dev __rte_unused) +{ + static const uint32_t ptypes[] = { + RTE_PTYPE_L2_ETHER, + RTE_PTYPE_L3_IPV4, + RTE_PTYPE_L3_IPV6, + RTE_PTYPE_L4_TCP, + RTE_PTYPE_L4_UDP, + RTE_PTYPE_L4_SCTP, + RTE_PTYPE_L4_ICMP, + RTE_PTYPE_UNKNOWN + }; + + return ptypes; +} + /* return 0 means link status changed, -1 means not changed */ static int enetc_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused) From patchwork Wed Oct 3 13:36:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 45960 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 85E1A1B3A6; Wed, 3 Oct 2018 15:37:24 +0200 (CEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70085.outbound.protection.outlook.com [40.107.7.85]) by dpdk.org (Postfix) with ESMTP id 87F511B2AD for ; Wed, 3 Oct 2018 15:37:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RyOKIzQii5702r1/HY90ysHd0yDJ0gsRtfO8CsKk6x4=; b=CzoLu8Qc60ytoZArUu3XeVL6KmBl/Jr/S0ca7Qqav1VAgqR/hWt2ZYznCkSi8qpEABQs6nHnrAslj0gqX/l0u/RPioXMABGlQmRE/WaWYO3owTz7ZQTjTzeICbx9L1PNXeN+nuNV187A3ER0w0ToBkSWnbashs77LiS9mulKOzw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=G.Singh@nxp.com; Received: from Tophie.ap.freescale.net (14.142.187.166) by AM4PR04MB1521.eurprd04.prod.outlook.com (2a01:111:e400:59e4::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.25; Wed, 3 Oct 2018 13:37:17 +0000 From: Gagandeep Singh To: dev@dpdk.org, ferruh.yigit@intel.com Cc: pankaj.chauhan@nxp.com, Gagandeep Singh Date: Wed, 3 Oct 2018 19:06:08 +0530 Message-Id: <20181003133608.3605-5-g.singh@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003133608.3605-1-g.singh@nxp.com> References: <20180928074601.4287-1-g.singh@nxp.com> <20181003133608.3605-1-g.singh@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: MA1PR01CA0095.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:1::11) To AM4PR04MB1521.eurprd04.prod.outlook.com (2a01:111:e400:59e4::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b72bf684-4f21-46e9-047d-08d6293556c9 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM4PR04MB1521; X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1521; 3:vrKsqfEz2ha1bJjSkmfpzmWMyaazkuK7b2IFj5eF2ITseawUfHJSIippBeWl2HyQUT7vSufCSGePB8WEYwEu4hSx8JL4MFORqfebYjRmYQ6hqliB9+R7jgbFWz2HyiWYXHSSloSakKHwrcBGboH7OcIROud7F42Er5SSZL6qNkEKRZw14fUcAaSsq5dcsciLFnWzEJ2HSx9F6qSuHSUQcPUP7gDxnXPNfWA4v806w6vujZ59UJEx5Q9c4PA5DJ53; 25:q5mZlhEFxeGHyiEffWLfiOWgWRi/8x5P7dsSnrKDTsNfAyESDmBmF/AK8B+zyO0kkjuUiJx30FoxErJcYggetboLq8bFPayIBL6ob2XiO80GtYouvfmyzMZbfOOq9e5uGwUsZ2Nz1WFSR0uW/lGGx37maTzFw9ZnOgqBf6HKQQLuA2/p3E2wj1gEY7T7ayblLKFEk1h6TIUoGDek2wZ7XkHtY67TJWmlikydBoP43VRPohRKLSvmaOaEdPD19hj6C/o/3HJQ5MiXat2Dd3FGjCTtr105+6a1GFBGGkCW5SdFpWKP1fRt3/0UyHkIDDHOvsGS9fnIz1NRbgKLPh0kiQ==; 31:1Of/NXbr+ZKBvIDaEOR/jaiyAMKvBJwfkWQJjWakdmmEZx6/N8oXTSEY11rA2TzrQtuFl8tMZ6Ergqa/7ihGoxmZFe77FOrsZhcUOJkHYszTH/MV7vt9G5OT4lTbLgo5hGS6grgnqhSBc+A+x/yVuE3545DTUDH7tCLnZZbAqJMn2rlCSvXVrsF0WX8Ud6KGnM62tRiIIX1HInN6Zit5yQcNa7iDgX6yw7Bl19CgZZ4= X-MS-TrafficTypeDiagnostic: AM4PR04MB1521: X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1521; 20:EcpQKB/VFy/FouZYmAB9XRQMfRYmFlrlsiCbwg0Mg8czCu80rH74qvSfx4hB2/BWvhHhXnM7MbdKdIiEV2RBmf8tM9uIePrJvrIo/PDLZRRNWrV91v+xXh5kbl0XrH/+29Of3XDtQDz18EENyy2r7+5DNt53MOU819h83rGSX9DZA0Ck3U078dmk8WcQpazwlWyqP6ASZBVW9izIpVk3+c/jT1LJqm49uHREW4ZUaHq1iLtuHRxYbK7CA0mKxn1cthu399shwr3XaR28h7hELuwRedNSqP7wAUJDC8OoiXSsbJskOsGQBU7EKZ7XLM9riMvtf8vzXDk/566TmYMi+C9i42ExCpMLrUuCPue/aqWCWV9ZE0f8JZsuq7IJX8bw34tCL11N6w4Fq6LEAdrxYQ5q3ZIWWU4WadBGy+j4EefUoqHk7iF3sarPgn+koKAxq6A0/vKBeUSG5m1zlndrcpOXxQel3ntxvVaIoRNmZ+0hT8w7OB6iPTyiUGC7s0sT; 4:AKB3BLWxd60btGAaI+P60SVhdnfOxvHoAw/G0kAC7x93uIsL8uW7tbSvkLnvJyjjjE5udZFDLs1FcCi9BZC/puW+z7CuU1V2wML1AgDYvhHNlMZ8t6nbnIChtN+2+Rg5bAz7T4Zdwt0nrLjxD1UuFbeTQN1lqpKJtOpxvwqQC62/tpDPqNtWvBdoM/76+sRgfCEaL+TvLe54WlZ4RP8+hCzVUGMvxfF5PSfOB1+Qzpbsvc0pbgkverNDC+uV+1QRmPYlc4wAeDSHn3g6HyT45WzrkCCE+GId1Le0kcMGB8YmBV3wteHgqDVDaPo2jSOesPELUnKzbP2z48+sW0yR+thF39Bdy5cCL0DtXN8RUWnuEBhb4Hdz1iVsEtIwp7JL X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(264314650089876)(211171220733660); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231355)(944501410)(4982022)(52105095)(10201501046)(3002001)(6055026)(149066)(150057)(6041310)(20161123560045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699051); SRVR:AM4PR04MB1521; BCL:0; PCL:0; RULEID:; SRVR:AM4PR04MB1521; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(346002)(136003)(396003)(366004)(199004)(189003)(6486002)(97736004)(2870700001)(6116002)(3846002)(86362001)(575784001)(106356001)(1076002)(55236004)(53936002)(6512007)(4326008)(2906002)(52116002)(476003)(6506007)(105586002)(386003)(25786009)(6306002)(956004)(81166006)(2616005)(81156014)(47776003)(8936002)(11346002)(446003)(8676002)(66066001)(305945005)(5009440100003)(68736007)(72206003)(26005)(5660300001)(7736002)(76176011)(50226002)(36756003)(486006)(316002)(16526019)(186003)(50466002)(6666003)(478600001)(23676004)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR04MB1521; H:Tophie.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BAM4PR04MB1521=3B23=3A0gws?= =?utf-8?q?EPDkJoOBRuVNgohUtJGmhd6Dj7ssnn38ZTkJ1O/ZpLka+1mkDivGMXaR?= =?utf-8?q?DrsN+MxBTlB+C8ynszPrAeWFlVMLvrlba2d3Xw99yQVtuDvFt5PhLvm+?= =?utf-8?q?mk13DuoNKMIh68vlBzHqCVAIegSD2QHmAkkL6pL+cb0PRlSeUEVvFsWq?= =?utf-8?q?MbGQEM8kGRDe2s1BCiZ3JhnK9d1cs1xAensVmWfKWUIIdcllO6ofSxqD?= =?utf-8?q?XR+sQdb2E7ovakOv8onQxDJA/T453+OeSkRr/WpK/GtRvQlIJfmh2oVJ?= =?utf-8?q?DIbMHReHpvOyjCtNdthfNmCjXQ/XlsZqQELk1ZxMHr+fIvjItTe5968w?= =?utf-8?q?8nkKCLcv0T+ASCyXSncUql9SGyhHpcNPlqKlgyjux08hOvzcO8+1UrLf?= =?utf-8?q?DitK6CSbc5AMXNXCcCYcZ4wmKpgPDQ/Q6XM343ZYgzHrMcvOqt9T+wzo?= =?utf-8?q?gBN1i4V37iot+PouIbLSW/GQMB/GVS3i+kfRV94zlSbBQVPxw+qGEft1?= =?utf-8?q?gPRtYvFJ0aL0GobfF+ZN5AzPAnUAW3Vyp7/6A64SNnz8KEjmpuwisGhO?= =?utf-8?q?bxsr/xkzqpv54o9CuZw2zFDXrJRzHpdQvBkTu5BVc3MvDydclgXJ7MKM?= =?utf-8?q?f7qF0qXTeXEPr4EiV0EX7HtPuO5QJUOYQn7bjtwod7J8hrm1dNlBOkGq?= =?utf-8?q?/YA48zBmPm4HXnQeo6GqiQDTiaKovOkr0+AIdcK16ieFa7T8p5xPeeuq?= =?utf-8?q?eVVHAN1TUGXwTUHDC0kFU/6dppUuTnlKQVe/MxlD+To3EZaj6Bb3TAhK?= =?utf-8?q?caAnqBv/fWxsbQ6MY8GapEc/psss6k6yFTXb/RXY54rIz0d/OjE4k1S7?= =?utf-8?q?mgWDsqhr+VOSz0LuJn5ovS4yqTZqDPFF3Wa3Rx0qL2BKDXmJhIMOPMkR?= =?utf-8?q?rUV8NoOIQuMER0Ic5zYPpFWiWxj5to87SoAiXFiT84U2bo10MO+AYtxU?= =?utf-8?q?igBgezqJ60lxS97BiMWczXVoIAy3v6sCxGGhdHZnaTUtg/rFPUaEsQWU?= =?utf-8?q?yCl9vn9+WvqQXZSP3SGKxjEOVthH7oPWg/TMkCj1lCmFvsvJ8aBs9P3N?= =?utf-8?q?2MHbBBH8ZUSkc2R9VylHVLEd90XFVOB0eTSyLX5ox+jmulAGzWCJvpFx?= =?utf-8?q?hgwJtxqmEuFImluzcynowGMSI932MzwGlDGPha/HbtStzHie+ibQWKzq?= =?utf-8?q?+Qaa07OTwaYGcBMtkClzWUa+35alc2Dnzjzuwgpp4NRz14vtspIYfA4d?= =?utf-8?q?Wx0juZVhqIN+Nxw3Z9H+LTWx+vLfL0JmnCHiQlwtv1PxV8l38Uiube4V?= =?utf-8?q?oynKRx+WPQ=3D=3D?= X-Microsoft-Antispam-Message-Info: XyC79zBezvsFgxsJ+Om5HiFVJUEDmQ1rmpz9Q/Qz+03oQ+llf5avLKd7sCulsQet8lsliyDT8KuOycA4Hi+DDvcTMnmYT2m6tIr95SuueDqKAEcn6KpzLmB6GdSlViV6XZyLoAlVbd6Fkt0yY7cuBo0hChDSTtLfQqjJ4PGnuXyfRksWtUZO8sc1UDDXJkzV7TB7ixr9kv59/ImYsRfp/bpEuAvsL3OrJgqnRuYH2nXreobnPMnYW0PMmj7qQNdPLXor6FV6vrkvMQlZls9Q4JrMa/HCZCD/y0reU9sOrEcCkCtd7N6QVKc2vXSaPHkhrViTbSdjiYQNffXaFoMwTyd7wQjJt7G3DqagBr2RizM= X-Microsoft-Exchange-Diagnostics: 1; AM4PR04MB1521; 6:jwmnAfcdln+aJOrSkeyvIfiZP83tm7SGN4Icj1GpRvWIcr+qQy1PqfNS5ktbpN+gie35L+DSEv68nh/+xhGR7QEUpgSEZDj0sEcGLzg8rq4a6Zy7VqY/BYtBOKVSHbpCmDasCuT0/zpLEL6v4dMBaH/XVpht3t8N4yRR0r9uNSHyNyuhDatP5HfEMis38dmtrbQXTsf3D+sREW/9E75e6O7wnt0pwLmNnxYsARlIbZ0bZWc344HC8Rbf7f9vXfrfAUg9Bl5A5PMhTGc/ozwZDrA9816rzhM2zdkRqFgvT+0vPQLc04YlvHQub25r1nAJoq7Q5wHTxRPKBzX7UnmzUzeDZiqkgWxpo7NH1t3bqI2rqavVX1sqAgIgxFJpBebLoFaPKuQiAC9sjaV4Za3gEZzdnX3uAc5/ppRhgQOZz9GjEq8HR9WLz/669v/TBrS/2SF4wms3hiR3b67NJVv1xQ==; 5:HNaVFZryPX9vUIGxlUs015oqkBmKKloXSYyZkwF4bXC+LzZ9kE2YW483lycmQdKAjWBcQNkR23P8ptgvchkpb8Y6zu2ogp4OgS+ZhYZkAQs8i+VLy7PF/nZCEE7GNz2B6iSPOmE+0rSc/nj8hhHTtxLLmZKE4GjXkgiH/v2417Y=; 7:RtYFtTmRMxDwMKrqdI1tfxhTfnmNvzu5caaWlYCIUzX70+NClmktcfB8K9Skt/SMeCtzde9san78VsIfNYz+Es7p2o6Mt/fkmzcz69LIwKWS0n+tCBmZRf8KnHsj0A6q1axIg2/mjO0XnCBQRIKlN53aKgpBv3LhVUaHzjj3MpEiV4F6eA94wZAUzhnYgRHAmdL7AEr5wjAL6+Y2tKkTpuFYCybXNAU0CS8kWMzVsLyCx5xRmlfHrciF0rE2ae/I SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 13:37:17.1441 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b72bf684-4f21-46e9-047d-08d6293556c9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR04MB1521 Subject: [dpdk-dev] [PATCH v5 4/4] doc: add usage doc for ENETC PMD X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add enetc usage document to compile and run the DPDK application on enetc supported platform. This document introduces the enetc driver, supported platforms and supported features. Signed-off-by: Gagandeep Singh --- MAINTAINERS | 1 + doc/guides/nics/enetc.rst | 110 +++++++++++++++++++++++++ doc/guides/nics/features/enetc.ini | 1 + doc/guides/nics/index.rst | 1 + doc/guides/rel_notes/release_18_11.rst | 5 ++ 5 files changed, 118 insertions(+) create mode 100644 doc/guides/nics/enetc.rst diff --git a/MAINTAINERS b/MAINTAINERS index 0443addc0..b67f2afa4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -647,6 +647,7 @@ NXP enetc M: Gagandeep Singh M: Pankaj Chauhan F: drivers/net/enetc/ +F: doc/guides/nics/enetc.rst F: doc/guides/nics/features/enetc.ini QLogic bnx2x diff --git a/doc/guides/nics/enetc.rst b/doc/guides/nics/enetc.rst new file mode 100644 index 000000000..8038bf205 --- /dev/null +++ b/doc/guides/nics/enetc.rst @@ -0,0 +1,110 @@ +.. SPDX-License-Identifier: BSD-3-Clause + Copyright 2018 NXP + +ENETC Poll Mode Driver +====================== + +The ENETC NIC PMD (**librte_pmd_enetc**) provides poll mode driver +support for the inbuilt NIC found in the **NXP LS1028** SoC. + +More information can be found at `NXP Official Website +`_. + +ENETC +----- + +This section provides an overview of the NXP ENETC +and how it is integrated into the DPDK. + +Contents summary + +- ENETC overview +- ENETC features +- PCI bus driver +- NIC driver +- Supported ENETC SoCs +- Prerequisites +- Driver compilation and testing + +ENETC Overview +~~~~~~~~~~~~~~ + +ENETC is a PCI Integrated End Point(IEP). IEP implements +peripheral devices in an SoC such that software sees them as PCIe device. +ENETC is an evolution of BDR(Buffer Descriptor Ring) based networking +IPs. + +This infrastructure simplifies adding support for IEP and facilitates in following: + +- Device discovery and location +- Resource requirement discovery and allocation (e.g. interrupt assignment, + device register address) +- Event reporting + +ENETC Features +~~~~~~~~~~~~~~ + +- Link Status +- Packet type information + +NIC Driver (PMD) +~~~~~~~~~~~~~~~~ + +ENETC PMD is traditional DPDK PMD which provides necessary interface between +RTE framework and ENETC internal drivers. + +- Driver registers the device vendor table in PCI subsystem. +- RTE framework scans the PCI bus for connected devices. +- This scanning will invoke the probe function of ENETC driver. +- The probe function will set the basic device registers and also setups BD rings. +- On packet Rx the respective BD Ring status bit is set which is then used for + packet processing. +- Then Tx is done first followed by Rx. + +Supported ENETC SoCs +~~~~~~~~~~~~~~~~~~~~ + +- LS1028 + +Prerequisites +~~~~~~~~~~~~~ + +There are three main pre-requisities for executing ENETC PMD on a ENETC +compatible board: + +1. **ARM 64 Tool Chain** + + For example, the `*aarch64* Linaro Toolchain `_. + +2. **Linux Kernel** + + It can be obtained from `NXP's Github hosting `_. + +3. **Rootfile system** + + Any *aarch64* supporting filesystem can be used. For example, + Ubuntu 16.04 LTS (Xenial) or 18.04 (Bionic) userland which can be obtained + from `here `_. + +The following dependencies are not part of DPDK and must be installed +separately: + +- **NXP Linux LSDK** + + NXP Layerscape software development kit (LSDK) includes support for family + of QorIQ® ARM-Architecture-based system on chip (SoC) processors + and corresponding boards. + + It includes the Linux board support packages (BSPs) for NXP SoCs, + a fully operational tool chain, kernel and board specific modules. + + LSDK and related information can be obtained from: `LSDK `_ + +Driver compilation and testing +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Follow instructions available in the document +:ref:`compiling and testing a PMD for a NIC ` +to launch **testpmd** + +To compile in performance mode, please set ``CONFIG_RTE_CACHE_LINE_SIZE=64`` diff --git a/doc/guides/nics/features/enetc.ini b/doc/guides/nics/features/enetc.ini index bd9cb0bc0..69476a2a1 100644 --- a/doc/guides/nics/features/enetc.ini +++ b/doc/guides/nics/features/enetc.ini @@ -8,3 +8,4 @@ Packet type parsing = Y Link status = Y Linux VFIO = Y ARMv8 = Y +Usage doc = Y diff --git a/doc/guides/nics/index.rst b/doc/guides/nics/index.rst index 59f6063dc..0323035d3 100644 --- a/doc/guides/nics/index.rst +++ b/doc/guides/nics/index.rst @@ -21,6 +21,7 @@ Network Interface Controller Drivers dpaa2 e1000em ena + enetc enic fm10k i40e diff --git a/doc/guides/rel_notes/release_18_11.rst b/doc/guides/rel_notes/release_18_11.rst index 3ae6b3f58..1fa7152d2 100644 --- a/doc/guides/rel_notes/release_18_11.rst +++ b/doc/guides/rel_notes/release_18_11.rst @@ -50,6 +50,11 @@ New Features * Other libs * Apps, Examples, Tools (if significative) + * **Added NXP ENETC PMD.** + + Added the new enetc driver for NXP enetc platform. See the + "ENETC Poll Mode Driver" document for more details on this new driver. + This section is a comment. Do not overwrite or remove it. Also, make sure to start the actual text at the margin. =========================================================