Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/133213/?format=api
{ "id": 133213, "url": "http://patches.dpdk.org/api/patches/133213/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20231024022849.3092506-9-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": "<20231024022849.3092506-9-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231024022849.3092506-9-chaoyong.he@corigine.com", "date": "2023-10-24T02:28:32", "name": "[v2,08/25] net/nfp: extract the ctrl data field", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "84099b7d8326c3b153f5cf228a9aece33ddcf8a9", "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/20231024022849.3092506-9-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29961, "url": "http://patches.dpdk.org/api/series/29961/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29961", "date": "2023-10-24T02:28:24", "name": "add the NFP vDPA PMD", "version": 2, "mbox": "http://patches.dpdk.org/series/29961/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/133213/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/133213/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 A079D431EB;\n\tTue, 24 Oct 2023 04:30:44 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E9ABF41148;\n\tTue, 24 Oct 2023 04:29:56 +0200 (CEST)", "from NAM10-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam10on2093.outbound.protection.outlook.com [40.107.93.93])\n by mails.dpdk.org (Postfix) with ESMTP id 30408410F6\n for <dev@dpdk.org>; Tue, 24 Oct 2023 04:29:54 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by BLAPR13MB4691.namprd13.prod.outlook.com (2603:10b6:208:306::19)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Tue, 24 Oct\n 2023 02:29:52 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::142e:d47c:7320:8a9d]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::142e:d47c:7320:8a9d%4]) with mapi id 15.20.6907.021; Tue, 24 Oct 2023\n 02:29:52 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=Jzm2zNcvJafY2ZX7PV635wSDgTOqBpzJZRurjTZgz1o7nEnpQb5Pio69h82/qwPd9LWw2OTy8FeyV1aguc6mqO4q39lOl8j6is1KhU6O+C8OSi3NXVPktxJg54bUR7rWpaNEeWDC++VUy7i7IaDgiV9uZZWXy890QS1bbS2l80N0fSvoXYEIl88dqFRl31+ksvrbJC8GGcaYUMdUlWJDGwGeDA0fk5LkScB3uX+pSMMr+nYTrmvuxPiTfJkOKos8dtopdSU2xVJ1R0qV3cv5m6J+NFxRaCTpSf3cgV82sEbNYDEDPzIEb3+RrUEMyPqvbUnN/FCZ2Z1NwgIpkD6tYA==", "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=RRhMHhn0YXvamlaXgWH2i+WpWihtdLcmMZwtXwxDeso=;\n b=XLNVYdtPYfFC8/OcCfxZUAfRVGk/mX7zIWJrUTE5vW6ut1AlxrrtFaoaYTao+Fiy221eNa5iyaJjHxFu7XT8MAcxDodpRY5C6xiAjt7RDW4bsphrAWdjt5QSQLrV0CMmfOS0jUFmTbkeRBW/Lp16F0R2fgLLx657UJpc7om1zuHep8tPf9jFjnuSAMZ0kVlf6EFw9yvOrhCv2xPn3PsoojfVX0BubmE4hwbmlRrNIQQJWpBhMDFX8PLVpQdHdzDpVlh282CZAcICJb/HBxMcgG7mfwJHmQgbZd/u74pjLpWFWo5MBsoh2Abebn47otP1B6BZMMXlIrUTKxgQM6K2Bg==", "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=RRhMHhn0YXvamlaXgWH2i+WpWihtdLcmMZwtXwxDeso=;\n b=oxI0laULTxQUaOKexymG30GCOPeq9xh2VkQYjit233cEDfWLq9JIwMZI9VD2DwowudfeyqNiO226hjoPSfW2cukT6tjHIr9nLhg83CiHw+9B5PRbcNeP3naVoaEq+aE97bU1xPmYoi1WUPA7YrLrFrRv2S56X0ztlxrKpf+nRfc=", "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 v2 08/25] net/nfp: extract the ctrl data field", "Date": "Tue, 24 Oct 2023 10:28:32 +0800", "Message-Id": "<20231024022849.3092506-9-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20231024022849.3092506-1-chaoyong.he@corigine.com>", "References": "<20231017054545.1692509-1-chaoyong.he@corigine.com>\n <20231024022849.3092506-1-chaoyong.he@corigine.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "BYAPR04CA0015.namprd04.prod.outlook.com\n (2603:10b6:a03:40::28) 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_|BLAPR13MB4691:EE_", "X-MS-Office365-Filtering-Correlation-Id": "21501d0b-7095-4d29-4d82-08dbd4391a1c", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n Cy18ynUggsTfbNE8zYDZs8qQbIJM53n7zJ5989VxoEwxFWrZOhmwWhalND2AP4eXcfW16bSsKfFH9vJ+50xhXrBgGQBkmQDKkyrGAivv154vV8jSI9QHXJNUl1INjDeGy0ZjD2vSvo/3gUvndpTiYZQ61kKW7GdPSl+tn3G0/9K6c/qxGrG6tWgG7QJ9pt+SUCSfIspVfSaf1/L4SX5MW9XEwxnnnOiF4IU8qFVH2paf0cWHlkEzpu6CPIWO8F3cX5hCHuLMfRNeGdU2AuycZEa8/pj08ergJwGXoTw7CIjktwdgv2i3gerJCYkxIaHOTH68XfkbWC2TzRsIY9CPD3zUslWTvKhQnWPJjDdcjnPhEJMWfvndVNvDGk/BPV1z0Aj5IhwZrCsSl2bpMqp44gLCrsFVMlA2hD/Ka77tz7FrcRg0B3tDKo9/GN13bLoJLQtM9s5rb49vjr4/qGTp8EQ8wIT9Mt6LNvS6RbVJomZnETiJLRW92F/UNaLt46S8HhUOHQ4eh2kjkAkK6HevUv9vijqRPkJpAP3s9Ibj3qSAEmkvKtCiQGNAUdSYQviL0kHA0rtAuagZjt2OOQv3GdLDd1VlAepC3dGqdy+hn64evBsfwHL/4wYBTcrb3u2vX29VR11deR6lmPcMc66s9wsJ+fBJBulKOpEnc5kMwqM=", "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)(39830400003)(366004)(376002)(346002)(396003)(136003)(230922051799003)(186009)(451199024)(1800799009)(64100799003)(83380400001)(38350700005)(30864003)(2906002)(4326008)(8936002)(36756003)(44832011)(8676002)(26005)(52116002)(107886003)(2616005)(1076003)(38100700002)(6506007)(6666004)(6512007)(316002)(6916009)(478600001)(6486002)(5660300002)(66476007)(86362001)(54906003)(41300700001)(66946007)(66556008);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n u5CrV9R3AVpvuyW9CCvBD00SMVCO7FfNaIQZBAAGK+SQrMbMit0yuKGItgULi19ib2x6n+eycWXAWmO7+q7GFpgM5vf1Bt1U8i+DQ1SGYF+/sHkMKD/nsHenOhaiMG2mw/qFboPWlGDl9/Kh9yyYmSRfSaAilV9LjnPfPEylS9g607dQ5X8ztQaCZuqk144NYJCqcFxXNV/hVB4D1vFNH1DMy01Qf5F6YVVmaz9f5Ks3mfXVOASV3OkwuD7B2vWWISN6Pk+EF2nZq6HNs1SyDCw4BsQ+ruTRwc9K+fEgqOtDFdZPYLdL5L8Q175/oBq9E2IeRRIDIvoWrTjuctxoyzdoF/pRa3cynNfDYW7pxZQn4FtDIwcSGFvbqv/RfHa+FAWFUY8A+6hD6XFz6FiBp5NnUmFaO/3a3JiKzgHNvyCyUxhAxiYKbUMkGf1O0q4TifbtpTugqiotv0X2LnYmiLrV+3YuPOC7jA0nTSf6b2zIqlwB9XmwKt8SH427WkLr+5s1Zg3QHB6PRB5pwNEd0pQJeAmTTjNB71Bp0Tc/Qkxv2h/zLd98iCBvGGELIzJ8uoRteEFPwUXEh56b5XyaCvBeB8kCY7Ju3yw7BrWz8++wFUPmHtUSmW6Ey5EF8P5SksividjoIdBMb+mCjtSk+AK2gSN5xOFFxxKAaX3X/u6dH41goD+wAD51OVd0gb7DZpygRv6t6Xm2mNthmTiH967uH+YNbJFDU+IfVWuYPZKVOhAn2uiLBf3l1WJRk/TIUBk+Ijz0AyOauJSpKi0XeXK9vmvLcwhzfPm03D5Zm8kApXC8KQTuHZA424z/zo1eXIVgDxy0E/bT0krfVZaUwWlLk/8Gc00HrT0Js/Ku8bmTaMuqWhji+H5HzisZunM4eRwgcn2ga5EfReS0UZ34IQ26lbNV3YsNtxGZFxgWo3mDZIts2/ideG/2PA5kD9spNlznsu7o8udXDZEsGmQOw3AFw/Or7yDpZh8/xthbzfaiUPb1fqbSn6pF4YJBdQ+hd9Sa5kWg5APFw5F0E/AlfGDV2SVjJSad0GjT60yuKiHQtxPtvxrgPcksyDSlo4jeNtb1kLs4Ai9PejnhX3CKuc3ns7Lufbgt6qMU5l3TgD8BalmFZCcEMdtyjLXeGLe43V4uuTsRaFSBb6dqlelNN3UZJncU8eMQBIBYVNuUize/dKS8c2wLSFCL7+xvx0IK9IJzfQTrpBjdy4V7JBS3/jpw/fr7M4Yy7HQq/MMWI3T6veMdku5ogr3JSvzPzkvqCNoRj/Y8onbQ2grSZe/eEK0txZu2++Rvw+KDRhMqBadKQjIFSOrZZu+qagU2PDSZ0CH3JHfEtHJSBOhO7EkaR7X7xKuM5cF14okLxDiev+w8RQ4eMKI7Juf8Ec/2fnD9+Oh0/wPIES69NY7q6pZgkLBfBN/r9AY/RIx+dkQC3tgefZ88R10/m4pYxa/m16TB1ULg9x27p+72nHkrL4LMAj13vqk++s42clHG9d9YvFxxim5UjIhulWKNIwvts+WwtbQESysBjGQpnevcUS2pYieqplBi8UCTSuZxAmFCeD4PQ961qg5mJX3mPe4wE6dyETwTcvy+ydl9juvGmiOCuw==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 21501d0b-7095-4d29-4d82-08dbd4391a1c", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "24 Oct 2023 02:29:52.2192 (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 6cm22xz9lG5LAcmlYtVUOyFkog7a0dMaxl5f08tRIHybwfkazJLwbihJEF8e3XJC5ui9t0/eo4pnJAj+FCCxmQNmTyziKZ5oPmGCMZjDcFY=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "BLAPR13MB4691", "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 | 4 ++-\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 | 5 ++--\n drivers/net/nfp/nfp_rxtx.c | 12 ++++----\n 8 files changed, 41 insertions(+), 40 deletions(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c\nindex c8455e0241..8bb5914888 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@@ -721,7 +721,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 bbf4530ae9..3045533857 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->super.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 807666686f..63421ba796 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->super.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 b7c60b642f..0f6f97be8e 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -152,6 +152,8 @@ nfp_net_start(struct rte_eth_dev *dev)\n \tif (nfp_net_ext_reconfig(hw, ctrl_extend, update) != 0)\n \t\treturn -EIO;\n \n+\thw->super.ctrl_ext = ctrl_extend;\n+\n \t/*\n \t * Allocating rte mbufs for configured rx queues.\n \t * This requires queues being enabled before.\n@@ -167,7 +169,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 29f836c31e..058260bda3 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 dd62ec6d83..3fb3b34613 100644\n--- a/drivers/net/nfp/nfp_net_common.h\n+++ b/drivers/net/nfp/nfp_net_common.h\n@@ -117,6 +117,8 @@ struct nfp_hw {\n \tuint8_t *qcp_cfg;\n \tuint32_t cap;\n \tuint32_t cap_ext;\n+\tuint32_t ctrl;\n+\tuint32_t ctrl_ext;\n };\n \n struct nfp_net_hw {\n@@ -139,9 +141,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": [ "v2", "08/25" ] }