Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/132698/?format=api
{ "id": 132698, "url": "https://patches.dpdk.org/api/patches/132698/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20231017054545.1692509-9-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20231017054545.1692509-9-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231017054545.1692509-9-chaoyong.he@corigine.com", "date": "2023-10-17T05:45:28", "name": "[08/25] net/nfp: extract the ctrl data field", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "0f6720928e2046c989bfb5cf28b044da218dd5ca", "submitter": { "id": 2554, "url": "https://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20231017054545.1692509-9-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29865, "url": "https://patches.dpdk.org/api/series/29865/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=29865", "date": "2023-10-17T05:45:20", "name": "add the NFP vDPA PMD", "version": 1, "mbox": "https://patches.dpdk.org/series/29865/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/132698/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/132698/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 161CA43186;\n\tTue, 17 Oct 2023 07:47:16 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 37E99410FD;\n\tTue, 17 Oct 2023 07:46:32 +0200 (CEST)", "from NAM12-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam12on2138.outbound.protection.outlook.com [40.107.244.138])\n by mails.dpdk.org (Postfix) with ESMTP id 6AB59410D0\n for <dev@dpdk.org>; Tue, 17 Oct 2023 07:46:29 +0200 (CEST)", "from PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16)\n by MW5PR13MB5904.namprd13.prod.outlook.com (2603:10b6:303:1ce::13)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.45; Tue, 17 Oct\n 2023 05:46:27 +0000", "from PH0PR13MB5568.namprd13.prod.outlook.com\n ([fe80::b070:92e1:931e:fee7]) by PH0PR13MB5568.namprd13.prod.outlook.com\n ([fe80::b070:92e1:931e:fee7%4]) with mapi id 15.20.6863.047; Tue, 17 Oct 2023\n 05:46:27 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=kaWMp7Tko2Bx+YMD0d+4qOCsY/O2Q25pu+B4OSDuzPqkyKBDfIbjMVAPTYGS8Kc/s+uC7P4afFDwcyltPBeC9RRA3rSbv57Kxg/kz+HJHzEm2onnkbSCl8oPNsJCDVe+WLWm/G09C5PtYfhskPe3uyUE9RAPbYMvMQszBbC8tTzk9InrR8n3naITzKsruMVCgMAVSqTttsJCqPrxBbxME9Tmejqyuy2XeQ1qP5ehQh6O/sGqMsynf+JKS1nogJG5F9MtKLQPHdpuciDA0bimB6zAfPXiTO20LIzv1/dBpeLdphbXWcqhwMR3yncmSNTM2SE1yU/ZlNOYaDpWWuhqDA==", "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=yuYwq+iND+ZUVKDl73PvI3zM6qMnE1r1sFsNgxy0v2A=;\n b=LbxUBQJ3oaQLysclY5gJCORi6puCwhWb5d133f1SaEBmcpGdkjEFerWNj8FxeMDD6kxCVi/tMa/mKLMYPJCgHKltBeWW3QsK1lVF8zXQdzCGTBazGUYZCzPlAtL1NUn99LYQsaJlsXs+iyRD1uNE/6mDaMqwf2eR0mkVmLeB0y+RNgu9A4hrVwqMBE2dGSVSZ7W1Bh+HyC+56crhL/naExHYwPjFXHOB9LjACbd6fE1jVI3jlf/dZ4tMFjBDD8iIPyO3JPcasg04Sv5jjWpvBQaRue5e18kL7/GEfndaCNsxhoLoaoitU+AWb0QG1Siqa5kK9RbraCpswV+J2GJ9Wg==", "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=yuYwq+iND+ZUVKDl73PvI3zM6qMnE1r1sFsNgxy0v2A=;\n b=qf53G478sOs7elFJ9qiKOIez6TqmvjBufYk5mLab2AvZ5qADHMFzzKZBTbg85ATUxd1OhHudWg7phoZZY9gk0XKJd83qjLY3rxjMprHCh5mFf3Xugzy2gTCFUvP3aZxZnzALVu0/wugBHohkMBTAEv8o/Urp5TwrELFuTrbOxV8=", "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 Long Wu <long.wu@corigine.com>, Peng Zhang <peng.zhang@corigine.com>", "Subject": "[PATCH 08/25] net/nfp: extract the ctrl data field", "Date": "Tue, 17 Oct 2023 13:45:28 +0800", "Message-Id": "<20231017054545.1692509-9-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20231017054545.1692509-1-chaoyong.he@corigine.com>", "References": "<20231017054545.1692509-1-chaoyong.he@corigine.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "PH7PR17CA0069.namprd17.prod.outlook.com\n (2603:10b6:510:325::29) To PH0PR13MB5568.namprd13.prod.outlook.com\n (2603:10b6:510:12b::16)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "PH0PR13MB5568:EE_|MW5PR13MB5904:EE_", "X-MS-Office365-Filtering-Correlation-Id": "ca2a84be-6d9d-4291-f818-08dbced466d8", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n yIY95KagtPjjUsqGs7E8IL58Z/AW0740txYWDGApYXR2lUP4zUxSSEuuZYKz/jFwl5RyfI+DAo+6t9Q5rK6QZYKM+50qQMqdypp+r0HKyKkAQn/CxlgKvXjBDY7quYCYY78NZEALWKZq8qdxqGIS/mEp55giFoAtgBu/6DNCVqng9nMBjsm0t+ldFg+yzmgqzjmGEoMOstscbh7mT4kh405fzMMP5ptjAEu4eYymna8LToBEkZtPomBEPDBcheAaQUFmMO5/2HhNhh2Q+uSf2JsOKc12jm2QBNwK/puyZ0K1lVKtPPC/baGXxinBDD6+g0jdg2LvEW5EalEQYatmaA57IVXyocniG9UceBjiusCuCW3Yu+nIRSSQt3gIh3Ou93tN6IRe2iSNT1vIjpNLBRw0BgrsM+nlC50aoiq5fQosX9f5XDyZUqRiizXLe9ygVNyEjfhTCjjVz/Sg63yNhst/5BL+78SHGLAScDYFUCDEotL3LHJ6IbWxPNYpv4+C8i/FD/1dJnYzXNJa0Aa2Hyu63+qQKup67ePn/fiLwkXTWQZ21MuooD+RIpjl+mUqKDAIzAVb62hVtfCLBpTkXicctyrN3VHKmPMAOFJx1TLzzbLSN+uC4zNNyQUHbBiYfQAiA8+pW4TOdFLgLdBuh8QoYWkdjPlo+/VJKVMd1n8=", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:PH0PR13MB5568.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230031)(136003)(366004)(376002)(39830400003)(346002)(396003)(230922051799003)(186009)(1800799009)(451199024)(64100799003)(2906002)(5660300002)(8936002)(8676002)(30864003)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(54906003)(41300700001)(478600001)(4326008)(6486002)(44832011)(6512007)(6506007)(107886003)(38350700005)(2616005)(1076003)(26005)(36756003)(38100700002)(52116002)(86362001);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n WudlrPmSKshsMDWKU0Z9kn8dpuhCnoizb+0wOXZLKXheML7CD/BoiAbsI0GlSXzb7gwr1dv96J3xR1sSB+Xu4YvhFJS1oxUp8QsZBUfPn6UxncvpvjL6u+IR3w9TSStLkhS0fJkE1JLKqJYOCVhI/EYzCXCW1uy+OCpN/PKXhSg9BrpTIygCo/OCv8is/hlcAVVIb+fNjXC/TOVTPpOu94yH3fDCMq2ZV6wjdxSNHvyK2VoznepNoSYUVucT6TiNB2nmKbmNWe699jxaYpwJE4T4UDEmeTSBRuMfDG5+raIGy70qS9nG9AGAiRETtEPp4IFB4TPYdwVjlPY6nZXIL70G2SydoGywIR2DUl/Q4Q4Pf+c73fCBY3SPJ5fTaHQVZfn2lMyS0ouZhpZFe4hlJS8sBrKzNnfXL3j5jNcEUz4ZgreSG8/pn86IZFZfiLZlNs+aUZiCZATQ4Yj14pixBROtB7Cow0bOqsC0QZxbz8wIikxWbx+q2/jwm8P8fDFD6pGKac9v3IP1/QovQFQdMbd+20Nco03+bhhtDsp/SdWI87YH3Dx+Qbg020/95APgaZwIwihbsNY8ScCJkIjgrvNuQk/ghxLtwbnBqKJYSUrxRk8d9WE1JxMUBSbZsaSsZwgNaWcTM5aH1N2PL0LvkuBypeqlUfi069Ex2UgmNIaTku9CZ0jdftmFQ9ta7vY0WI2JoHv/aph1rNf6Jfdm9I0iytESTCYBatBWnp4hGWt6PGyBHnDE1vzIj0bbBbgS9R7cBz7oy+iXR3gH7KysAC0/nLRxVHI5TtpG2lR6KIb1RvgB+p6WXOtZhjSHV9Bnm/LNKndMLjlsfa/v6Pw1+n7FiV39qXOaNDZyS38T34DI2E3SkwPaglt4tO2ZrGFykVOX6kX0qWSTWVlX2DYZEWw4TOUvau2xb7PJFtootou4IHheMQRpLK8JFZCuBSHUCl8x3T16mgLi85uNabkOeDZxYashB6iM6ABeskuZFTzPJa4m3v5j1Gu8RE6RLI4aNKDH/pkziztUMA1ZBYpSXImHANqLWIpB0kBM0OOvAnFiDwfTIteLz54LDc+Zipj8fDocaahNrvW3Yw8PRzgye9uiscBoZaczSEgPkQg0mqCuSQLRBv5EWwrA5YLj6q/m2kkgTWH+37gSfq7kx6tl4bYQTRkGG5BahCSAjXiNmhocvpZ89dntKru21i1Bjwcve+MrH6J7bs3bvxKPY49b/Y2Nsrmqf/aSN9I8Pe5xeuBcrFlWBEGgbh60djqnSnmowrvoiUZGBgKiLivyoGuDa7KMWFfvHhjPGAg/798av/zaMOKLSk8kFfRJqwdn2D5Kls8G+zl1p4c3++4E8iZx5DOuPC7IQi4RSKEII/HTw7/ugG2ciGowqramA1e7y931rFnUcLaxBKaN0jgVRJtllRmvliwgQ7bQyzCpKLNO63QkFkfGyzqarSF4IKDEuxQyaBWhXKWqD03EAjlC8NWX/6i5JVfGykisCOWi7aagDB+mEApd4E3AQbIoN539i7zhgONKT2bXaYnUyQsMaAMxN3BNdNk+ekadvuUNsS969Ttur4wiPLyT11Hh6k8Clc08bmQ6MCjfNmczAWw1beNwUw==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n ca2a84be-6d9d-4291-f818-08dbced466d8", "X-MS-Exchange-CrossTenant-AuthSource": "PH0PR13MB5568.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "17 Oct 2023 05:46:27.3255 (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 glNp/pO3DAlJRQ35JfAfp7ISWgm0n4WCFVO6BsXV7lETdAl+z1vdNHCXcVfUBSKsvNGyC3yhWaxnWqZFSD/IhF59YvEK+6JO87+Ws4fB/y4=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MW5PR13MB5904", "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 the 'ctrl' data filed into the super class, prepare for the\nupcoming common library.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Long Wu <long.wu@corigine.com>\nReviewed-by: Peng Zhang <peng.zhang@corigine.com>\n---\n drivers/net/nfp/flower/nfp_flower.c | 8 ++---\n drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 2 +-\n drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 2 +-\n drivers/net/nfp/nfp_ethdev.c | 2 +-\n drivers/net/nfp/nfp_ethdev_vf.c | 2 +-\n drivers/net/nfp/nfp_net_common.c | 46 ++++++++++++++---------------\n drivers/net/nfp/nfp_net_common.h | 4 +--\n drivers/net/nfp/nfp_rxtx.c | 12 ++++----\n 8 files changed, 38 insertions(+), 40 deletions(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c\nindex 28bdb8e214..2aa0d9939e 100644\n--- a/drivers/net/nfp/flower/nfp_flower.c\n+++ b/drivers/net/nfp/flower/nfp_flower.c\n@@ -61,7 +61,7 @@ nfp_pf_repr_disable_queues(struct rte_eth_dev *dev)\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+\tnew_ctrl = hw->super.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@@ -72,7 +72,7 @@ nfp_pf_repr_disable_queues(struct rte_eth_dev *dev)\n \tif (nfp_net_reconfig(hw, new_ctrl, update) != 0)\n \t\treturn;\n \n-\thw->ctrl = new_ctrl;\n+\thw->super.ctrl = new_ctrl;\n }\n \n int\n@@ -123,7 +123,7 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)\n \t\treturn -EIO;\n \t}\n \n-\thw->ctrl = new_ctrl;\n+\thw->super.ctrl = new_ctrl;\n \n \t/* Setup the freelist ring */\n \tret = nfp_net_rx_freelist_setup(dev);\n@@ -723,7 +723,7 @@ nfp_flower_start_ctrl_vnic(struct nfp_net_hw *hw)\n \t\treturn -EIO;\n \t}\n \n-\thw->ctrl = new_ctrl;\n+\thw->super.ctrl = new_ctrl;\n \n \t/* Setup the freelist ring */\n \tret = nfp_net_rx_freelist_setup(dev);\ndiff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\nindex e9a16371bc..9f03b56c0c 100644\n--- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\n+++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\n@@ -154,7 +154,7 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data,\n \tcap_extend = hw->cap_ext;\n \n \tif ((pkt->ol_flags & RTE_MBUF_F_TX_VLAN) != 0 &&\n-\t\t\t(hw->ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) {\n+\t\t\t(hw->super.ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) {\n \t\tif (meta_data->length == 0)\n \t\t\tmeta_data->length = NFP_NET_META_HEADER_SIZE;\n \t\tmeta_data->length += NFP_NET_META_FIELD_SIZE;\ndiff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\nindex 533099278d..bc027210af 100644\n--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\n+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\n@@ -187,7 +187,7 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,\n \tcap_extend = hw->cap_ext;\n \n \tif ((pkt->ol_flags & RTE_MBUF_F_TX_VLAN) != 0 &&\n-\t\t\t(hw->ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) {\n+\t\t\t(hw->super.ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) {\n \t\tif (meta_data.length == 0)\n \t\t\tmeta_data.length = NFP_NET_META_HEADER_SIZE;\n \t\tmeta_data.length += NFP_NET_META_FIELD_SIZE;\ndiff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex 9ff1c297a4..ec9f6041fd 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -167,7 +167,7 @@ nfp_net_start(struct rte_eth_dev *dev)\n \telse\n \t\tnfp_eth_set_configured(dev->process_private, hw->nfp_idx, 1);\n \n-\thw->ctrl = new_ctrl;\n+\thw->super.ctrl = new_ctrl;\n \n \tfor (i = 0; i < dev->data->nb_rx_queues; i++)\n \t\tdev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;\ndiff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c\nindex 641fed6fcf..684968903c 100644\n--- a/drivers/net/nfp/nfp_ethdev_vf.c\n+++ b/drivers/net/nfp/nfp_ethdev_vf.c\n@@ -110,7 +110,7 @@ nfp_netvf_start(struct rte_eth_dev *dev)\n \t\tgoto error;\n \t}\n \n-\thw->ctrl = new_ctrl;\n+\thw->super.ctrl = new_ctrl;\n \n \tfor (i = 0; i < dev->data->nb_rx_queues; i++)\n \t\tdev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;\ndiff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c\nindex 283f5ee627..25b8e3a613 100644\n--- a/drivers/net/nfp/nfp_net_common.c\n+++ b/drivers/net/nfp/nfp_net_common.c\n@@ -500,7 +500,7 @@ nfp_net_disable_queues(struct rte_eth_dev *dev)\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+\tnew_ctrl = hw->super.ctrl & ~NFP_NET_CFG_CTRL_ENABLE;\n \tupdate = NFP_NET_CFG_UPDATE_GEN |\n \t\t\tNFP_NET_CFG_UPDATE_RING |\n \t\t\tNFP_NET_CFG_UPDATE_MSIX;\n@@ -512,7 +512,7 @@ nfp_net_disable_queues(struct rte_eth_dev *dev)\n \tif (nfp_net_reconfig(hw, new_ctrl, update) != 0)\n \t\treturn;\n \n-\thw->ctrl = new_ctrl;\n+\thw->super.ctrl = new_ctrl;\n }\n \n void\n@@ -553,7 +553,7 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev,\n \tstruct nfp_net_hw *hw;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\tif ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&\n+\tif ((hw->super.ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&\n \t\t\t(hw->super.cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0) {\n \t\tPMD_DRV_LOG(ERR, \"MAC address unable to change when port enabled\");\n \t\treturn -EBUSY;\n@@ -563,8 +563,8 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev,\n \tnfp_net_write_mac(hw, (uint8_t *)mac_addr);\n \n \tupdate = NFP_NET_CFG_UPDATE_MACADDR;\n-\tctrl = hw->ctrl;\n-\tif ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&\n+\tctrl = hw->super.ctrl;\n+\tif ((hw->super.ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&\n \t\t\t(hw->super.cap & NFP_NET_CFG_CTRL_LIVE_ADDR) != 0)\n \t\tctrl |= NFP_NET_CFG_CTRL_LIVE_ADDR;\n \n@@ -613,7 +613,7 @@ nfp_configure_rx_interrupt(struct rte_eth_dev *dev,\n \t}\n \n \t/* Avoiding TX interrupts */\n-\thw->ctrl |= NFP_NET_CFG_CTRL_MSIX_TX_OFF;\n+\thw->super.ctrl |= NFP_NET_CFG_CTRL_MSIX_TX_OFF;\n \treturn 0;\n }\n \n@@ -705,19 +705,19 @@ nfp_net_promisc_enable(struct rte_eth_dev *dev)\n \t\treturn -ENOTSUP;\n \t}\n \n-\tif ((hw->ctrl & NFP_NET_CFG_CTRL_PROMISC) != 0) {\n+\tif ((hw->super.ctrl & NFP_NET_CFG_CTRL_PROMISC) != 0) {\n \t\tPMD_DRV_LOG(INFO, \"Promiscuous mode already enabled\");\n \t\treturn 0;\n \t}\n \n-\tnew_ctrl = hw->ctrl | NFP_NET_CFG_CTRL_PROMISC;\n+\tnew_ctrl = hw->super.ctrl | NFP_NET_CFG_CTRL_PROMISC;\n \tupdate = NFP_NET_CFG_UPDATE_GEN;\n \n \tret = nfp_net_reconfig(hw, new_ctrl, update);\n \tif (ret != 0)\n \t\treturn ret;\n \n-\thw->ctrl = new_ctrl;\n+\thw->super.ctrl = new_ctrl;\n \n \treturn 0;\n }\n@@ -732,19 +732,19 @@ nfp_net_promisc_disable(struct rte_eth_dev *dev)\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n-\tif ((hw->ctrl & NFP_NET_CFG_CTRL_PROMISC) == 0) {\n+\tif ((hw->super.ctrl & NFP_NET_CFG_CTRL_PROMISC) == 0) {\n \t\tPMD_DRV_LOG(INFO, \"Promiscuous mode already disabled\");\n \t\treturn 0;\n \t}\n \n-\tnew_ctrl = hw->ctrl & ~NFP_NET_CFG_CTRL_PROMISC;\n+\tnew_ctrl = hw->super.ctrl & ~NFP_NET_CFG_CTRL_PROMISC;\n \tupdate = NFP_NET_CFG_UPDATE_GEN;\n \n \tret = nfp_net_reconfig(hw, new_ctrl, update);\n \tif (ret != 0)\n \t\treturn ret;\n \n-\thw->ctrl = new_ctrl;\n+\thw->super.ctrl = new_ctrl;\n \n \treturn 0;\n }\n@@ -1349,7 +1349,7 @@ nfp_net_common_init(struct rte_pci_device *pci_dev,\n \telse\n \t\thw->rx_offset = nn_cfg_readl(hw, NFP_NET_CFG_RX_OFFSET_ADDR);\n \n-\thw->ctrl = 0;\n+\thw->super.ctrl = 0;\n \thw->stride_rx = stride;\n \thw->stride_tx = stride;\n \n@@ -1453,7 +1453,7 @@ nfp_net_irq_unmask(struct rte_eth_dev *dev)\n \t/* Make sure all updates are written before un-masking */\n \trte_wmb();\n \n-\tif ((hw->ctrl & NFP_NET_CFG_CTRL_MSIXAUTO) != 0) {\n+\tif ((hw->super.ctrl & NFP_NET_CFG_CTRL_MSIXAUTO) != 0) {\n \t\t/* If MSI-X auto-masking is used, clear the entry */\n \t\trte_intr_ack(pci_dev->intr_handle);\n \t} else {\n@@ -1559,7 +1559,7 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev,\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \trx_offload = dev->data->dev_conf.rxmode.offloads;\n-\tnew_ctrl = hw->ctrl;\n+\tnew_ctrl = hw->super.ctrl;\n \n \t/* VLAN stripping setting */\n \tif ((mask & RTE_ETH_VLAN_STRIP_MASK) != 0) {\n@@ -1578,7 +1578,7 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev,\n \t\t\tnew_ctrl &= ~NFP_NET_CFG_CTRL_RXQINQ;\n \t}\n \n-\tif (new_ctrl == hw->ctrl)\n+\tif (new_ctrl == hw->super.ctrl)\n \t\treturn 0;\n \n \tupdate = NFP_NET_CFG_UPDATE_GEN;\n@@ -1587,7 +1587,7 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev,\n \tif (ret != 0)\n \t\treturn ret;\n \n-\thw->ctrl = new_ctrl;\n+\thw->super.ctrl = new_ctrl;\n \n \treturn 0;\n }\n@@ -1660,7 +1660,7 @@ nfp_net_reta_update(struct rte_eth_dev *dev,\n \tstruct nfp_net_hw *hw;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\tif ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)\n+\tif ((hw->super.ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)\n \t\treturn -EINVAL;\n \n \tret = nfp_net_rss_reta_write(dev, reta_conf, reta_size);\n@@ -1669,7 +1669,7 @@ nfp_net_reta_update(struct rte_eth_dev *dev,\n \n \tupdate = NFP_NET_CFG_UPDATE_RSS;\n \n-\tif (nfp_net_reconfig(hw, hw->ctrl, update) != 0)\n+\tif (nfp_net_reconfig(hw, hw->super.ctrl, update) != 0)\n \t\treturn -EIO;\n \n \treturn 0;\n@@ -1690,7 +1690,7 @@ nfp_net_reta_query(struct rte_eth_dev *dev,\n \tstruct nfp_net_hw *hw;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\tif ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)\n+\tif ((hw->super.ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)\n \t\treturn -EINVAL;\n \n \tif (reta_size != NFP_NET_CFG_RSS_ITBL_SZ) {\n@@ -1795,7 +1795,7 @@ nfp_net_rss_hash_update(struct rte_eth_dev *dev,\n \trss_hf = rss_conf->rss_hf;\n \n \t/* Checking if RSS is enabled */\n-\tif ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0) {\n+\tif ((hw->super.ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0) {\n \t\tif (rss_hf != 0) {\n \t\t\tPMD_DRV_LOG(ERR, \"RSS unsupported\");\n \t\t\treturn -EINVAL;\n@@ -1813,7 +1813,7 @@ nfp_net_rss_hash_update(struct rte_eth_dev *dev,\n \n \tupdate = NFP_NET_CFG_UPDATE_RSS;\n \n-\tif (nfp_net_reconfig(hw, hw->ctrl, update) != 0)\n+\tif (nfp_net_reconfig(hw, hw->super.ctrl, update) != 0)\n \t\treturn -EIO;\n \n \treturn 0;\n@@ -1831,7 +1831,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n-\tif ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)\n+\tif ((hw->super.ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)\n \t\treturn -EINVAL;\n \n \trss_hf = rss_conf->rss_hf;\ndiff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h\nindex 2f02803ea4..375e26bfc2 100644\n--- a/drivers/net/nfp/nfp_net_common.h\n+++ b/drivers/net/nfp/nfp_net_common.h\n@@ -116,6 +116,7 @@ struct nfp_hw {\n \tuint8_t *ctrl_bar;\n \tuint8_t *qcp_cfg;\n \tuint32_t cap;\n+\tuint32_t ctrl; /**< Current values for control */\n };\n \n struct nfp_net_hw {\n@@ -139,9 +140,6 @@ struct nfp_net_hw {\n \t/** NFP ASIC params */\n \tconst struct nfp_dev_info *dev_info;\n \n-\t/** Current values for control */\n-\tuint32_t ctrl;\n-\n \tuint8_t *tx_bar;\n \tuint8_t *rx_bar;\n \ndiff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c\nindex a0c7e0e9b5..a9dd464a6a 100644\n--- a/drivers/net/nfp/nfp_rxtx.c\n+++ b/drivers/net/nfp/nfp_rxtx.c\n@@ -143,7 +143,7 @@ nfp_net_rx_cksum(struct nfp_net_rxq *rxq,\n {\n \tstruct nfp_net_hw *hw = rxq->hw;\n \n-\tif ((hw->ctrl & NFP_NET_CFG_CTRL_RXCSUM) == 0)\n+\tif ((hw->super.ctrl & NFP_NET_CFG_CTRL_RXCSUM) == 0)\n \t\treturn;\n \n \t/* If IPv4 and IP checksum error, fail */\n@@ -307,7 +307,7 @@ nfp_net_parse_meta_hash(const struct nfp_meta_parsed *meta,\n {\n \tstruct nfp_net_hw *hw = rxq->hw;\n \n-\tif ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)\n+\tif ((hw->super.ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)\n \t\treturn;\n \n \tmbuf->hash.rss = meta->hash;\n@@ -339,7 +339,7 @@ nfp_net_parse_meta_vlan(const struct nfp_meta_parsed *meta,\n \tstruct nfp_net_hw *hw = rxq->hw;\n \n \t/* Skip if firmware don't support setting vlan. */\n-\tif ((hw->ctrl & (NFP_NET_CFG_CTRL_RXVLAN | NFP_NET_CFG_CTRL_RXVLAN_V2)) == 0)\n+\tif ((hw->super.ctrl & (NFP_NET_CFG_CTRL_RXVLAN | NFP_NET_CFG_CTRL_RXVLAN_V2)) == 0)\n \t\treturn;\n \n \t/*\n@@ -347,12 +347,12 @@ nfp_net_parse_meta_vlan(const struct nfp_meta_parsed *meta,\n \t * 1. Using the metadata when NFP_NET_CFG_CTRL_RXVLAN_V2 is set,\n \t * 2. Using the descriptor when NFP_NET_CFG_CTRL_RXVLAN is set.\n \t */\n-\tif ((hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN_V2) != 0) {\n+\tif ((hw->super.ctrl & NFP_NET_CFG_CTRL_RXVLAN_V2) != 0) {\n \t\tif (meta->vlan_layer > 0 && meta->vlan[0].offload != 0) {\n \t\t\tmb->vlan_tci = rte_cpu_to_le_32(meta->vlan[0].tci);\n \t\t\tmb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED;\n \t\t}\n-\t} else if ((hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN) != 0) {\n+\t} else if ((hw->super.ctrl & NFP_NET_CFG_CTRL_RXVLAN) != 0) {\n \t\tif ((rxd->rxd.flags & PCIE_DESC_RX_VLAN) != 0) {\n \t\t\tmb->vlan_tci = rte_cpu_to_le_32(rxd->rxd.offload_info);\n \t\t\tmb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED;\n@@ -385,7 +385,7 @@ nfp_net_parse_meta_qinq(const struct nfp_meta_parsed *meta,\n {\n \tstruct nfp_net_hw *hw = rxq->hw;\n \n-\tif ((hw->ctrl & NFP_NET_CFG_CTRL_RXQINQ) == 0 ||\n+\tif ((hw->super.ctrl & NFP_NET_CFG_CTRL_RXQINQ) == 0 ||\n \t\t\t(hw->super.cap & NFP_NET_CFG_CTRL_RXQINQ) == 0)\n \t\treturn;\n \n", "prefixes": [ "08/25" ] }