Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/133565/?format=api
{ "id": 133565, "url": "http://patches.dpdk.org/api/patches/133565/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20231028065315.1937188-11-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20231028065315.1937188-11-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231028065315.1937188-11-chaoyong.he@corigine.com", "date": "2023-10-28T06:53:14", "name": "[v2,10/11] net/nfp: extract a helper function", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "85bafbdfd277bd65446c1a0b27799b0ccab8e761", "submitter": { "id": 2554, "url": "http://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20231028065315.1937188-11-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 30041, "url": "http://patches.dpdk.org/api/series/30041/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=30041", "date": "2023-10-28T06:53:04", "name": "Clean up NFP PMD", "version": 2, "mbox": "http://patches.dpdk.org/series/30041/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/133565/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/133565/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 8502943220;\n\tSat, 28 Oct 2023 08:54:51 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id BA96442D87;\n\tSat, 28 Oct 2023 08:54:07 +0200 (CEST)", "from NAM04-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam04on2102.outbound.protection.outlook.com [40.107.101.102])\n by mails.dpdk.org (Postfix) with ESMTP id E41B642D6B\n for <dev@dpdk.org>; Sat, 28 Oct 2023 08:54:05 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by SA1PR13MB6055.namprd13.prod.outlook.com (2603:10b6:806:338::20)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19; Sat, 28 Oct\n 2023 06:54:04 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.6933.022; Sat, 28 Oct 2023\n 06:54:04 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=KNxDf9CF+pFOWuL1zdlTKku/GLP1hHjb1zCEGV4vK8XZu+GZ9iofbLygMWN/iuHQMtXQFy31QMcV8QGwCd6x9Iijmm2uhXNEEeI4wQmq40jtlv5nI8DTgMg/2uYsK47GB+whwMZccguYDIP9mVdlIFUUEhD7H4yFmUZtXPmFFRrerbCw3aP+u6ThH8pqR0uQt6NrSZwt9rB0KSrg0iaD6ydym1dfwEI2OGrTlnNEiyQfEO/R1rqApGTcDqVcywq9JikvY97KVtqylNiiSZFIzHUv3Y34AVOg5zKtoeZvf7izAH8R47yO3c2gLXX5m0t27DEyJOCJPkL1uTd3eGFsNA==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=2e51H7JoQoEzlMRoT5HsIny0WqMvE6GB9BdW0jP3Ns0=;\n b=bDfEMbfuMBE6h63k14UlrDLYDKie24ByN+h4D2DrfvnckQrG6+fFCPpL7hYyfn/gesbWq2p3b5Xb984hxjWJWc/lQAAaJaztItnjKWB5UsdD9jaCMdfJaqLsbjdMOsw3MW73UNpSNx11+IxR66jLf7znsQYnJjlQAzIWFTYWvhPxnrdqU3uuu6eH1GfYRQFQLGNWUxQ/B1lY7ms17qEbEd7fJRKKOFg9H7I52W8NQrWFOKrl7aXc3Apff7ls2kQ4O3mTzC/9cm1ILcDj+BZACj0v4YewcqxMEeZ7UNoyk1Zi6QPfHzlMXmm8JzuE0D3APZouLviXidNiCn1Wkzo2yA==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com;\n dkim=pass header.d=corigine.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=2e51H7JoQoEzlMRoT5HsIny0WqMvE6GB9BdW0jP3Ns0=;\n b=mHugcdFvYr6WS3kMNLiH8BFs8gidrM6atyfaqgSu8QKhPq6W+VedVMrun4iijZVl/FYaWplfTiY4994YJYePGFtIH6IVLxsLriiNa4xEJoSICyymxGYVmpONVs11KKjxKUXcNnLpo9sutJfDlvuV2L94lbi6zwqVS6oTTIpBWAk=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=corigine.com;", "From": "Chaoyong He <chaoyong.he@corigine.com>", "To": "dev@dpdk.org", "Cc": "oss-drivers@corigine.com, Chaoyong He <chaoyong.he@corigine.com>,\n Peng Zhang <peng.zhang@corigine.com>", "Subject": "[PATCH v2 10/11] net/nfp: extract a helper function", "Date": "Sat, 28 Oct 2023 14:53:14 +0800", "Message-Id": "<20231028065315.1937188-11-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20231028065315.1937188-1-chaoyong.he@corigine.com>", "References": "<20231028061558.1842855-1-chaoyong.he@corigine.com>\n <20231028065315.1937188-1-chaoyong.he@corigine.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "SA0PR11CA0020.namprd11.prod.outlook.com\n (2603:10b6:806:d3::25) To SJ0PR13MB5545.namprd13.prod.outlook.com\n (2603:10b6:a03:424::5)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "SJ0PR13MB5545:EE_|SA1PR13MB6055:EE_", "X-MS-Office365-Filtering-Correlation-Id": "45b64c5b-0ffd-486a-96ae-08dbd782ac20", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n 3SWlv5nYJsJr8u9p7H+WN0Ij8ZFlkcOzzhhgQfnnCGn2fZigLYIAKHXsQRroSGWn3WUxsOqeQMTXFxgaTNlnXVlxzyyDQ93fQ0QLuy08AGFdAc24dRCAQGh49ReZ3N4lWAe9EGmLEYvhFIKYTPjusQMhHs+H7KLUJ5LzRvkjZlK4+glaLUwVAPdh7RW6TwkpAW3L11fxxTPYLcNAQxL+JLd741nGs0AAJONE2kXRFxKBAB6r7i83u5uvuAcIZXfqAs8U6cA/E2ty1fzUd9Otlur/1l4zAG7g2XVCjLGaCrCjyjXyPMu1/W3WyVCXg0P8XtdBE1VNhYjlGOYGfQdFsQElrd324F/e5e/Um5NpbIi6g4s1s3GwF0s2r74OPTyZlPznxdWK2QRw6X7LFqPF4MCdZChLxAEFb+H12f/yHbRhj9fgKs/eFCxr5r0Zal5PG5/BImdUXf064Wucmrxn1Gmkr0QZCTIKcEdqEzucJJvIQuV9ep+iBPhS7NwabH72OcYJzoznRI5wHTbLTrcxvTrEbcv0NibpdUXQfdlypbbazoXUisz3Gk0Pz8UYI7pH1wT5GiT8H+eaj1WyxbJP8AXYRC936CYTTDnOpDDrdsPvtNSOCNdgiGpP8qarH1A8bdszBCwtCWtMIRfk6+R9FzwhRyC0vlyze2R9g8Kt1kQ=", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230031)(346002)(136003)(396003)(366004)(39830400003)(376002)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(6486002)(8676002)(30864003)(8936002)(478600001)(6666004)(54906003)(66476007)(66946007)(66556008)(86362001)(4326008)(41300700001)(5660300002)(6916009)(2906002)(44832011)(316002)(6506007)(52116002)(38100700002)(36756003)(2616005)(1076003)(107886003)(6512007)(26005)(38350700005)(83380400001);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n Ty9VVfEqfXQRWhZtSj5EOOZknGIwlF+2NNcaf4njFZEhSWOimtR6ku1XEBYiN+bZ4G0kloucLQDf0sN5GJwM1PkAT5S2Bycl/mricVNvE6Abi25xxkW6ApF2suDKL5xUL7X03icX3qYJS91SQp04VVuBCYmjr3tW3R+ZpdcrCnt4D60EpZT+aZcSsKK+dGMs/NSeqLTXKUnB8rbTsZJz09UwjjqBSDsbHXyY6RKw8GTBH+6Fknyr+AnwJHS71YOfHXWOSQU68xjl03qshMmQ0XDlB904TpR4T+GIxELBLcDToq/b5e65EUMQr7lpWYE++wHWV2vkPKX8c9IzLzFRpSAO425zGFHlv61YCZyfjCZS1tDzDon9QoqR1AkRfqnfbGmgMbNHm1s5wbHzeoj88EQ/4YXADAfx1GELbpWFEf/6BExZm4tVDR+hrgue14QvMwGe1Fga3dIXij/nZ8Omny7Gc5rGKqRt2QvPpuI2FvAMNolIwnDBKh/MZ2pRFoD6fqRHa7OYZuLNdfBYigORTJtjhblj5q8pR2/0P5UvdbopGwgz93c44hlKEsRuAKPd1mNTKMVdSFFi8xHyIKl3pZNTUXvpZNBspQsomSN/SMAwGU28i0lT7MiY+ALAJR9RxNYdzi0AnJjSACWSJQrf9apjYB26hg56Wq4KrXPcSdys7UboJ+iioviC2e8W8KQdHP5K6W3XGB35fXJFgEhkIlG4Xq51rckgJm3gozO0Sro6Geg0iyG7Uyd/ZdkieEHaqGqmMutJKZ4KJqG7gVMzTps+ZzwUOFaEIjyV1cvR8Ltt6QV2GUyOkuWzhNrXvzbx+8aL2uEdrGtaxXDIoEcrei1HrspNZu0no1V1yITtLFkuPoMTltvJ6lLdx7xCuLitjEqUbo5/5nbwOz5frm/RAWdqvmhuQjkU2vDGQ8ZtuPhRZ+rX+hvIhQliu8DgcOSI+byuoL7XbvvwJ8bIF8Ex5uO4bKzRxFue2tD5vU+hhehtgzmTRKICL2lKn5BQgaX/Dpno1lHz2c1jYayUVr/1v2lfMtUB9P5oPj5FIZkmV3JL9D8IByLT53lVUb7WWaKDogxzDeEAFbTwWiDeWPhTAfoFuIPsFApnDOy1n+RILODRzCI4WAYDRkYsiRUQVBnLDfps8yIGot4a/LIsvkQ52STertTvI+Bhtd6jWBTynJyxh/Dk6TiErTajVx33IX+tUKH0L+4SIwopVNJFK8qg7dTw2fR/C4sFr9TQkbghvrv4EPPNtpo8TQkbfjMD5KzoBrWTSj5WzD7oJBCme/2U+ostIRJ9t5jdXLJOS4RhKlQeebsbgp6uMK0rHW2ux8ISfnfBmFHZwLRGTG4/PkuNavKrCJSN3+2Olzt+6sHDES3APW6+k99shHfI88AUUd0IgUvrQI0yWtPA4dseWU6cF4eFVc7J+PPTms8QcT2g+M+Vmm1KQ5cnP6cldeyePV0TmzKQWij/B6rv1HoR0ymwZiqo2jMR8WbilfK65r8AxWBseiW4ReYoX/lKP6WpJ/A0U8OsZOOVlwTNp1VUpEkkUOyHiTsFx5qCYCe0K/S5RR446abT8BWjxNcYJ4+TSinKYk1mHcFlCYwUtVIZld2p+g==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 45b64c5b-0ffd-486a-96ae-08dbd782ac20", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "28 Oct 2023 06:54:04.0356 (UTC)", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "fe128f2c-073b-4c20-818e-7246a585940c", "X-MS-Exchange-CrossTenant-MailboxType": "HOSTED", "X-MS-Exchange-CrossTenant-UserPrincipalName": "\n 8eMYNgnzhQ/d0tC5XSU4049f9lhUS+i+MF0lvbKmojx6AySuwjJZxj0Xwb1Yo62y/yEHz1e+TcEqW7hcJvN6w6zNErRqx+qDbAfB8lrcoNo=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "SA1PR13MB6055", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Extract a helper function to get the pointer of 'struct nfp_net_hw' for\nboth normal port and representor pot, this will make the operation\nfunction can be used for both type port.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Peng Zhang <peng.zhang@corigine.com>\n---\n drivers/net/nfp/flower/nfp_flower.c | 64 ++-----------------------\n drivers/net/nfp/nfp_net_common.c | 74 ++++++++++++++++-------------\n drivers/net/nfp/nfp_net_common.h | 1 +\n 3 files changed, 47 insertions(+), 92 deletions(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c\nindex 246dd2d454..0727e7fd9f 100644\n--- a/drivers/net/nfp/flower/nfp_flower.c\n+++ b/drivers/net/nfp/flower/nfp_flower.c\n@@ -21,62 +21,6 @@\n \n #define CTRL_VNIC_NB_DESC 512\n \n-static void\n-nfp_pf_repr_enable_queues(struct rte_eth_dev *dev)\n-{\n-\tuint16_t i;\n-\tstruct nfp_hw *hw;\n-\tuint64_t enabled_queues = 0;\n-\tstruct nfp_flower_representor *repr;\n-\n-\trepr = dev->data->dev_private;\n-\thw = &repr->app_fw_flower->pf_hw->super;\n-\n-\t/* Enabling the required TX queues in the device */\n-\tfor (i = 0; i < dev->data->nb_tx_queues; i++)\n-\t\tenabled_queues |= (1 << i);\n-\n-\tnn_cfg_writeq(hw, NFP_NET_CFG_TXRS_ENABLE, enabled_queues);\n-\n-\tenabled_queues = 0;\n-\n-\t/* Enabling the required RX queues in the device */\n-\tfor (i = 0; i < dev->data->nb_rx_queues; i++)\n-\t\tenabled_queues |= (1 << i);\n-\n-\tnn_cfg_writeq(hw, NFP_NET_CFG_RXRS_ENABLE, enabled_queues);\n-}\n-\n-static void\n-nfp_pf_repr_disable_queues(struct rte_eth_dev *dev)\n-{\n-\tuint32_t update;\n-\tuint32_t new_ctrl;\n-\tstruct nfp_hw *hw;\n-\tstruct nfp_net_hw *net_hw;\n-\tstruct nfp_flower_representor *repr;\n-\n-\trepr = dev->data->dev_private;\n-\tnet_hw = repr->app_fw_flower->pf_hw;\n-\thw = &net_hw->super;\n-\n-\tnn_cfg_writeq(hw, NFP_NET_CFG_TXRS_ENABLE, 0);\n-\tnn_cfg_writeq(hw, NFP_NET_CFG_RXRS_ENABLE, 0);\n-\n-\tnew_ctrl = hw->ctrl & ~NFP_NET_CFG_CTRL_ENABLE;\n-\tupdate = NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING |\n-\t\t\tNFP_NET_CFG_UPDATE_MSIX;\n-\n-\tif (hw->cap & NFP_NET_CFG_CTRL_RINGCFG)\n-\t\tnew_ctrl &= ~NFP_NET_CFG_CTRL_RINGCFG;\n-\n-\t/* If an error when reconfig we avoid to change hw state */\n-\tif (nfp_reconfig(hw, new_ctrl, update) < 0)\n-\t\treturn;\n-\n-\thw->ctrl = new_ctrl;\n-}\n-\n int\n nfp_flower_pf_start(struct rte_eth_dev *dev)\n {\n@@ -93,10 +37,10 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)\n \thw = &net_hw->super;\n \n \t/* Disabling queues just in case... */\n-\tnfp_pf_repr_disable_queues(dev);\n+\tnfp_net_disable_queues(dev);\n \n \t/* Enabling the required queues in the device */\n-\tnfp_pf_repr_enable_queues(dev);\n+\tnfp_net_enable_queues(dev);\n \n \tnew_ctrl = nfp_check_offloads(dev);\n \n@@ -157,7 +101,7 @@ nfp_flower_pf_stop(struct rte_eth_dev *dev)\n \trepr = dev->data->dev_private;\n \thw = repr->app_fw_flower->pf_hw;\n \n-\tnfp_pf_repr_disable_queues(dev);\n+\tnfp_net_disable_queues(dev);\n \n \t/* Clear queues */\n \tfor (i = 0; i < dev->data->nb_tx_queues; i++) {\n@@ -207,7 +151,7 @@ nfp_flower_pf_close(struct rte_eth_dev *dev)\n \t * We assume that the DPDK application is stopping all the\n \t * threads/queues before calling the device close function.\n \t */\n-\tnfp_pf_repr_disable_queues(dev);\n+\tnfp_net_disable_queues(dev);\n \n \t/* Clear queues */\n \tfor (i = 0; i < dev->data->nb_tx_queues; i++) {\ndiff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c\nindex d43a071a42..1be0d7d060 100644\n--- a/drivers/net/nfp/nfp_net_common.c\n+++ b/drivers/net/nfp/nfp_net_common.c\n@@ -233,6 +233,22 @@ nfp_net_mbox_reconfig(struct nfp_net_hw *net_hw,\n \treturn nn_cfg_readl(&net_hw->super, mbox + NFP_NET_CFG_MBOX_SIMPLE_RET);\n }\n \n+struct nfp_net_hw *\n+nfp_net_get_hw(const struct rte_eth_dev *dev)\n+{\n+\tstruct nfp_net_hw *hw;\n+\n+\tif ((dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) != 0) {\n+\t\tstruct nfp_flower_representor *repr;\n+\t\trepr = dev->data->dev_private;\n+\t\thw = repr->app_fw_flower->pf_hw;\n+\t} else {\n+\t\thw = dev->data->dev_private;\n+\t}\n+\n+\treturn hw;\n+}\n+\n /*\n * Configure an Ethernet device.\n *\n@@ -252,7 +268,7 @@ nfp_net_configure(struct rte_eth_dev *dev)\n \tstruct rte_eth_rxmode *rxmode;\n \tstruct rte_eth_txmode *txmode;\n \n-\thw = dev->data->dev_private;\n+\thw = nfp_net_get_hw(dev);\n \tdev_conf = &dev->data->dev_conf;\n \trxmode = &dev_conf->rxmode;\n \ttxmode = &dev_conf->txmode;\n@@ -329,7 +345,7 @@ nfp_net_enable_queues(struct rte_eth_dev *dev)\n {\n \tstruct nfp_net_hw *hw;\n \n-\thw = dev->data->dev_private;\n+\thw = nfp_net_get_hw(dev);\n \n \tnfp_enable_queues(&hw->super, dev->data->nb_rx_queues,\n \t\t\tdev->data->nb_tx_queues);\n@@ -340,7 +356,7 @@ nfp_net_disable_queues(struct rte_eth_dev *dev)\n {\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = dev->data->dev_private;\n+\tnet_hw = nfp_net_get_hw(dev);\n \n \tnfp_disable_queues(&net_hw->super);\n }\n@@ -367,7 +383,7 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev,\n \tstruct nfp_hw *hw;\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = dev->data->dev_private;\n+\tnet_hw = nfp_net_get_hw(dev);\n \thw = &net_hw->super;\n \tif ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&\n \t\t\t(hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0) {\n@@ -407,7 +423,7 @@ nfp_configure_rx_interrupt(struct rte_eth_dev *dev,\n \t\treturn -ENOMEM;\n \t}\n \n-\thw = dev->data->dev_private;\n+\thw = nfp_net_get_hw(dev);\n \n \tif (rte_intr_type_get(intr_handle) == RTE_INTR_HANDLE_UIO) {\n \t\tPMD_DRV_LOG(INFO, \"VF: enabling RX interrupt with UIO\");\n@@ -443,7 +459,7 @@ nfp_check_offloads(struct rte_eth_dev *dev)\n \tstruct nfp_net_hw *hw;\n \tstruct rte_eth_conf *dev_conf;\n \n-\thw = dev->data->dev_private;\n+\thw = nfp_net_get_hw(dev);\n \tcap = hw->super.cap;\n \n \tdev_conf = &dev->data->dev_conf;\n@@ -510,14 +526,8 @@ nfp_net_promisc_enable(struct rte_eth_dev *dev)\n \tuint32_t new_ctrl;\n \tstruct nfp_hw *hw;\n \tstruct nfp_net_hw *net_hw;\n-\tstruct nfp_flower_representor *repr;\n \n-\tif ((dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) != 0) {\n-\t\trepr = dev->data->dev_private;\n-\t\tnet_hw = repr->app_fw_flower->pf_hw;\n-\t} else {\n-\t\tnet_hw = dev->data->dev_private;\n-\t}\n+\tnet_hw = nfp_net_get_hw(dev);\n \n \thw = &net_hw->super;\n \tif ((hw->cap & NFP_NET_CFG_CTRL_PROMISC) == 0) {\n@@ -551,7 +561,7 @@ nfp_net_promisc_disable(struct rte_eth_dev *dev)\n \tstruct nfp_hw *hw;\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = dev->data->dev_private;\n+\tnet_hw = nfp_net_get_hw(dev);\n \thw = &net_hw->super;\n \n \tif ((hw->ctrl & NFP_NET_CFG_CTRL_PROMISC) == 0) {\n@@ -588,7 +598,7 @@ nfp_net_link_update(struct rte_eth_dev *dev,\n \tstruct rte_eth_link link;\n \tstruct nfp_eth_table *nfp_eth_table;\n \n-\thw = dev->data->dev_private;\n+\thw = nfp_net_get_hw(dev);\n \n \tmemset(&link, 0, sizeof(struct rte_eth_link));\n \n@@ -654,7 +664,7 @@ nfp_net_stats_get(struct rte_eth_dev *dev,\n \tif (stats == NULL)\n \t\treturn -EINVAL;\n \n-\thw = dev->data->dev_private;\n+\thw = nfp_net_get_hw(dev);\n \n \tmemset(&nfp_dev_stats, 0, sizeof(nfp_dev_stats));\n \n@@ -732,7 +742,7 @@ nfp_net_stats_reset(struct rte_eth_dev *dev)\n \tuint16_t i;\n \tstruct nfp_net_hw *hw;\n \n-\thw = dev->data->dev_private;\n+\thw = nfp_net_get_hw(dev);\n \n \t/* Reading per RX ring stats */\n \tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n@@ -794,7 +804,7 @@ nfp_net_xstats_size(const struct rte_eth_dev *dev)\n \tconst uint32_t size = RTE_DIM(nfp_net_xstats);\n \n \t/* If the device is a VF, then there will be no MAC stats */\n-\thw = dev->data->dev_private;\n+\thw = nfp_net_get_hw(dev);\n \tif (hw->mac_stats == NULL) {\n \t\tfor (count = 0; count < size; count++) {\n \t\t\tif (nfp_net_xstats[count].group == NFP_XSTAT_GROUP_MAC)\n@@ -828,7 +838,7 @@ nfp_net_xstats_value(const struct rte_eth_dev *dev,\n \tstruct nfp_net_hw *hw;\n \tstruct nfp_xstat xstat;\n \n-\thw = dev->data->dev_private;\n+\thw = nfp_net_get_hw(dev);\n \txstat = nfp_net_xstats[index];\n \n \tif (xstat.group == NFP_XSTAT_GROUP_MAC)\n@@ -967,7 +977,7 @@ nfp_net_xstats_reset(struct rte_eth_dev *dev)\n \tuint32_t read_size;\n \tstruct nfp_net_hw *hw;\n \n-\thw = dev->data->dev_private;\n+\thw = nfp_net_get_hw(dev);\n \tread_size = nfp_net_xstats_size(dev);\n \n \tfor (id = 0; id < read_size; id++) {\n@@ -1015,7 +1025,7 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \tuint16_t max_tx_desc;\n \tstruct nfp_net_hw *hw;\n \n-\thw = dev->data->dev_private;\n+\thw = nfp_net_get_hw(dev);\n \n \tnfp_net_rx_desc_limits(hw, &min_rx_desc, &max_rx_desc);\n \tnfp_net_tx_desc_limits(hw, &min_tx_desc, &max_tx_desc);\n@@ -1242,7 +1252,7 @@ nfp_rx_queue_intr_enable(struct rte_eth_dev *dev,\n \t/* Make sure all updates are written before un-masking */\n \trte_wmb();\n \n-\thw = dev->data->dev_private;\n+\thw = nfp_net_get_hw(dev);\n \tnn_cfg_writeb(&hw->super, NFP_NET_CFG_ICR(base + queue_id),\n \t\t\tNFP_NET_CFG_ICR_UNMASKED);\n \treturn 0;\n@@ -1263,7 +1273,7 @@ nfp_rx_queue_intr_disable(struct rte_eth_dev *dev,\n \t/* Make sure all updates are written before un-masking */\n \trte_wmb();\n \n-\thw = dev->data->dev_private;\n+\thw = nfp_net_get_hw(dev);\n \tnn_cfg_writeb(&hw->super, NFP_NET_CFG_ICR(base + queue_id), NFP_NET_CFG_ICR_RXTX);\n \n \treturn 0;\n@@ -1301,7 +1311,7 @@ nfp_net_irq_unmask(struct rte_eth_dev *dev)\n \tstruct nfp_net_hw *hw;\n \tstruct rte_pci_device *pci_dev;\n \n-\thw = dev->data->dev_private;\n+\thw = nfp_net_get_hw(dev);\n \tpci_dev = RTE_ETH_DEV_TO_PCI(dev);\n \n \t/* Make sure all updates are written before un-masking */\n@@ -1376,7 +1386,7 @@ nfp_net_dev_mtu_set(struct rte_eth_dev *dev,\n {\n \tstruct nfp_net_hw *hw;\n \n-\thw = dev->data->dev_private;\n+\thw = nfp_net_get_hw(dev);\n \n \t/* MTU setting is forbidden if port is started */\n \tif (dev->data->dev_started) {\n@@ -1412,7 +1422,7 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev,\n \tstruct nfp_net_hw *net_hw;\n \tuint32_t rxvlan_ctrl = 0;\n \n-\tnet_hw = dev->data->dev_private;\n+\tnet_hw = nfp_net_get_hw(dev);\n \thw = &net_hw->super;\n \trx_offload = dev->data->dev_conf.rxmode.offloads;\n \tnew_ctrl = hw->ctrl;\n@@ -1462,7 +1472,7 @@ nfp_net_rss_reta_write(struct rte_eth_dev *dev,\n \tstruct nfp_hw *hw;\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = dev->data->dev_private;\n+\tnet_hw = nfp_net_get_hw(dev);\n \thw = &net_hw->super;\n \n \tif (reta_size != NFP_NET_CFG_RSS_ITBL_SZ) {\n@@ -1518,7 +1528,7 @@ nfp_net_reta_update(struct rte_eth_dev *dev,\n \tstruct nfp_hw *hw;\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = dev->data->dev_private;\n+\tnet_hw = nfp_net_get_hw(dev);\n \thw = &net_hw->super;\n \n \tif ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)\n@@ -1551,7 +1561,7 @@ nfp_net_reta_query(struct rte_eth_dev *dev,\n \tstruct nfp_hw *hw;\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = dev->data->dev_private;\n+\tnet_hw = nfp_net_get_hw(dev);\n \thw = &net_hw->super;\n \n \tif ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)\n@@ -1601,7 +1611,7 @@ nfp_net_rss_hash_write(struct rte_eth_dev *dev,\n \tstruct nfp_net_hw *net_hw;\n \tuint32_t cfg_rss_ctrl = 0;\n \n-\tnet_hw = dev->data->dev_private;\n+\tnet_hw = nfp_net_get_hw(dev);\n \thw = &net_hw->super;\n \n \t/* Writing the key byte by byte */\n@@ -1657,7 +1667,7 @@ nfp_net_rss_hash_update(struct rte_eth_dev *dev,\n \tstruct nfp_hw *hw;\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = dev->data->dev_private;\n+\tnet_hw = nfp_net_get_hw(dev);\n \thw = &net_hw->super;\n \n \trss_hf = rss_conf->rss_hf;\n@@ -1698,7 +1708,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,\n \tuint32_t cfg_rss_ctrl;\n \tstruct nfp_net_hw *net_hw;\n \n-\tnet_hw = dev->data->dev_private;\n+\tnet_hw = nfp_net_get_hw(dev);\n \thw = &net_hw->super;\n \n \tif ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)\ndiff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h\nindex 829e9c5333..e242251bc2 100644\n--- a/drivers/net/nfp/nfp_net_common.h\n+++ b/drivers/net/nfp/nfp_net_common.h\n@@ -237,6 +237,7 @@ void nfp_net_cfg_read_version(struct nfp_net_hw *hw);\n int nfp_net_firmware_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size);\n int nfp_repr_firmware_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size);\n bool nfp_net_is_valid_nfd_version(struct nfp_net_fw_ver version);\n+struct nfp_net_hw *nfp_net_get_hw(const struct rte_eth_dev *dev);\n \n #define NFP_PRIV_TO_APP_FW_NIC(app_fw_priv)\\\n \t((struct nfp_app_fw_nic *)app_fw_priv)\n", "prefixes": [ "v2", "10/11" ] }