From patchwork Fri Sep 28 07:45:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 45565 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 E74EB1B13B; Fri, 28 Sep 2018 09:46:43 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0085.outbound.protection.outlook.com [104.47.0.85]) by dpdk.org (Postfix) with ESMTP id 171191B156 for ; Fri, 28 Sep 2018 09:46:37 +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=WYveykStk5Gr/cUwsfc+/yVODVpRXFwsUe6+iU5eYj0=; b=pueoaPcvKV9nVrHU2zUO3/cd6dHKw9CGIxTkgf/9CPD+Swzh0Ay2rVeXgzmGTRA1N4I3UC87AW2Ohs0ihftlDkyZFaeFobT2tHuEVKxDLBQcm3zqLZdYYcJBfLDu+srTlqtl1hlpmMA3CeoN4VHHe9W1wn+0xYl+gsW2JbiW10w= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=G.Singh@nxp.com; Received: from Tophie.ap.freescale.net (14.142.187.166) by DB5PR04MB1528.eurprd04.prod.outlook.com (2a01:111:e400:5993::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.20; Fri, 28 Sep 2018 07:46:33 +0000 From: Gagandeep Singh To: dev@dpdk.org, ferruh.yigit@intel.com Cc: pankaj.chauhan@nxp.com, Gagandeep Singh Date: Fri, 28 Sep 2018 13:15:58 +0530 Message-Id: <20180928074601.4287-2-g.singh@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180928074601.4287-1-g.singh@nxp.com> References: <20180928051647.32341-1-g.singh@nxp.com> <20180928074601.4287-1-g.singh@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0037.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1a::23) To DB5PR04MB1528.eurprd04.prod.outlook.com (2a01:111:e400:5993::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ab652fe6-3c8a-4021-728d-08d6251683bc X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB5PR04MB1528; X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1528; 3:MIi9yMC0bNuZ/f923VDsrJwB0DzFLllfe/vq4r0dpqJUR3Wd4b02ladhdILYMVj7uIwjSMpK6Q6D1+v1T6aLsi2eZ4d9hYuEdthrsRkhVgmt8jxXL/Tz3VlHS/Smog8xJdf7W31mUQE1g5pTMXMJAcR6aZ8rqTiGrQEQIr237xruERmX30TckopHOaxaA+sOR4wbRu/EkD2TRFbU4O9/b+7yWourr9D73pGa2DHd1T4DnLqQE3PCvblPg9eCe9yL; 25:EpWrMO8ABq/ztl0bD7NqR7EZcUIAYcDeapvt0bsGqFeoQs23Or7WUtecvDZZqENQhkk98Gvg/u2N/Oql8dgkXZNSni5je0j3ixPMxbDlI/6sRUstuMjpdF7u/+lWM9CrNYUX9OmXE6/nE96frPzXrKbHRp2HUDKc/KMnE1xcD26uWvvtovoMWriXgaRnBOwLaiu2td7KAiYFfVVjESCbphZJgQnqzFUpgoKbg6s5CBEGEbLv0HMnYSs5eUjxJe/4mZ4+O5LT28uFsQdqvbiOBcW8HTHnF1KtrI6/SeguZz56/YVdsFDCudfxO9TDAZRUM3o+zjVRelqSyXLpxDUR/g==; 31:kbVnzrfOtGG9MwgQM100fB2MWjcT7rVN5/ixZiqTx0pqbsUSM4d7X/Ms/GExvf0ltbtOnzWTvuUF6lhNXDY3LU6CIjpKY9CzSWGwUaUYQl+1uqwE9TSj7GF2NJ+2BcBqNUmcto7YdYHfz2+9iSzuyHJ+jmggETqJZguVEJkyp7UiVUS933IW2upOWx9PJwx5K+SIpX8XWSR1fVUXxPfn51MbUhiXXqDIj3LjRpfOTlY= X-MS-TrafficTypeDiagnostic: DB5PR04MB1528: X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1528; 20:3XlGdNr8xL9xg+gkg0AM1tt2thag3KwWWa0Gty4MYzsIzfjZJTCiXnTIV1pwOcBH1QHBPblQBtvPOSzYw9z8el8H0WZLisGFtptbDwOlA+++hltMZsTnGmYwfSPQk2vRHBgUT9KlgTRNz0z+vy/P5gd5BOtfNe1u5IEySwjZtY/NnQSWPVsFzyTFL2iWgnHNMzus8TwFTN1josL7CR3WEAqp3oqY1Yn3iL3nb0bAjbBVNHVFKaUWAvDf9iha4CkTaJJWh9Wod9gGW21Jq2s2ulhHfmu0cZCGdIyEovdtsdTlIBppYj+iV0aVbaRL85VD+rPckEKbRezzd6eLizAyoY3Q0PPCNZirx4S8qRaaVb1j/n7V0Ss5KnPnqDsqMudfCBQxADtl3VmVa1lK+5qYC3sEg/ZVgDSFoIaP2dv4ff21R/OoQFD0jBUpCPdKZ0ax5vrool4hCy4NmMHQe7eXUajfpXZ7SOJIrTpS+aYrjoAePCG7l4ooEVFawCR8SXuJ; 4:CjC9JJy1XIvd/Fs+sqmxcfBSLX2Iv3OM2aU7nsgM5WaKjhf5pi6FBMHfl9xWxN1OmRAsOba/er2b2VZtVSmc7DPZ30sE1tf221jFHH94p9IQZC8mqZD4fidDYTE5VF37+DooUAtFPrqDTSeBACZa8BwfF37s/dawFLZzHu9ynO8onsWgNzT1EOSgOR/NJ2ZFTk9iGvv2G3lfFc1ZSSAb8T7lgvj22QAwj94d8s2OlxGmUg3gDHL+3oBxMmb5de1bCacr+z7x2TsgLOd8HeiknCt4FsPWxNl1ICUe+E2oKiMgTZHcQB/Qw5lf6NrPJkSK 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)(3231355)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051); SRVR:DB5PR04MB1528; BCL:0; PCL:0; RULEID:; SRVR:DB5PR04MB1528; X-Forefront-PRVS: 0809C12563 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(136003)(376002)(39860400002)(346002)(396003)(366004)(189003)(199004)(386003)(6506007)(7736002)(186003)(6512007)(305945005)(36756003)(11346002)(97736004)(6486002)(956004)(52116002)(76176011)(51416003)(5660300001)(34290500001)(68736007)(50466002)(81166006)(81156014)(446003)(8676002)(50226002)(8936002)(47776003)(105586002)(48376002)(6116002)(3846002)(26005)(16526019)(106356001)(53936002)(66066001)(316002)(55236004)(1076002)(4326008)(2616005)(575784001)(72206003)(478600001)(25786009)(14444005)(217873002)(476003)(86362001)(5009440100003)(16586007)(6666003)(486006)(2906002)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR04MB1528; H:Tophie.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB5PR04MB1528; 23:lpZLM9Jo+yBZvSrvFNSEGzsodVOzAHUS3nTqPDfRn?= Kbsqo64VRjE8G8++B6/hWEl5nsSWPrzyWGxdcHKK5Rhj2L9rvrXnfl4ouuZNqdJrR7yftMyYra6+NWjlRrjJDPfF5Z8u8tncA2ZkdSupmlXfGpesIzXiyIvpJ7hnBO96zWFMp44Fmdnjnp7BGemT67ua1rUuOfS93GEm6CGpfdan6y2D7dvP62zk6eTB2uRIarxHEcmrsFrUoYKIp7pC885AnQkN2m7Mqz+DW8DwIQpD5HiKzOU7BPzCU8A5o1yJCD6xfCRH/eMPhVOhI0oGw+xmaou0uAUZ/q5/h1SHhOGIcp9/nMNjLGZ/HhgsaIDwGDjpBAsIWgXX9OZN8iDlnx8FvtkII3ca3faYSfpFbatQZzsUyg1xxJfE5nn0XtQSLg8ha9XVUFroQ7Lop5roBrhr1Pfb9X/cxLa2l0VTlkYgbq6ZVj/x4bMh6aVdQFWFbAOge5Xi3SpHd3Y5czBO92vyzhQJWqq+3yS23PJYIePJz+G+/aAq/3Qe/AyWs5LCVh+eVRKhCTrcLeTOn7VZFB3GcJOgYY0cMnxBjxsB6otgBzn1kKhSIxfFYb+mDejI7Rw/EY8YR7wVYIQNJk7w1UnMv6aMqevtJZV1m0eZTRgOIaq0VmxzKdpMD2eyyCLqtimMuF32Sqpoyk+DQzUsG8m2UB18aZSGZT1AkBShC9sN1B2vfwUKiI+xH7Wpw/g9V46tJflsdfKw5gF2RC8rWRKx9T3lQCbA+ACHVR4JLdXA/LdFlyKjlln249l2Cdns2KBjY92S9ciLkPQDuXu17/Wb07U3qg2nI0d3Zr2VIfHCojlHgmSCyVOh0q5x7VKZzupjO4fBRHjZm/g0/JpqbSNXx8cLuk2oAtubBTuJTGATFMqTjBEecYn6gdPRv54b+zrlwP+2N46USNAM37HUvzwFMUT3cg6NCcXbVhPspIc/hmqJEwGmDTCPsjfmJS0pTzARPzELddIW2wWJ7ILkelplU22G2LgLcV50Tc6uLgaw+EOIo9JmCmxnN6n8GGpPwysry+gJfeLP/dcCYwxNu3Mfk8XtM6gjhli0s/GOR/6P5MXpwfPp8OZZrbhW9fqAIOVKKJI/ABw1uXKEXUUDvGEP6jq6ehx/lzZtiV0iv0uJYIANr8PZuhlJQgcxJ+zNYlcd04ONdB/7KiAnqsPIHRjJmLoyXFlj1PtHQ6ZdF5/vIAZ0pdis9qWxt24db5zG7MgNYVOja9phqTAXCqlHlLn8ts5b5WxXuwLuAymuPex8xPdJg29Y+9YLvZLvEyKvQi6ZpqenWjw3PvC1CsOVwb5UKRCOx08lHG0SAnQBVtR8Q== X-Microsoft-Antispam-Message-Info: Bl01YYuQa7EiyvDRQkfaHYBksJz5kAcbLtK67Y6xa5iMVGsDM27+6YiQBhtkJsUW+yj1syKu2sF9QUdOmC/llTnnjjY1yHUmkM1VbF0yU6Owh8o3+8GmjxIpe9nKstO6qBT6R30ukE4jigzmHLqdwHVAuDyBuELwk+keHbhWTH5QMWVhpuGsRwazFSrDYo2NOPOl6C8pRsbez82pCjwFyCW17Ef+Gfn1KAMab+e751tPnTrSe7kk67vf5g6acKFmDFacmc1fj3Bj7B/wnlC7d9ya2j5F1u+JYJ1HOaBEPA785RHuMBgw/tdnzP+wreuX5unndwTOy3U+vlROx7Xd9e7Q36tW9uYXESHior7AcdQ= X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1528; 6:+d5jEJpGSS+I5iHP8IKkF79OaIwK4Js7EZPEDIqNAm7sCivuV+QydRMfX87dazW/AkOjewMQXW5EYsSBQhFqTkmK1ttPg28yHjDweJEJc4gFdcjVems1PmY6dYAn0E/IPWjun/EWtplAGFEb2wNdHTinWzu5N4fhEyU/BHvr+ThUbG3U3YdrG7xEa6VCKSNKU/uryiANHQLT2HlnN8blnnFkbu9DasRjvEJ3xol2koA9b846+lKdSssun3Or/qUsdnMTRjIJY5qw3UPXjncchmCOxJSbhTjxfRjWK2RRWJzKJtPiOVzJtdtA55l99yV4a6E0Wi1RWzwpH5ttXTkapVkothQ4uZzo5QOExqDFrKYHyaYCLweqSHnYIPsR2Zk1QSIa+eShoOLgXMGS9peigQKG1njTtemOltFPGtMCWcTvrA+LlGDqzwm2uk8NMxCcxyOcaudSbEgTVPYpJcDHMQ==; 5:mU5msRKvz/DdBR1NqoLPWBWkSvwCbujsoIFnV02HfAXuqCVey/R4eTbr41cCSUGicb+Uj1JyHeshaLx5m7Tj3rqDUgIElS3czCxMtsOg/tauKD9E6W7D9SarWK6kLvXpEK06ggUBufvdkURHc48W5xazDTt3/T81Cw6eJeFkVj8=; 7:CnzdFabXaABNcQXUklUGBbr5sHXAASy2kioQFYWDfwE37EVUVnzBbkBsN8do2+rIQRJUIRkLY/O5OzAMt4O2v+xZvE33qxe9RbCMYy6d6CysG6MdDV4C89iisQWz1fyQFVfxngenExgfOx71/3mnZCy21GnF63O1udxl9/qQOj0qz9JF0Bj8blAL60iXvPMdXxT4NS8mpyA6auA1sVt6jsz7haPKyd4WFi9w+ULsh0DWKl5ORt4AmzpCJJUqq37s SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2018 07:46:33.8118 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ab652fe6-3c8a-4021-728d-08d6251683bc X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR04MB1528 Subject: [dpdk-dev] [PATCH v4 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 --- config/common_base | 5 + config/common_linuxapp | 5 + drivers/net/Makefile | 1 + drivers/net/enetc/Makefile | 22 ++ drivers/net/enetc/base/enetc_hw.h | 217 +++++++++++++++++ drivers/net/enetc/enetc.h | 90 +++++++ drivers/net/enetc/enetc_ethdev.c | 251 ++++++++++++++++++++ drivers/net/enetc/enetc_logs.h | 40 ++++ 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 + 12 files changed, 647 insertions(+) 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/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/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..c962b9ca1 --- /dev/null +++ b/drivers/net/enetc/base/enetc_hw.h @@ -0,0 +1,217 @@ +/* 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) + +/* Global regs, offset: 2_0000h */ +#define ENETC_GLOBAL_BASE 0x20000 +#define ENETC_G_EIPBRR0 0x00bf8 +#define ENETC_G_EIPBRR1 0x00bfc + +#define ETH_ADDR_LEN 6 + +/* general register accessors */ +#define enetc_rd_reg(reg) rte_read32((reg)) +#define enetc_wr_reg(reg, val) rte_write32((val), (reg)) +#define enetc_rd(hw, off) enetc_rd_reg((hw)->reg + (off)) +#define enetc_wr(hw, off, val) enetc_wr_reg((hw)->reg + (off), val) +/* port register accessors - PF only */ +#define enetc_port_rd(hw, off) enetc_rd_reg((hw)->port + (off)) +#define enetc_port_wr(hw, off, val) enetc_wr_reg((hw)->port + (off), val) +/* global register accessors - PF only */ +#define enetc_global_rd(hw, off) enetc_rd_reg((hw)->global + (off)) +#define enetc_global_wr(hw, off, val) enetc_wr_reg((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[ETH_ADDR_LEN]; + uint8_t perm_addr[ETH_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..9fa7c726c --- /dev/null +++ b/drivers/net/enetc/enetc.h @@ -0,0 +1,90 @@ +/* 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 + +/* Max BD counts per Ring. */ +#define MAX_BD_COUNT 256 + +/* + * 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..47e2a8ebf --- /dev/null +++ b/drivers/net/enetc/enetc_ethdev.c @@ -0,0 +1,251 @@ +/* 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 __rte_unused) +{ + PMD_INIT_FUNC_TRACE(); + 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; + + PMD_INIT_FUNC_TRACE(); + hw->mac.get_link_status = 1; + + memset(&link, 0, sizeof(link)); + rte_eth_linkstatus_get(dev, &link); + + link.link_duplex = ETH_LINK_FULL_DUPLEX; + link.link_status = ETH_LINK_UP; + rte_eth_linkstatus_set(dev, &link); + + return 0; +} + +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..c8a6c0cf3 --- /dev/null +++ b/drivers/net/enetc/enetc_logs.h @@ -0,0 +1,40 @@ +/* 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) + +/* 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/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 Fri Sep 28 07:45:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 45566 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 B349F1B182; Fri, 28 Sep 2018 09:46:45 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0067.outbound.protection.outlook.com [104.47.0.67]) by dpdk.org (Postfix) with ESMTP id EC0B41B160 for ; Fri, 28 Sep 2018 09:46:38 +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=CLiTOIzudkAFis0bdniyk+u56x5YgT3qiiLntKLa080=; b=ZIcVVRGwEgCjPSJv6mhRqK2Bf+MlKDQK7VCWNR8v/laZjrB2Y0ZwaZzv9t9iLy2CyhP8VXYi6qCxmJoW5LDLIUT43DGHWqWBUltVj5idd64wwLo5e8lH8V8151KiCXaFj/bCBCNwI5afAjPTLzAd6dT0L0FCUFGDSUSls+zHGgs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=G.Singh@nxp.com; Received: from Tophie.ap.freescale.net (14.142.187.166) by DB5PR04MB1528.eurprd04.prod.outlook.com (2a01:111:e400:5993::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.20; Fri, 28 Sep 2018 07:46:35 +0000 From: Gagandeep Singh To: dev@dpdk.org, ferruh.yigit@intel.com Cc: pankaj.chauhan@nxp.com, Gagandeep Singh Date: Fri, 28 Sep 2018 13:15:59 +0530 Message-Id: <20180928074601.4287-3-g.singh@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180928074601.4287-1-g.singh@nxp.com> References: <20180928051647.32341-1-g.singh@nxp.com> <20180928074601.4287-1-g.singh@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0037.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1a::23) To DB5PR04MB1528.eurprd04.prod.outlook.com (2a01:111:e400:5993::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ce0ab77f-bfac-47eb-16f4-08d6251684bc X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB5PR04MB1528; X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1528; 3:ATp8RclLcMtsKkvIVw6X2oIjuMPBCSGhqdaP6xogzDikJxtVkQAqcOnbEGqTWvAMT2KCytCbLB6hvhQsS4NdYzIf0gn+XM92wGiHrukJCo9hE5Zs4htvfWFCPpwOD1vLakDTFnotbkXglhJ0Dow70OflP6HPBqpTnBmz5GA9Au6nm1tb0P6yR0FOiMINFOnKAbmeYR1BR/HlYiN8nDk/wwN2XRFyKE0uSWUwOV37TiyfmKQY4KEbUTqX4EZorLy3; 25:9hy+t1cdGE51SqLJeXuI6R8X88WPNQFS45xQzDPW3lD/FcN2YLubdHNEGBQkLKffuB8C4e6nh6283Q3Rd6JpvrMWbLcO4M7RIGmiXevQNm1IguIgnlSUrgcbBRAf/u3D2BX5dmcdumegA12znpl0MOQ3p9Ob9GSr1FaB0Jc8hMnu2StfRYRoTmARh2J11PbAfhiVpV+0UANshM3j4gPTIOCU8tGRKXWVDuV2ukEaPf1syrTMrAjatLIU9ZKbYV/Y2RgQupMvRLEDQTz7h6GacqTxUZZ3B4hG8Bgg7OS/8jtBMnfTaLf0U/bcqgzQ2rexcIQ/QxWJCJ9PVIrcYqU2OQ==; 31:zsgoLdpEMaFaw442NDynDbhuZHTl8/rtcqvJP7IqCXsn2rxWtHM+jrAb85QZxouHxQ7t31HlcuaBpm68pqaME2Qq7ao7Dwea4x5GCW+hyhg9/EMm+4KmGN4+1/fDecUdtmYTFWQ0u6EnRrZ2Btz4RL6kJmrkjZGBXw+g2Utvtp46vB5jOEh8NQ1LNnDr+2R0qbaptG4TPHQqmzdw7qYNPLYlOf8nVV5vWUZqRHWPkUQ= X-MS-TrafficTypeDiagnostic: DB5PR04MB1528: X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1528; 20:frXeyQ4Hdb41ttTDZoh5CjtEDQZVKJfdxCknfWLG5HFSVlHxA5XGMW6v+Adla2SykFsMGk98E7Bvv0iGg8LlD9PbwfrK8l5h6GiUmvNs2oOD/UZ9ZROf8O4M3Fw6yPIMdEeUURjhVxfeQNgpvpnebzSsPRrL0/pfAQzcZHfmbVKp0Mti5qcZgovGSa3hnC52Nib4CbXvSpCNe0Zcdu1dRpKzqkHK883sWI/BU8aThxFcdbMzzLgVc/OJXP+IhuyMYliJBRTi2jgqY6gVB6jji/BASySHMOYg1NY8dVYp4NnFDmR82FhlFW6xrgGl2SMjEmbM14MpivGSJvk7PeDUvAnjk2WwSniiML1oYfwph97GBRWfXYyJUhHkQs8qdOzmtlgyCEOqQwRsXkhyW5cqBhrdYTmYLRFxBue5QwDwDdKlT4kyBS6ulEL/p/UdpO5xfMgt7yKUa2g9jgz2sfg/2TiO8mw8o4yvFM67bZzjKumSjUWetRn8EdFuGLMdBQ/z; 4:r1AB5a8895ON+p0nxsFhiHqLJLK65cWDBHmxDtXjHwzu/06Ksn2iYnbpoi1sn0jOGMKloXimTYLlin+V+SbxErBPVoXrmPaNR3aXln/ZPsTD1fNicvZqkT8iKyOvGa8+Gtd2DFlApadNzM1JyZHbj4lQkoyWQFy5mESErq2+kETTd8TWLpKJXGvv2mzJIRE2Ybd7A7ry9hzYh0rCaoH7G7Irenn6jHhB9eRDu/rGvOuSVzm43Ar+k+MgxI6cioD2FSxWLwgogRwHBvAgfsvr50aTTcIiAPCaw7Ttz4Vk7h7imkKm8+ak6Y6EF9cAckd6 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)(3231355)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051); SRVR:DB5PR04MB1528; BCL:0; PCL:0; RULEID:; SRVR:DB5PR04MB1528; X-Forefront-PRVS: 0809C12563 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(136003)(376002)(39860400002)(346002)(396003)(366004)(22813001)(189003)(199004)(386003)(6506007)(7736002)(186003)(6512007)(305945005)(36756003)(11346002)(97736004)(6486002)(956004)(52116002)(76176011)(51416003)(5660300001)(34290500001)(68736007)(50466002)(81166006)(81156014)(446003)(8676002)(50226002)(8936002)(47776003)(105586002)(48376002)(6116002)(3846002)(26005)(16526019)(106356001)(53936002)(66066001)(316002)(55236004)(1076002)(4326008)(2616005)(575784001)(72206003)(478600001)(25786009)(14444005)(476003)(86362001)(5009440100003)(16586007)(6666003)(486006)(2906002)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR04MB1528; H:Tophie.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB5PR04MB1528; 23:hCdDNdbI4VFXD6a6vysBwC3rZCNBQuwy860pQYC+m?= f6dEQeCuEa3fMERIqddh+cq93q/RQyQqsvoKMlJ4XFbdEqNdEZlHsq+AXfEln3ysvGlQL6s+YSSgYDLCUN4Itwt+wZ7SbQ66+0AYMSmJTjOY8634F4Qx2WUBHxcXNtfW+7BqIv7mBqXASU7LVMG+KnY6EWrfSGJ+zvPpN4uyLShReoPyv3fycHuvHxBYLkCGYXFpI/zZtx66vuBQJzhgY+fyYXlohQyaw9z3o+ETE1ie9Sf69pPB1d6ujCBi6pMOtNgw/34vfq3qpVNjz9Dmjb0q9nrXQtPgot+hdb64VB7QoucAw/ehjHQDq4fko0v5ytSwJwGn3X4lI93IJ2+VWTWaVjzvcGt96pu24qchYEINNR2/L2YLJRd0rCVXufWoIaNzwL+ljYbfYki7m5Uc/7wJpHdLg7DyiQNKAoaASNYtH0jyyNknQiXHbzXtZ3VukoGGXGL6e6E85r260qXLuK7a1EqV0dPURAjd7hObR3R2ZYBOOUFiL8aEAXy82mnRD6SIxEP29nHsoU0gaWarG+tbon5Iua30kQhxM7CfEUaYsk1Ms8DWDUGNMzbQCeMmdGkympYwhH+BYwZl3+ylfk9RZO6atjpGMDTjia42+BWZT7meROILQaLDNsJmCwSLszmVOdXyTYgGVXFi3T6VqOkSuYH+S99AP/bFb4HDqRwXxQtwdihq/byoFwNCgwEvO42QDrrrm0IcsDjACpUD9wfhP1PdWd6FOcc07t2ZV1TnQp0cXfxEBdapMz2tEDivApFWnMrTsR+HlQDkHXH0ceqyjGHKBFGhMVeQ/oi//IaJ/s/CAwQe5k6SO+6P6pp5ATUxNGzIWqvuZRK2QwPV9VZyDq36ISpN6vLPyr7aRQKWloLfspk7ZVoWV74ub+bJp2GaCKhZgvWenk8OD0lrmtQRrmqoDJ6+6uKjCeDRpTBOsvJHC81Czbx+TWDu05HfV1WxZXxYPQlH/7zG6TGf6bARYrKqQ2SO6YQ1pekH0Za4RIeBB53mgDXqsRVCaE80I/YeLAryX3PxNAfQZtjPWHfjrPF/7U8JueB+kWQewJERsI0xrCpoG7wCdiZleCh1t/pkzmdgE6ihEhPfMKif9lwfpYwaHFb3sax5faxnzsh54W1W7nznY/+bNKj89tJLfnq4QRqrpMCup5S0z62M5X7gD4rNEUW8ONjRGIpkiJjad/dEoeu00VlSJa9yZ2UnWf2BF3FMtJjpkpDxXK+sIskR9k7W9JaV9elSvuSpbqP8ZsF5MJqCP46xsv7BsnKyV1/I50Lyp5b3LypNPDCjZxUJjV84TF6lla/eSSyTtUxqg== X-Microsoft-Antispam-Message-Info: Irknk2H5j3Hr6S9VSpNzTmjMqNMQhlg/Rnk7f0bjZJxk3ojYxKhA8mcaTxbNeWGDjgtt9LcRtFMXqZoRsrXIQOJVKvK5gdsoP/qgyHrj29KsBqrmgtR3ghpUbpk99OFh7VDhXZoCp4NsxxaJSqHExobIxTHPGHsWdfHGoPPKN6PNZxfNk9RYoO1LBEftdRvZYQ4VD0dF3H2Gc5S4zhdq2hbBEyd1uzmA74V8QKZ9U21LGVdi6rPfbhTJKPAmdq99Ml/vZtYJ94djcz/V8QS/rxIwWKVdqPrSucyDcJ4fTrF+DmZYfSai7Gjs4BwEoXmesItuxstRoNZrTinDwkCcIvry8hqssYMCx/eSveQ43YA= X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1528; 6:euzNkKCDEBL9Ik07QhUQqwrn6OgjwpjV14GXNCzyW3nijdlkPSu29Bgcj9zpXLDFqLKuVcFw0IlRr+xAJBamZMP9emMNUqoeypZGejFpe6nbhSzvq2yB6556NKWiCPtftoNA/K6v5VTgVibhERF4BW1fGAdpzLA1pA6Dg3uVg/qaxFX80tqdOdWoMIIen4Qxc876JpvP+zA0g3RHqwitIhqnLEeLM/hSZDeMXACV9TDHtR0h1F1ZisLqeWVRwDlNqRPQ+zwKwZ7joODkr4RkgBOkRwwaGmAd1Uh4FamjuqODQ8DLs/+V7nKHIL8uVr7KiIsBb+NYwaCBZ/dgZp+S/VpGcwmgGqY1qEA90MJo4KI/AjyGfbs8TnqNN6toiy4jR9B/yuOcI8kgKy+x+RAyDfFM3SCBlUmK6+kNifw/NYVjVLT42v9Sd01S5MmdRX51iul7m+6UBxXKcbwOVtoJLQ==; 5:UZgbZGw1hU5xA/S7jm5Vfh8PmT+c8hrlC/7LnFcd2517Sj6zhCC1IWptGH8VXme5237JnOhZ8xHyP7ARGZ1BjLms4btmeAVYDFx/sos5NQbrP5m9zapHIqEGqD9lesrE8UShrQbcqN7Wg5YAf6xtGxK5jW7ysX/E4+CLfdmDOQ0=; 7:34sUQtnaG6czlwGycgIT/OSQFZkFG4MGk0m6ww8W1yUWrcMjc5m/IylE6jNmXgOiHtrFAA1O4BE9FBkJRxniiBTplZYptz18B0KtJ2SWqiU8hSKA/1uqM2bXogxo5gUJg/2cetdH6bpRcFOnd1NiQOb6ac+jZZk30oLIcYVU7uevCgRG2+WkX126ACSGTEHVszkkbYdy/QslCDA+L7EePW4WOu6QQWRWdV1EnY9+rgB3KZNoFR8T5tx30ypEXcrh SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2018 07:46:35.4802 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ce0ab77f-bfac-47eb-16f4-08d6251684bc X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR04MB1528 Subject: [dpdk-dev] [PATCH v4 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/base/enetc_hw.h | 19 +- drivers/net/enetc/enetc.h | 25 ++- drivers/net/enetc/enetc_ethdev.c | 326 +++++++++++++++++++++++++++++- drivers/net/enetc/enetc_rxtx.c | 239 ++++++++++++++++++++++ drivers/net/enetc/meson.build | 3 +- 6 files changed, 602 insertions(+), 13 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/base/enetc_hw.h b/drivers/net/enetc/base/enetc_hw.h index c962b9ca1..c74c94875 100644 --- a/drivers/net/enetc/base/enetc_hw.h +++ b/drivers/net/enetc/base/enetc_hw.h @@ -104,16 +104,19 @@ enum enetc_bdr_type {TX, RX}; #define ETH_ADDR_LEN 6 /* general register accessors */ -#define enetc_rd_reg(reg) rte_read32((reg)) -#define enetc_wr_reg(reg, val) rte_write32((val), (reg)) -#define enetc_rd(hw, off) enetc_rd_reg((hw)->reg + (off)) -#define enetc_wr(hw, off, val) enetc_wr_reg((hw)->reg + (off), val) +#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((hw)->port + (off)) -#define enetc_port_wr(hw, off, val) enetc_wr_reg((hw)->port + (off), val) +#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((hw)->global + (off)) -#define enetc_global_wr(hw, off, val) enetc_wr_reg((hw)->global + (off), val) +#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)) diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h index 9fa7c726c..140daf0dd 100644 --- a/drivers/net/enetc/enetc.h +++ b/drivers/net/enetc/enetc.h @@ -18,7 +18,11 @@ #define MAX_RX_RINGS 1 /* Max BD counts per Ring. */ -#define MAX_BD_COUNT 256 +#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 @@ -87,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 47e2a8ebf..2d90d8fd5 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; @@ -212,11 +225,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_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 Fri Sep 28 07:46:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 45567 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 1DC351B19E; Fri, 28 Sep 2018 09:46:48 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0086.outbound.protection.outlook.com [104.47.0.86]) by dpdk.org (Postfix) with ESMTP id 9851E1B16A for ; Fri, 28 Sep 2018 09:46:39 +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=pIPKxuLKg8txhEZLjYVEO/37t4CIuc3kmjIENmsGxjA=; b=evqY18w5MT+zdAFEY6SknItktupiICQ6Bgm546FDSf65/Rzh4q25z7753z3M1OhjnyWwAo04yz0naiNwgf3CNhqcqcy4E2kttGKT8Bc0W17Ltc1ll6tZn24iDUS7n+8W8QcV8mC8hew0wZt3cepU0ks4RoRL9uIiB/eRlIAX8Wc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=G.Singh@nxp.com; Received: from Tophie.ap.freescale.net (14.142.187.166) by DB5PR04MB1528.eurprd04.prod.outlook.com (2a01:111:e400:5993::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.20; Fri, 28 Sep 2018 07:46:37 +0000 From: Gagandeep Singh To: dev@dpdk.org, ferruh.yigit@intel.com Cc: pankaj.chauhan@nxp.com, Gagandeep Singh Date: Fri, 28 Sep 2018 13:16:00 +0530 Message-Id: <20180928074601.4287-4-g.singh@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180928074601.4287-1-g.singh@nxp.com> References: <20180928051647.32341-1-g.singh@nxp.com> <20180928074601.4287-1-g.singh@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0037.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1a::23) To DB5PR04MB1528.eurprd04.prod.outlook.com (2a01:111:e400:5993::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 401c597f-b037-45ea-160a-08d6251685ab X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB5PR04MB1528; X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1528; 3:ZNs8ELP8CUacql++N9YVkHs2rzf/LZqu8NVm5jo8BADG19I0TvhYFDm44SPOEbxigKAaiJKrclLlpkT5dhdXTspeHFg9aReG9LevYD89HvvjwnWGQX74UvZGNID5et6FZCtdM+gXIICEqWyX/wTLMQrOwMoSqL2OHFv0FLLt9aI0mOp4x6IQRrC0AhiVLD9CmUPPLpf8Tz2pSfrXj1wIQJyrPeQPUX7ImNOQqCkZr6GTsKeNt2ER9zwfNu8MTD56; 25:sIjip+Hegb1uON6Hddha1GtLLrRm7FDy2UFbaXY1wfn9qO1ueXg4vMSfOkT6/+93mebDcftn4ntXD3dnO2m3KAnOoUFQDleJGg9brBULzCYYtpmUSDnkPPzVYQTlRBjgjabuMijW2q0Wk+fV+I4DTWfy0GwrNJ51/ETpJgmGHKGpzkQ8m5W7mN31gE5tUzNJv8CjWkr04UOBG4EuL5Awe8ECd0GKLr9U7T4je/9gxPwMGgtJNfqR2hD6N9QinnDkjSiPbrP1SNUqunkE/rjtfpFl58/RXj42P0reA4P781BXyAv31lBz9zLuKoq96+ZvGIS4K9CB+ic6bN2MBOok6w==; 31:odjSAN/d+pHm0hujE3jPD2e9lv92Tq4yiUy2I1Rrvvga7SUp9hbRJFLq0Voj+mVOcy2dfW0ROVbgq/zn1TiXp8NhLZWR+S28RXTttWqpfMrGznBMV/djs99QqrfO2lB6rH4HQRAv42rGrMlxdCazZm7HeykrvX68mELza2jgJVb8ULh40JmbHTeAzKxmQbeQ1DxZAW0I4PW30DP3S5vzaXqzrHmk9tXAGoDLEMZpk4Y= X-MS-TrafficTypeDiagnostic: DB5PR04MB1528: X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1528; 20:lYkk7bmsB4G1jCTsemhLm33GNeAYymeDj0MbMq55MTZrke8ln3SJPVmBKDOhwqq6ZhPFdghdsQB6/n87AzCEafecFZ4tnoKbJI7tW1o73l9TApMhICJQ2hjHtyU4EThoGUCLK6/jmLqshGZ7R1QJSn+UFcqStzBCX1mcPWLbsXmjMhMaPysXW59pPeJss9AK6tHpGchbr+afUZNpo8TaaRcXMBh5hnicwhwY2s2Z73mHx9CHQIup2MaympojpfzDlsIkem/OY1pCaGmlj7C8jWfgvIqR7bR66uQdrhXB1QmMS4OO1AC5HJ8B7eZO5ujhD9/6nzWV+Mdx5vcftI5PgZcYcunyyJdBix+sk2aAdlEjc0k0S+Sv6NOD+C4aPtIqTPLmrhSNb7U71aokN/gku2+tVURaEcQxR3mVKSWzrhRn3hh3F+FX5hX8q10x2N+VLt81fF5/+rAwmrjsl2oW3NesNT+39IXdSg0mUO0a0Jh/SQeIVI37yiIIsRnZWO9W; 4:2wbipIQK8RXnn/8foD9tScRyRynVC6kUeyKMNtzvbvSOgXJavx/rIBx3Vc2EcTtAIApAPGZuu9GFm6XZEXjfL8F//IyjWuZFkH8jUa33/jMF3gUeBgIMwlja2qU+iV67vo2yhRLPovPGmiulwu2AB5DpC6Y5GZVyZoh3+EA2ALxf6D4RHRFcmZbqE5xWSSxbVXLievfJDjrSd9CFwpSwLrYqCJVRTISzOK74oqfYmm6OzmV/NtsJepZ6aFI/MvKLd5Lbi6JB1qqsxq5aHRW+5VJQyznSrZpJsW99JfRmCs031pgV7aFb0W9G1/lEkPoG 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)(3231355)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051); SRVR:DB5PR04MB1528; BCL:0; PCL:0; RULEID:; SRVR:DB5PR04MB1528; X-Forefront-PRVS: 0809C12563 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(136003)(376002)(39860400002)(346002)(396003)(366004)(189003)(199004)(386003)(6506007)(7736002)(186003)(6512007)(305945005)(36756003)(11346002)(97736004)(6486002)(956004)(52116002)(76176011)(51416003)(5660300001)(34290500001)(68736007)(50466002)(81166006)(81156014)(446003)(8676002)(50226002)(8936002)(47776003)(105586002)(48376002)(6116002)(3846002)(26005)(16526019)(106356001)(53936002)(66066001)(316002)(55236004)(1076002)(4326008)(2616005)(72206003)(478600001)(25786009)(14444005)(476003)(86362001)(5009440100003)(16586007)(6666003)(486006)(2906002)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR04MB1528; H:Tophie.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB5PR04MB1528; 23:wGVLux4NkkixvaCWb93RUwCbXaZNFeosq4IiARj54?= FTdSelx6acPDRBNwRchGcyVQxLaYhskv9AB8H1V1yWh3czkN2i7N+J8am6PidTG3XKB5zHmcwmpZl8pibhp2mocuDIDL3n0Rj23KJYWlDSbuQjBqgpLbWU50J7BzJhIoezwuhMYTsS+3FpbMi6o7EP+ZbG7FquCgZXQP6bzh6fEo5Td1jPAYwWgcmZTgRYCYNWTftNI7BCt0SHLKo3f/kJCWtFqxOYOowzkjUjI8BcSPVcoZ0x4ssz+1K7ZCkfpcShqI0ed+ZeFcwB64Zqe+iEpfzz41d6V8cdf97ZAuFBE27XGCFDXy/B38SyPox3e679ZLO/BBERUs+v6LbXqxhEXln4Xa+EXdSS/NEMNys5UHIOWJzo4pfZ4qGAIKLTonYlu589HDtL+4k47nHBbJ4SgKAeF23yZ1wmkx0lLIr/3P8Nmal8Hx+yrKSlgnYyYt9FTVGghNigeF0uvTNKvT3SU1vurmYJscUJ38G36txXCYhuc0JRJDVVA+5tRSWqZ0u5pfv9UQ0LC2CoFnFlmuA7uKYR3Uye4LElZaQ09jiQTS+7T3NzCKk0Ii2BzEXfbVGMgDQtCT93ZxzAHutgvBP2derHentVqpnnSg5H8gUt2ouXJKD45ZpjLPJoQqM7kemRQIrR0XXf0WjfTZvTMcPMomrB9OHqT8SQWfnTcYmgWMS3RIf14HN8e4NrHH/AoeYCNCukapNC8xEm7LuQMllsz12kViD7jFj5KU0CIn7PIfS7O0e5FOk/ReWjMdjPFh/jMiybIBYp3lIRBuJhzkaM6FXzY1Iwix3w8IL4wLKP9hn1LZhv8BtdxOLCLl1D3PjfKHCM/xNheONtFI1xI2EdPvs9O6eWZSVBPzNxD7uv9I1+XA4jULA+AcbBVqSOe4kj0GA3C2oQWs3LPbllJVmm+8ktmbpyUHZddX/LPYf0mw2XsJkiUXSX6s5EHS6TN80K+OQ1nnQsDlXiKknNdoBdfwShHSeOsAxgrXojLHfBiBR1xBHz22fOqByeWZlGL4m1yrpwopHRqJg7lObqlGcXlsOJKeY0NFeqpL5quhH/5r2OLSHTYzXuXibMm/iyPKdu9i1YI2YZ4ocFBgiysPmcQnjpQpXmKOlb47ToKHP5MgznvqGQuj8z+Gnuh5SHzLDchdTZ7cMRrtQmin8/SyUrZWDvAom6GSPvbiCXvMQtt7tpVeOt9OazeCxgZGRbccQVHSln9IVp+PgayaV6lJZWxWaMyVmsT4rEJsVCZngTfrZUxSOvKcA903JgZ88QqcdE= X-Microsoft-Antispam-Message-Info: Qfq95GtK/RqJ8ElnTayxZAyxQc9yHp/13AFqUSL6wkSUCqyIHcNOY/u1akjnRW1bWN3o+q8BahZPXy9ajrwLinT/xpzP7ZlHq7kXU1YEG4sHWXbnGq7BbumY+JjEe8bDGQa9rXubNyefe2HBt0Rl0eG53YKq+wq3ZNNZcbW0mDfOICNeviTNxRAbC7XDI+LJcGWIfTRj4GG9BpMOl/QlZtzCm5s9Sa/vhMaz/a6XWcWyBnJJp8Fbo5qTu9LwED2K7PJEWFS9Vmt22mK2JYpm0lA3hRATDS7C3A6Y3nw+XBPgK/nOUl9X5yUHmMV6Kh0Mn+NCrdRXRnc/4Pa4z8DnvjEogtkdunu0XrhN2+A/lpc= X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1528; 6:HlDFwTgAfyj2RTinGDWvuZbR5N3or4LjYCayROD6Q790GGeu/xTfj/+26QqYSH2EQj16ZX86dGXe96GizrEnz3fADVnupvzJ1KXsdPXR2GNRfs43eWYPu+xgK9x2nqFHuiqVeVvOAJFJtX5ayRd2donKLdAtHLDYbOUuFxKiZOMQay41b9K6jPo5THp9kPZkH4IixDL5T9nHh/mjnrFOpOXuDXi3t3g4IuW+5ls46aJ14hmteXa67nGe4XgRjGIe6DHEF4g/ySWPiwzv5iilAJ/b0hI0+jvT3D1haYCVJ+JyiBOZTgUpSyf0UUpRClmHMgLKDtJFLt6Y/M/xN4wXaQlTwaSLdQKWVHABFP7P2mcz0jR7PuoXzbc1Hj8LR7ZtWfWq8yPH7yeyvYCf3yoXvoI9UVqeJNdJ59p2a6+GxQ9RzhjouBWEXx43EUzIJ4kC1HUyiVwCWrr65eUyWNDe0g==; 5:d3w45qCTgd/pwaM5i+R0MwD/Dwi2JufyUAVy5ZDjm8beVQkVwpzqTHONe67fEkEzdWmMN8/4RgU3Cy9DDF78XlWRxUrP2gVt2BUPePJjik+aLl0EG40oigpauheoX7t0ikrHaqZ8N/yvQdUFwCFa+eYXAb7820+S91auUqgDHGc=; 7:vLEMxEx9nuco7g/QWleK/hJbCfTj8s/xGo5A68FLQvp/p+HpysGegcLz/HxmkIlBfhhWwuabVjzLhENmNhUIzGcV/cWi8+Dbico/Lly6IFdPuOa6fEmabZ+Nvoa/Ww8n2nN2SfponCuSN/nV0nIahbXUArbwEPav71XFXVTFDIhpGewlayC3h+GHcYdk9q2LvcMNEXHiL19UnRMF6bilaEufz7u5ZljfWZfW3YkwRNd2QNr3Z9hy5IAuSbSqVDZn SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2018 07:46:37.0505 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 401c597f-b037-45ea-160a-08d6251685ab X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR04MB1528 Subject: [dpdk-dev] [PATCH v4 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" Signed-off-by: Gagandeep Singh --- drivers/net/enetc/enetc_ethdev.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_ethdev.c index 2d90d8fd5..8f4da8533 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, }; /** @@ -165,6 +167,23 @@ enetc_dev_close(struct rte_eth_dev *dev __rte_unused) PMD_INIT_FUNC_TRACE(); } +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 Fri Sep 28 07:46:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 45568 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 2CD811B1D9; Fri, 28 Sep 2018 09:46:50 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0056.outbound.protection.outlook.com [104.47.0.56]) by dpdk.org (Postfix) with ESMTP id 67DC51B13B for ; Fri, 28 Sep 2018 09:46:41 +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=x7utFb7l76VbXN+kc1+KYEAHAQ6lfPNUqxTiQRlfPDc=; b=P6cll69OFiup62m+HI2/7krs9zhU8SLjFaeRZWpF5c/nUO3HfT75wYRKxXYasw5x6U5204/vUOxDspqD2dHqS3J8Htb+zvbXgBNMgQ3w/R4miI9FNfTSaBMUE3CzkaleI2tq6bkJ004pK+4DT/aLtx+eT0jKXEdAPT4UZphzKLs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=G.Singh@nxp.com; Received: from Tophie.ap.freescale.net (14.142.187.166) by DB5PR04MB1528.eurprd04.prod.outlook.com (2a01:111:e400:5993::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.20; Fri, 28 Sep 2018 07:46:38 +0000 From: Gagandeep Singh To: dev@dpdk.org, ferruh.yigit@intel.com Cc: pankaj.chauhan@nxp.com, Gagandeep Singh Date: Fri, 28 Sep 2018 13:16:01 +0530 Message-Id: <20180928074601.4287-5-g.singh@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180928074601.4287-1-g.singh@nxp.com> References: <20180928051647.32341-1-g.singh@nxp.com> <20180928074601.4287-1-g.singh@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0037.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1a::23) To DB5PR04MB1528.eurprd04.prod.outlook.com (2a01:111:e400:5993::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eaa4c525-32f0-43a1-4635-08d62516869f X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB5PR04MB1528; X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1528; 3:E24VDPB4ljsNdDW5/uUM3EMUf32CEKV2EnJ75vqDRTSGgehHIvqM6hrdrut714neGzibnIXxrJAbVDTriuSOZ4yyGMp18Tt4CQdSimNn4O/Wq18AOBY9hzWU8lfiUzpE0s7eMuS4PwQnCS6NkQgZ3BLPYW1Hs9HQq2DbHpLBydDwzJUKKW3ZMRy9olEqX15V6y68EcWx4nT3MDC9RVW4FdLkWE6EsWlsglmw27acwbj2vR6h+wZIZRWqV6lrE4Sf; 25:rViKgkLrzDU8NRMZ4selXDd80XEfbgbAnm2890DqAseJiELUr6zwiXwU5d5GD+TYsxbVmNB5VhgccZTvQxd7ddNOuluwEJoMIGt/kFFT3ci0af2ugl6nLf6/i7FKH+36Ksrd7/Hx6ZaY2W/IJS9VrphrS3ChAyB+7qCHzz459Y6pBQ7cLMCQ6Hn4KqDc4QN7XSju03VbjgGFLklWBSyqjY0gzafDlAdH2wn/Mp/YeOHViaFo33qlQF2t7xLRC1fVvOOeyxlWz9rYPxHIr2RV6P+JDtd/ofVPVjZvqgWbaEPN2F44pPh+atOuMhwMuaeaUgeq9grVmnQyBBFM8tx9Fw==; 31:GAPxYg4FYvc/TtBZGuzZVjtq0vQhWvSKifZtlbC08O6+zlR8DGcgVpakz0wYrNO+vQQAbWDWi+Eq9471BlDjoqMkbg3u4CsBOf/JCqycOUD84yixRno7Km9rutiZzyWBfAtCy5hQ/hjCvaRoAkjSx619WaWQsVgx86vbUc3qA77WKydurte/IP+p4OILkCQWveyO34+/MpQOX5Wlf8vIFgtczAZNY8G/nS27IzMSwtk= X-MS-TrafficTypeDiagnostic: DB5PR04MB1528: X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1528; 20:okkZosXUbj2/VFpYYT3QGlz/O3jyrvx+f403GSeHYlwkb2Dr0y8AiO2YGYzWUFxT7B64ZeAo25USquf3SvqvGZxl6zxHHX5UruJ6fUGPQwpHE3PZLGUoLRwcePci7o2shjHCau1MKjSvq2yNTcaQWwHN4y4lUFbvk4kO0IK/7mrQwkFgMhcgnyjsgJsgwoKG4trLNDBRXQAnA7FW/hDNWag8fwijGSFnko0j3w53kImoVNJ09G0cUtlb4g20zQ/GgMJvATVZSp/jXXFIsvL6hTgwZzEsGQFZ+wqRAaT5FyR8gnbp37wYqVwixNowxRgIzzOqL9uH8VVwHc4eUUtcl2W56nZk7CLaHjqw0VEaS0jm2sU1rV1k40qw5QCF6mSl228HrEfieIpSFKzPwW6TDMkmITyLD5MTaRGX1DY7XkGWI2K9GZpBkciq7fcpH1fZ7qjNpZl8xnpsAYK7XG+WwkQ+STDcVAY+in2cn6Lm9sT71Cf/RyBARCj6WZRtglOu; 4:Ws8UdtU0LLMWYKmedyJy5Hwxk5+/xFamoUGEneDMtKVX9mk1fDoh08tJw7Db0UWuqmjWt8s0ZOks7witNtfplKdh6CYkgRTBSQAZpYTNXApekl0wW3hQRhagBxs6txukyzCRGHG3MrZxbLctu4V2J9SpH/rii4GpKLn17UMQOtp0ggT4aD9nIo3VahWvYFf1N4aNe+6s7HOVEExJDHLaEgk86QA9iLGaziCD7uyU1y/Ku55ChDNnzA/0qKw5zjjhLekOV23yYrtPJrEk/I4uJfVdCvo/VWDuZIsjS/52OL40RDrdyGP78w5+LYyKnYSu+BFTPQTaEq2YvB6nIq0a7ua9pxNjyFR9/GzzZVVeyjGt4kWpKhh/EpfpT/c9d4pG 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)(3231355)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051); SRVR:DB5PR04MB1528; BCL:0; PCL:0; RULEID:; SRVR:DB5PR04MB1528; X-Forefront-PRVS: 0809C12563 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(136003)(376002)(39860400002)(346002)(396003)(366004)(189003)(199004)(386003)(6506007)(7736002)(186003)(6512007)(305945005)(36756003)(11346002)(6306002)(97736004)(6486002)(956004)(52116002)(76176011)(5660300001)(34290500001)(68736007)(50466002)(23676004)(81166006)(81156014)(446003)(8676002)(50226002)(8936002)(47776003)(105586002)(6116002)(3846002)(26005)(16526019)(106356001)(53936002)(66066001)(316002)(55236004)(1076002)(4326008)(2616005)(72206003)(478600001)(25786009)(476003)(86362001)(5009440100003)(2870700001)(6666003)(486006)(2906002)(110426005)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR04MB1528; H:Tophie.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BDB5PR04MB1528=3B23=3AaJAC?= =?utf-8?q?IqGQbeWYWj+MHKPF6ZXen0d4PDJSsrUov8EHZcotQbHhl9ORrAUF5Tex?= =?utf-8?q?WsbJkyPHdfQpxWt9SZf6PeaIzKxqe39QOFDYLSk9HvKC1HQwr65t7MQg?= =?utf-8?q?4VnhMl9UpHRm6JPwiu0/x7Q1GPkReRgLR7j5nNI48aATcdjGI4GK7+ql?= =?utf-8?q?KB+ua6R7geq1aJuZs21VRJLP3M/OpwWziKI6A35B5ZxWFBla04rsnzCj?= =?utf-8?q?1VGJftoXcF0Ly7aQw9Po1r8jTpYCWK2a/peTdCs+Ecz1o/vZ2l5zGYCw?= =?utf-8?q?8+bBJaBMzA1MoKFukh0xvw4DqLdP9x0A/81fBTIT4mPe+7w3ZiNGSzzc?= =?utf-8?q?pb8nQ/E26Yvq+5KYEw6+ncw1QCghGITwcCwMkelkHAdS4gkf1p4oqmR1?= =?utf-8?q?o5uOWOV4ds+MteIAUX14On0m5+CpGzJmQnb6WtPvOV0G1gk9IIaPQnce?= =?utf-8?q?VujjMLSTit6J1ghQgykNVOp7Qj6sPwjPj7inf3vuSXrqLCkPM9fjp6i/?= =?utf-8?q?bNYdTlxUH2lUOk0h7VfGt4EjiPB2ana4xZGTmSvGUhc24HYSSmWotGZG?= =?utf-8?q?E5+uQEbGVexMRQqupLOkx8SK965/hbA4e8L7339UuL4Jw3amUiWcgye+?= =?utf-8?q?veqtfE9pQ6ugKV0zzx++EVprL4gE4Qzp4meYbsRMfcj/HV3UkUcXy6qK?= =?utf-8?q?/vpUYRESNCoSFYxez50RXQvJztX7ekR+F0fmrSFaRqg0GrME1XZo2hRm?= =?utf-8?q?VBliBZQWrfjbjofAFpGEdjUlIBcSQS4Q1cM9OfmL21cLb/Af2NzQ7g/C?= =?utf-8?q?9oweIX490RkTcfvYz1VckRMycir/3Zh2JjcYxpa9J4Ny3XMDcrj5khyI?= =?utf-8?q?2iksrFo8TllVudpv6u2eU8+EyGeUB3G+O07oHE8JoY7mmzyTVt+IMsYo?= =?utf-8?q?FkE5Kus3zqzB15lGdrJ3OkQKdeLXjz3/mvlP9pICX1XfhtFiDbrBlESS?= =?utf-8?q?uQSpcSqSVQZzEyBvzLm9VXHnpbBZFRrXbyVezRkRXi1FVE+AVrtTWPqM?= =?utf-8?q?2iflN/VWGGz6a8/ZuLxMabAlw503nkBCjYBAYzuTZq9taWa6puCErrJm?= =?utf-8?q?y2uXVGJILz9ExeZHi3oG5Vmhd5vlM5RtWyCqtBV0XEf0cJ1V6duaV57L?= =?utf-8?q?EubP1fUcknzqkJyAIoX+P851Oz30QmgJdPEVTzjp81kArLF4QTeKHyDk?= =?utf-8?q?JIkS3tlXAlGvr+DNk5er/9L5WqiGXg4B6WW48/QwTljZt0Z8dSN0MFCQ?= =?utf-8?q?FrWmJoiPj4JM4X5I3Uob1M/MlccO/NilZ02sszAttrbCXMQuGN3ZCFs7?= =?utf-8?q?Rbil2Nlg0vr5S1vEupdxd0k1MfiirzBz3hBaeSkayYw5oBgPDXGNeW5t?= =?utf-8?q?ks7flvVAv0o3FTzB+46X+1Nq+1P9HsWp8tDhUBm52AL5Cu8an0zMYUfH?= =?utf-8?q?Dzl4?= X-Microsoft-Antispam-Message-Info: zhi+94+smYNWnOONZYZ9cmPwGhsgZcaOnNPDMg+xcQIjNC9xcgCiU+4ePhUHH/oKxFbjYiSyNvg0GT6hC5P/CLjTUddsp6kW7+2P+AXycDRiZ0HNUOZ3+hx6NqouVQlQ/n+nDQQmeurzrqeh8qjaqH+9HXxF6Mq//ui6tPE4R0b0hW9qkl28/HfF/XwMqXpGj05UzbZWlHJMcE4Z2KawlsccZYB5gI7l709wqUMLAik58hEcBwxsWsr1q3K6Gi5EPEmQxd8aliriFZvAmb2jkkHsyYnmZyPXdUsA0+cUrSiHUgXUv6arqc7Ek3yRrHiIXSkFEohnHy6rcFEme/NrFV+68T6GGbKeIS31Tb9ZU/g= X-Microsoft-Exchange-Diagnostics: 1; DB5PR04MB1528; 6:ScXjGXezM6nbl2x4W12JrmuX/MVSfCwm121Vrre7qaEi8iZd1RYvhmDoceeme++X7r+o0ezoaomyf6KDXfTDkD40dz1a/TKdtXvJWFOAwEI2UW4DEbVv/dql2pPxsmMtTFVyskoWpQAB7z4K/a295txFMeniachek13p0TYk4BAVgFcSBX+/WHDZED2UlszZegQNcfRQ53remRe3J6m3TG8E5TPBD18aH6PiUXl4gVYS8Edh1dp8IXE0mLBUpB+Ire1/g7HkhDxvjTyFiySkFM1UHM1dETyYXsYIQIudEPbCRFjQVOJT5ce/gJ9T8kQf4W8VDLduQTqvS3yoCa7DHZz4FMrPI4b7zU/O5GbNoZPHUXCuo7Zlb+YldlYKkXI3UEMwoOpk89VSJbyxpEedCKus0aOykQ7GeTAKRSKl4nKjeHuF68kuivlLOqVIzeFfEO8JqNmm4tZ+dZtjlqnmGQ==; 5:B24PhoNdNoAS3o5JY4Gibp3ys/9cKnc/iNGNE2nyXJFHFuwyTdNNsqXol+rHm21rl3Tho9foAIhThPrGqednyxoCZI1zuwumBcN/oN+V9tN10wxws915csLgJxa+SW0A44kCceI57PGXlVdO9ENovs2SqgDKnmlWH5JivVVXCuY=; 7:2MxxzMkKLujEPp/vadQjCEXlanyOART4wRwb6a7r0hVEETUeOf3cK9smV4KdYZPzLzmAUNZCZTEQRNSL++tFwvgjgICnNdl81IVmI3nZbhul/RWfKhyKzCXyKwGECs4vWHyYf58Gd/HfEx1fRvRzFabPnMl4AVyrEB/CelG8IGi7fpuWfk2qEHCVs49z8JAUn6QEHvUNu39nYSqfX3GCLh3XBLJEDXzVEvEqwniIvAvuJgINPC2TndXQkT5M6jRJ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2018 07:46:38.6017 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eaa4c525-32f0-43a1-4635-08d62516869f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR04MB1528 Subject: [dpdk-dev] [PATCH v4 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 | 7 ++ doc/guides/nics/enetc.rst | 110 +++++++++++++++++++++++++ doc/guides/nics/features/enetc.ini | 11 +++ doc/guides/nics/index.rst | 1 + doc/guides/rel_notes/release_18_11.rst | 6 ++ 5 files changed, 135 insertions(+) create mode 100644 doc/guides/nics/enetc.rst create mode 100644 doc/guides/nics/features/enetc.ini diff --git a/MAINTAINERS b/MAINTAINERS index 9fd258fad..b67f2afa4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -643,6 +643,13 @@ 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/enetc.rst +F: doc/guides/nics/features/enetc.ini + QLogic bnx2x M: Harish Patil M: Rasesh Mody 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 new file mode 100644 index 000000000..69476a2a1 --- /dev/null +++ b/doc/guides/nics/features/enetc.ini @@ -0,0 +1,11 @@ +; +; Supported features of the 'enetc' network poll mode driver. +; +; 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 +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..f4a2535f4 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. ========================================================= @@ -156,6 +161,7 @@ The libraries prepended with a plus sign were incremented in this version. librte_pmd_ixgbe.so.2 librte_pmd_dpaa2_cmdif.so.1 librte_pmd_dpaa2_qdma.so.1 + + librte_pmd_enetc.so.1 librte_pmd_ring.so.2 librte_pmd_softnic.so.1 librte_pmd_vhost.so.2