Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/132695/?format=api
{ "id": 132695, "url": "http://patchwork.dpdk.org/api/patches/132695/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20231017054545.1692509-6-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patchwork.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-6-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231017054545.1692509-6-chaoyong.he@corigine.com", "date": "2023-10-17T05:45:25", "name": "[05/25] net/nfp: extract the cap data field", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "0a1c8a6a725e830178684471dcbe71d3c78e19ee", "submitter": { "id": 2554, "url": "http://patchwork.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20231017054545.1692509-6-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29865, "url": "http://patchwork.dpdk.org/api/series/29865/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29865", "date": "2023-10-17T05:45:20", "name": "add the NFP vDPA PMD", "version": 1, "mbox": "http://patchwork.dpdk.org/series/29865/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/132695/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/132695/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 5006743186;\n\tTue, 17 Oct 2023 07:46:50 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 549C840F16;\n\tTue, 17 Oct 2023 07:46:21 +0200 (CEST)", "from NAM12-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam12on2102.outbound.protection.outlook.com [40.107.244.102])\n by mails.dpdk.org (Postfix) with ESMTP id 6103440EF1\n for <dev@dpdk.org>; Tue, 17 Oct 2023 07:46:20 +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:18 +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:17 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=irGwGEOSUx5CQJ+ufNxidoM+fq9KtuwVc7d3JgoxXohkn1uLySPio5KCl/tBNgXRFX/pXHaAHOMSUSQ0a6f++WHxv127qmJThvKtPj48qMnSH/c/hJyALpXdV1fFawn5n5Xtz+mp3Wv+h5CgE2nlFfWSWpsw8QXF6hQ0KPCtUxFlBKSJc9dJ6kGmZaQiEm20NCHN0Tyq9gASHc6E3uHj1BKUxlOidInvZc6r4vv5wo4OJ/FfDpLJSczOidN6073Sioeb157Aomsnmkl/NDOxO+zHB9uJZc/yHdAQyjoTo2HQTHqq3MD9VMGYDLnRFSv9gEcpNRPr7EAw+Iq9cpc07A==", "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=aT4enpGKIwcuClFyoLqM6iCmv6q2qthMz91YrGUpfx8=;\n b=XjM9RUvAJXF6fieMIFH0nyksoDQ2i5zXAee0S8va6HykkAk/Zh4/ICLF2acogihWFbsyrC9BSTJ0X3gJEuFY72LAB7enTMMamkBAL1Z7FM5h39Isg577QozLLaHuvPd87oyQeuTrkFpAIcS01HFsyAsO3qTTgB3VYfTCQrNIVfw/VZkEMGk3+kReIeXI/qRAk1VlAvtKQmNPgJqU0wJ6bdvC31Vv2YM5TQU0DtIfhyJmQv7XhfZKCHTntlfW/EIFr6ARc4jut/gRlwLBgWCAu+H2uISFsTNYK76plq7ACL6cdVl5x6uqCs4mpxhjklvzoc/gFJgNhT00EAohkrIXNQ==", "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=aT4enpGKIwcuClFyoLqM6iCmv6q2qthMz91YrGUpfx8=;\n b=cq97q+HlZ502XpuVxyQERyNvlv7J2V0E0UnvPZ2KeEwpIWzdZOcBfyC8Vgp13zIm/nPK5C1mZ+7MtIrxnDoq1pNp4KAeFPpO2M/JTYu7RxluorCrfDFYi+B3NLIgDkNx6/b1Q3gQiA6b0pb1biVlVbH14FefwFgQplJXgocQ2D0=", "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 05/25] net/nfp: extract the cap data field", "Date": "Tue, 17 Oct 2023 13:45:25 +0800", "Message-Id": "<20231017054545.1692509-6-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": "0e556f6e-2397-478f-66e1-08dbced46172", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n ASfABmQSAYF/2jn3C8PDwvYVe1zQw8Ipwosly9L/8trQkY0B4FdS4hRfSzOQk65Xe1CXg7yv+eV8qg0vAB3TApKhmHPwSFygd8lJav0TyULEXR7QZ7Uz8GX5LazloY5j76oS26EY1uN5CUzxvmw1Q+Vo+4/L9o34JAfxC1L43t34ToQRrvvGh43zQzii4SWBofhurtGjIsOWS+26cZFhNRnKfs4hvKRnxOHT/AwhR7oUkbiJ4TtUTEx+7cll9i+62HQUzg4y4Snz6q4Hmkd/hMhMKemy7cQsa+xWp4BEah/Xb60najjdZsE8iDEKLzOVKMN9QxjJirWRTwPTIvIeFykVX7ed8mBhUEDQDXCHfYKLVyH0GeA/MuGjSeBC98rPAQ0dmIO0R7imYB3GpswfLw2rs4WP00CsLi6ff91ptzaE/HWznwPnAOz9RxbKNcwTAo4Tn5P3Yh8AZ9Vd8SGRwPj0+V5JtDnp4aHMhYDVMkNWOT5qS4CQJ0NxGy1k21t8ylJu9TJJ8bB3h91P3f+nQVBYaSahlPnHRaSoX1HvFpqWb5W83s2OTU7nGStFTGjSIvDR0Oec8JPY9a4tGaBpZzsHHnwC4VCyjlpOjPktleZR1TFCbAmhRZR1DmxPf5SCyeZBd+AHlCXxVA94NbC7sqXfUJjWztLar7etUU4Hdcg=", "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)(6666004)(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 UflzURJqxPPdeC4LLByDX6mrg1dHs5dz2Hbxr1jYxgwMVspQ3T0QIvi1lHlFH84ylZBAyt5TnCXlTmF5OTq8Hp+/qZAfTQSwkiJ6J8XQA3OULjm9OvN7Kc3pzm0rTbzZXYviv3yjhrNSYdCrSFZKvTRbgBRZvvWeKlX68dj4/3X+iTbFM13uFJyWaCpTMdBRRc9tZda6TGirKEn3teHIDDOVtJ+Behas3sRyPGMHclfilFA3uYsqlj7DAv8at653zuPHtcgRGQkQ5QxrIAoioS7R3BCACjexqZXn3uDxm0p3fthMuRL/04w0uLeAA74zpHHxkC8ngbMrWYUqoQcyHmkVv/20xFZkvD6El0y1qmcyNey6QTwK8c7YRjUO7hYYEmpkiP8HAe0wRQ7u9nTG7TtADurDpXIIiDo9ze6BrWcSh/wNiwEyVGPfRzBJZmB/o8VXUU7ccPGmbwnchBZpWDdLqKmbk7LpqW9DKB7P/7od+e8sXTqWmh7JZ+GgWr7cSyuvJ3DXOQPVJmXjudBrAq9Gj+DSVKFMvHQfthuiV/BiMg/A8UXtTKTc7R5I9wzQ1RK+ilcpFwBUvqnlEUWVC0nKZfzpR2pJWnEnppc3Kmlpi194VMpFDEwgcZurpvnDZeX2sFjPkxyYFkaURxEgD9VTJmyJO3xAwjOnEM/Di4xqC1y2UoWxLPO7yY5eImTarMDmjXqNYxr7/3fZBEYXCM7erb5hKH0P5sjwo38MDGEuWuAFNyKkA5nG5QacdLYu0o6JQR7ScYR8kVqZrzHvNbrtPPk/8tiFGK6ah6JK1nvlmHaXNlgKxRnWGB7l3mpWGV0lJO7aVTIiBwoOAZsKs7IL2zj9rBoTwg2AIF4PcPmqHJortT6kKS6Pu2nKCZUzZRIVqjDH2Nf4hvECsn/Q24fCODDArOkJOOhztNOsIIF8/YP9rAPUmwjBb3Q+slJGubN+Qx6QnnL8MMgEc9BDlKrJEPP4yThuxqFPqvT3wHaeJpt7fZ+rWr9X/rUbjqx4NeAJRKhhHLAkk2JOgQHdi1LBvo4xVoSe58JSZ1sX7dIi68omYUxUkNcPoRJU4DOT2LzvMAEmtjo/GkGjQ9JJtLSzP+75k35jX1HPG2T3jwSUKsVU8RqYhGRzcYkEzed6KRdY8qtfSzKoGWAzxzcCQUlwQahpXXgdNMQO0KcDo0A2e3P8Gu6VcOnfdGrz4L/mtf8oE4Ob1AF7ZjneghNVAagTm2Zo2npQL7eavgcU19qhlp8X4gWKcmE3RPeetKzsRbcqWuMNDHu029QoEZd88efWMj4a26azDKdwizqDpS/wn0w2HIoOIFomA2hkc3MQ8g2vzKtMvae8fGAa3havzoeY/ezI+1liY/p8K+zLmxU7XfNDrgEtkO03aYyIuxH3kq9+Hpbtv4zVyI7YaVpxG4wX75LlW+s0IL4F/Scf2j2yvv7q984wK6t8X8sfGd3EJ98ryn4u9E4KaHNmgi+c5eBoanW0p2AqI/bog3ulkYSCrY4kramOOTgIKEAGgvOAWFYfMisQJw+Vv9AAP/FDlIMZix3SN5GCNS+Abruihhq7RCHB0hHveghI19/Z5W8UuwpKWG0THnKX/d6oDWwScg==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 0e556f6e-2397-478f-66e1-08dbced46172", "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:17.9082 (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 EeL+jTtbok7z5DipoWXLMfzutuk6wC0MwG7NZ+Je2sn4HZvooyV982zmcGiM3Pt3ebtI3qL+FwUuRnZTRKFU0xoMm1rurUm7oPiv1EUON2U=", "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 'cap' data field into the super class, ready 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 | 6 +-\n drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 10 +--\n drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 12 ++--\n drivers/net/nfp/nfp_ethdev.c | 12 ++--\n drivers/net/nfp/nfp_ethdev_vf.c | 10 +--\n drivers/net/nfp/nfp_net_common.c | 94 +++++++++++++++--------------\n drivers/net/nfp/nfp_net_common.h | 8 ++-\n drivers/net/nfp/nfp_rxtx.c | 2 +-\n 8 files changed, 81 insertions(+), 73 deletions(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c\nindex 0c54d7ed27..c758add734 100644\n--- a/drivers/net/nfp/flower/nfp_flower.c\n+++ b/drivers/net/nfp/flower/nfp_flower.c\n@@ -65,7 +65,7 @@ nfp_pf_repr_disable_queues(struct rte_eth_dev *dev)\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+\tif (hw->super.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@@ -101,7 +101,7 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)\n \n \tupdate |= NFP_NET_CFG_UPDATE_RSS;\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_RSS2) != 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_RSS2) != 0)\n \t\tnew_ctrl |= NFP_NET_CFG_CTRL_RSS2;\n \telse\n \t\tnew_ctrl |= NFP_NET_CFG_CTRL_RSS;\n@@ -111,7 +111,7 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)\n \n \tupdate |= NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING;\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n \t\tnew_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;\n \n \tnn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl);\ndiff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\nindex b64dbaca0d..e9a16371bc 100644\n--- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\n+++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\n@@ -30,7 +30,7 @@ nfp_net_nfd3_tx_tso(struct nfp_net_txq *txq,\n \tuint64_t ol_flags;\n \tstruct nfp_net_hw *hw = txq->hw;\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_LSO_ANY) == 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) == 0)\n \t\tgoto clean_txd;\n \n \tol_flags = mb->ol_flags;\n@@ -69,7 +69,7 @@ nfp_net_nfd3_tx_cksum(struct nfp_net_txq *txq,\n \tuint64_t ol_flags;\n \tstruct nfp_net_hw *hw = txq->hw;\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_TXCSUM) == 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_TXCSUM) == 0)\n \t\treturn;\n \n \tol_flags = mb->ol_flags;\n@@ -127,8 +127,8 @@ nfp_net_nfd3_tx_vlan(struct nfp_net_txq *txq,\n {\n \tstruct nfp_net_hw *hw = txq->hw;\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0 ||\n-\t\t\t(hw->cap & NFP_NET_CFG_CTRL_TXVLAN) == 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0 ||\n+\t\t\t(hw->super.cap & NFP_NET_CFG_CTRL_TXVLAN) == 0)\n \t\treturn;\n \n \tif ((mb->ol_flags & RTE_MBUF_F_TX_VLAN) != 0) {\n@@ -278,7 +278,7 @@ nfp_net_nfd3_xmit_pkts_common(void *tx_queue,\n \t\t}\n \n \t\tif (unlikely(pkt->nb_segs > 1 &&\n-\t\t\t\t(hw->cap & NFP_NET_CFG_CTRL_GATHER) == 0)) {\n+\t\t\t\t(hw->super.cap & NFP_NET_CFG_CTRL_GATHER) == 0)) {\n \t\t\tPMD_TX_LOG(ERR, \"Multisegment packet not supported\");\n \t\t\tgoto xmit_end;\n \t\t}\ndiff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\nindex 259039964a..533099278d 100644\n--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\n+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\n@@ -23,7 +23,7 @@ nfp_net_nfdk_tx_cksum(struct nfp_net_txq *txq,\n \tuint64_t ol_flags;\n \tstruct nfp_net_hw *hw = txq->hw;\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_TXCSUM) == 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_TXCSUM) == 0)\n \t\treturn flags;\n \n \tol_flags = mb->ol_flags;\n@@ -57,7 +57,7 @@ nfp_net_nfdk_tx_tso(struct nfp_net_txq *txq,\n \n \ttxd.raw = 0;\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_LSO_ANY) == 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) == 0)\n \t\treturn txd.raw;\n \n \tol_flags = mb->ol_flags;\n@@ -146,7 +146,7 @@ nfp_net_nfdk_tx_maybe_close_block(struct nfp_net_txq *txq,\n \t\treturn -EINVAL;\n \n \t/* Count TSO descriptor */\n-\tif ((txq->hw->cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&\n+\tif ((txq->hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&\n \t\t\t(pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) != 0)\n \t\tn_descs++;\n \n@@ -322,7 +322,7 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue,\n \t\t\tnfp_net_nfdk_set_meta_data(pkt, txq, &metadata);\n \n \t\tif (unlikely(pkt->nb_segs > 1 &&\n-\t\t\t\t(hw->cap & NFP_NET_CFG_CTRL_GATHER) == 0)) {\n+\t\t\t\t(hw->super.cap & NFP_NET_CFG_CTRL_GATHER) == 0)) {\n \t\t\tPMD_TX_LOG(ERR, \"Multisegment packet not supported\");\n \t\t\tgoto xmit_end;\n \t\t}\n@@ -332,7 +332,7 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue,\n \t\t * multisegment packet, but TSO info needs to be in all of them.\n \t\t */\n \t\tdma_len = pkt->data_len;\n-\t\tif ((hw->cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&\n+\t\tif ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&\n \t\t\t\t(pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) != 0) {\n \t\t\ttype = NFDK_DESC_TX_TYPE_TSO;\n \t\t} else if (pkt->next == NULL && dma_len <= NFDK_TX_MAX_DATA_PER_HEAD) {\n@@ -405,7 +405,7 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue,\n \t\tktxds->raw = rte_cpu_to_le_64(nfp_net_nfdk_tx_cksum(txq, temp_pkt, metadata));\n \t\tktxds++;\n \n-\t\tif ((hw->cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&\n+\t\tif ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&\n \t\t\t\t(temp_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) != 0) {\n \t\t\tktxds->raw = rte_cpu_to_le_64(nfp_net_nfdk_tx_tso(txq, temp_pkt));\n \t\t\tktxds++;\ndiff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex 20940072fe..329589e90f 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -119,7 +119,7 @@ nfp_net_start(struct rte_eth_dev *dev)\n \tif ((rxmode->mq_mode & RTE_ETH_MQ_RX_RSS) != 0) {\n \t\tnfp_net_rss_config_default(dev);\n \t\tupdate |= NFP_NET_CFG_UPDATE_RSS;\n-\t\tnew_ctrl |= nfp_net_cfg_ctrl_rss(hw->cap);\n+\t\tnew_ctrl |= nfp_net_cfg_ctrl_rss(hw->super.cap);\n \t}\n \n \t/* Enable device */\n@@ -128,12 +128,12 @@ nfp_net_start(struct rte_eth_dev *dev)\n \tupdate |= NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING;\n \n \t/* Enable vxlan */\n-\tif ((hw->cap & NFP_NET_CFG_CTRL_VXLAN) != 0) {\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_VXLAN) != 0) {\n \t\tnew_ctrl |= NFP_NET_CFG_CTRL_VXLAN;\n \t\tupdate |= NFP_NET_CFG_UPDATE_VXLAN;\n \t}\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n \t\tnew_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;\n \n \tif (nfp_net_reconfig(hw, new_ctrl, update) != 0)\n@@ -580,8 +580,8 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \thw->mtu = RTE_ETHER_MTU;\n \n \t/* VLAN insertion is incompatible with LSOv2 */\n-\tif ((hw->cap & NFP_NET_CFG_CTRL_LSO2) != 0)\n-\t\thw->cap &= ~NFP_NET_CFG_CTRL_TXVLAN;\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_LSO2) != 0)\n+\t\thw->super.cap &= ~NFP_NET_CFG_CTRL_TXVLAN;\n \n \tnfp_net_log_device_information(hw);\n \n@@ -609,7 +609,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \t/* Copying mac address to DPDK eth_dev struct */\n \trte_ether_addr_copy(&hw->mac_addr, eth_dev->data->mac_addrs);\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0)\n \t\teth_dev->data->dev_flags |= RTE_ETH_DEV_NOLIVE_MAC_ADDR;\n \n \teth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;\ndiff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c\nindex 51c474275e..293d1ed53c 100644\n--- a/drivers/net/nfp/nfp_ethdev_vf.c\n+++ b/drivers/net/nfp/nfp_ethdev_vf.c\n@@ -86,7 +86,7 @@ nfp_netvf_start(struct rte_eth_dev *dev)\n \tif ((rxmode->mq_mode & RTE_ETH_MQ_RX_RSS) != 0) {\n \t\tnfp_net_rss_config_default(dev);\n \t\tupdate |= NFP_NET_CFG_UPDATE_RSS;\n-\t\tnew_ctrl |= nfp_net_cfg_ctrl_rss(hw->cap);\n+\t\tnew_ctrl |= nfp_net_cfg_ctrl_rss(hw->super.cap);\n \t}\n \n \t/* Enable device */\n@@ -94,7 +94,7 @@ nfp_netvf_start(struct rte_eth_dev *dev)\n \n \tupdate |= NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING;\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n \t\tnew_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;\n \n \tnn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl);\n@@ -314,8 +314,8 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)\n \thw->mtu = RTE_ETHER_MTU;\n \n \t/* VLAN insertion is incompatible with LSOv2 */\n-\tif ((hw->cap & NFP_NET_CFG_CTRL_LSO2) != 0)\n-\t\thw->cap &= ~NFP_NET_CFG_CTRL_TXVLAN;\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_LSO2) != 0)\n+\t\thw->super.cap &= ~NFP_NET_CFG_CTRL_TXVLAN;\n \n \tnfp_net_log_device_information(hw);\n \n@@ -341,7 +341,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)\n \t/* Copying mac address to DPDK eth_dev struct */\n \trte_ether_addr_copy(&hw->mac_addr, eth_dev->data->mac_addrs);\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0)\n \t\teth_dev->data->dev_flags |= RTE_ETH_DEV_NOLIVE_MAC_ADDR;\n \n \teth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;\ndiff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c\nindex 189f81bbb6..3cbf6bc021 100644\n--- a/drivers/net/nfp/nfp_net_common.c\n+++ b/drivers/net/nfp/nfp_net_common.c\n@@ -408,7 +408,7 @@ nfp_net_configure(struct rte_eth_dev *dev)\n \n \t/* Checking RX mode */\n \tif ((rxmode->mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) != 0 &&\n-\t\t\t(hw->cap & NFP_NET_CFG_CTRL_RSS_ANY) == 0) {\n+\t\t\t(hw->super.cap & NFP_NET_CFG_CTRL_RSS_ANY) == 0) {\n \t\tPMD_DRV_LOG(ERR, \"RSS not supported\");\n \t\treturn -EINVAL;\n \t}\n@@ -426,27 +426,29 @@ nfp_net_configure(struct rte_eth_dev *dev)\n void\n nfp_net_log_device_information(const struct nfp_net_hw *hw)\n {\n+\tuint32_t cap = hw->super.cap;\n+\n \tPMD_INIT_LOG(INFO, \"VER: %u.%u, Maximum supported MTU: %d\",\n \t\t\thw->ver.major, hw->ver.minor, hw->max_mtu);\n \n-\tPMD_INIT_LOG(INFO, \"CAP: %#x, %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\", hw->cap,\n-\t\t\thw->cap & NFP_NET_CFG_CTRL_PROMISC ? \"PROMISC \" : \"\",\n-\t\t\thw->cap & NFP_NET_CFG_CTRL_L2BC ? \"L2BCFILT \" : \"\",\n-\t\t\thw->cap & NFP_NET_CFG_CTRL_L2MC ? \"L2MCFILT \" : \"\",\n-\t\t\thw->cap & NFP_NET_CFG_CTRL_RXCSUM ? \"RXCSUM \" : \"\",\n-\t\t\thw->cap & NFP_NET_CFG_CTRL_TXCSUM ? \"TXCSUM \" : \"\",\n-\t\t\thw->cap & NFP_NET_CFG_CTRL_RXVLAN ? \"RXVLAN \" : \"\",\n-\t\t\thw->cap & NFP_NET_CFG_CTRL_TXVLAN ? \"TXVLAN \" : \"\",\n-\t\t\thw->cap & NFP_NET_CFG_CTRL_RXVLAN_V2 ? \"RXVLANv2 \" : \"\",\n-\t\t\thw->cap & NFP_NET_CFG_CTRL_TXVLAN_V2 ? \"TXVLANv2 \" : \"\",\n-\t\t\thw->cap & NFP_NET_CFG_CTRL_RXQINQ ? \"RXQINQ \" : \"\",\n-\t\t\thw->cap & NFP_NET_CFG_CTRL_SCATTER ? \"SCATTER \" : \"\",\n-\t\t\thw->cap & NFP_NET_CFG_CTRL_GATHER ? \"GATHER \" : \"\",\n-\t\t\thw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR ? \"LIVE_ADDR \" : \"\",\n-\t\t\thw->cap & NFP_NET_CFG_CTRL_LSO ? \"TSO \" : \"\",\n-\t\t\thw->cap & NFP_NET_CFG_CTRL_LSO2 ? \"TSOv2 \" : \"\",\n-\t\t\thw->cap & NFP_NET_CFG_CTRL_RSS ? \"RSS \" : \"\",\n-\t\t\thw->cap & NFP_NET_CFG_CTRL_RSS2 ? \"RSSv2 \" : \"\");\n+\tPMD_INIT_LOG(INFO, \"CAP: %#x, %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\", cap,\n+\t\t\tcap & NFP_NET_CFG_CTRL_PROMISC ? \"PROMISC \" : \"\",\n+\t\t\tcap & NFP_NET_CFG_CTRL_L2BC ? \"L2BCFILT \" : \"\",\n+\t\t\tcap & NFP_NET_CFG_CTRL_L2MC ? \"L2MCFILT \" : \"\",\n+\t\t\tcap & NFP_NET_CFG_CTRL_RXCSUM ? \"RXCSUM \" : \"\",\n+\t\t\tcap & NFP_NET_CFG_CTRL_TXCSUM ? \"TXCSUM \" : \"\",\n+\t\t\tcap & NFP_NET_CFG_CTRL_RXVLAN ? \"RXVLAN \" : \"\",\n+\t\t\tcap & NFP_NET_CFG_CTRL_TXVLAN ? \"TXVLAN \" : \"\",\n+\t\t\tcap & NFP_NET_CFG_CTRL_RXVLAN_V2 ? \"RXVLANv2 \" : \"\",\n+\t\t\tcap & NFP_NET_CFG_CTRL_TXVLAN_V2 ? \"TXVLANv2 \" : \"\",\n+\t\t\tcap & NFP_NET_CFG_CTRL_RXQINQ ? \"RXQINQ \" : \"\",\n+\t\t\tcap & NFP_NET_CFG_CTRL_SCATTER ? \"SCATTER \" : \"\",\n+\t\t\tcap & NFP_NET_CFG_CTRL_GATHER ? \"GATHER \" : \"\",\n+\t\t\tcap & NFP_NET_CFG_CTRL_LIVE_ADDR ? \"LIVE_ADDR \" : \"\",\n+\t\t\tcap & NFP_NET_CFG_CTRL_LSO ? \"TSO \" : \"\",\n+\t\t\tcap & NFP_NET_CFG_CTRL_LSO2 ? \"TSOv2 \" : \"\",\n+\t\t\tcap & NFP_NET_CFG_CTRL_RSS ? \"RSS \" : \"\",\n+\t\t\tcap & NFP_NET_CFG_CTRL_RSS2 ? \"RSSv2 \" : \"\");\n \n \tPMD_INIT_LOG(INFO, \"max_rx_queues: %u, max_tx_queues: %u\",\n \t\t\thw->max_rx_queues, hw->max_tx_queues);\n@@ -456,9 +458,9 @@ static inline void\n nfp_net_enable_rxvlan_cap(struct nfp_net_hw *hw,\n \t\tuint32_t *ctrl)\n {\n-\tif ((hw->cap & NFP_NET_CFG_CTRL_RXVLAN_V2) != 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_RXVLAN_V2) != 0)\n \t\t*ctrl |= NFP_NET_CFG_CTRL_RXVLAN_V2;\n-\telse if ((hw->cap & NFP_NET_CFG_CTRL_RXVLAN) != 0)\n+\telse if ((hw->super.cap & NFP_NET_CFG_CTRL_RXVLAN) != 0)\n \t\t*ctrl |= NFP_NET_CFG_CTRL_RXVLAN;\n }\n \n@@ -503,7 +505,7 @@ nfp_net_disable_queues(struct rte_eth_dev *dev)\n \t\t\tNFP_NET_CFG_UPDATE_RING |\n \t\t\tNFP_NET_CFG_UPDATE_MSIX;\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n \t\tnew_ctrl &= ~NFP_NET_CFG_CTRL_RINGCFG;\n \n \t/* If an error when reconfig we avoid to change hw state */\n@@ -552,7 +554,7 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev,\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tif ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&\n-\t\t\t(hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 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 \t}\n@@ -563,7 +565,7 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev,\n \tupdate = NFP_NET_CFG_UPDATE_MACADDR;\n \tctrl = hw->ctrl;\n \tif ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&\n-\t\t\t(hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) != 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 \t/* Signal the NIC about the change */\n@@ -631,7 +633,7 @@ nfp_check_offloads(struct rte_eth_dev *dev)\n \ttx_offload = dev_conf->txmode.offloads;\n \n \tif ((rx_offload & RTE_ETH_RX_OFFLOAD_IPV4_CKSUM) != 0) {\n-\t\tif ((hw->cap & NFP_NET_CFG_CTRL_RXCSUM) != 0)\n+\t\tif ((hw->super.cap & NFP_NET_CFG_CTRL_RXCSUM) != 0)\n \t\t\tctrl |= NFP_NET_CFG_CTRL_RXCSUM;\n \t}\n \n@@ -639,25 +641,25 @@ nfp_check_offloads(struct rte_eth_dev *dev)\n \t\tnfp_net_enable_rxvlan_cap(hw, &ctrl);\n \n \tif ((rx_offload & RTE_ETH_RX_OFFLOAD_QINQ_STRIP) != 0) {\n-\t\tif ((hw->cap & NFP_NET_CFG_CTRL_RXQINQ) != 0)\n+\t\tif ((hw->super.cap & NFP_NET_CFG_CTRL_RXQINQ) != 0)\n \t\t\tctrl |= NFP_NET_CFG_CTRL_RXQINQ;\n \t}\n \n \thw->mtu = dev->data->mtu;\n \n \tif ((tx_offload & RTE_ETH_TX_OFFLOAD_VLAN_INSERT) != 0) {\n-\t\tif ((hw->cap & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0)\n+\t\tif ((hw->super.cap & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0)\n \t\t\tctrl |= NFP_NET_CFG_CTRL_TXVLAN_V2;\n-\t\telse if ((hw->cap & NFP_NET_CFG_CTRL_TXVLAN) != 0)\n+\t\telse if ((hw->super.cap & NFP_NET_CFG_CTRL_TXVLAN) != 0)\n \t\t\tctrl |= NFP_NET_CFG_CTRL_TXVLAN;\n \t}\n \n \t/* L2 broadcast */\n-\tif ((hw->cap & NFP_NET_CFG_CTRL_L2BC) != 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_L2BC) != 0)\n \t\tctrl |= NFP_NET_CFG_CTRL_L2BC;\n \n \t/* L2 multicast */\n-\tif ((hw->cap & NFP_NET_CFG_CTRL_L2MC) != 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_L2MC) != 0)\n \t\tctrl |= NFP_NET_CFG_CTRL_L2MC;\n \n \t/* TX checksum offload */\n@@ -669,7 +671,7 @@ nfp_check_offloads(struct rte_eth_dev *dev)\n \t/* LSO offload */\n \tif ((tx_offload & RTE_ETH_TX_OFFLOAD_TCP_TSO) != 0 ||\n \t\t\t(tx_offload & RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO) != 0) {\n-\t\tif ((hw->cap & NFP_NET_CFG_CTRL_LSO) != 0)\n+\t\tif ((hw->super.cap & NFP_NET_CFG_CTRL_LSO) != 0)\n \t\t\tctrl |= NFP_NET_CFG_CTRL_LSO;\n \t\telse\n \t\t\tctrl |= NFP_NET_CFG_CTRL_LSO2;\n@@ -698,7 +700,7 @@ nfp_net_promisc_enable(struct rte_eth_dev *dev)\n \t\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \t}\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_PROMISC) == 0) {\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_PROMISC) == 0) {\n \t\tPMD_DRV_LOG(ERR, \"Promiscuous mode not supported\");\n \t\treturn -ENOTSUP;\n \t}\n@@ -1213,32 +1215,32 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \t/* Next should change when PF support is implemented */\n \tdev_info->max_mac_addrs = 1;\n \n-\tif ((hw->cap & (NFP_NET_CFG_CTRL_RXVLAN | NFP_NET_CFG_CTRL_RXVLAN_V2)) != 0)\n+\tif ((hw->super.cap & (NFP_NET_CFG_CTRL_RXVLAN | NFP_NET_CFG_CTRL_RXVLAN_V2)) != 0)\n \t\tdev_info->rx_offload_capa = RTE_ETH_RX_OFFLOAD_VLAN_STRIP;\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_RXQINQ) != 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_RXQINQ) != 0)\n \t\tdev_info->rx_offload_capa |= RTE_ETH_RX_OFFLOAD_QINQ_STRIP;\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_RXCSUM) != 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_RXCSUM) != 0)\n \t\tdev_info->rx_offload_capa |= RTE_ETH_RX_OFFLOAD_IPV4_CKSUM |\n \t\t\t\tRTE_ETH_RX_OFFLOAD_UDP_CKSUM |\n \t\t\t\tRTE_ETH_RX_OFFLOAD_TCP_CKSUM;\n \n-\tif ((hw->cap & (NFP_NET_CFG_CTRL_TXVLAN | NFP_NET_CFG_CTRL_TXVLAN_V2)) != 0)\n+\tif ((hw->super.cap & (NFP_NET_CFG_CTRL_TXVLAN | NFP_NET_CFG_CTRL_TXVLAN_V2)) != 0)\n \t\tdev_info->tx_offload_capa = RTE_ETH_TX_OFFLOAD_VLAN_INSERT;\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_TXCSUM) != 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_TXCSUM) != 0)\n \t\tdev_info->tx_offload_capa |= RTE_ETH_TX_OFFLOAD_IPV4_CKSUM |\n \t\t\t\tRTE_ETH_TX_OFFLOAD_UDP_CKSUM |\n \t\t\t\tRTE_ETH_TX_OFFLOAD_TCP_CKSUM;\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0) {\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0) {\n \t\tdev_info->tx_offload_capa |= RTE_ETH_TX_OFFLOAD_TCP_TSO;\n-\t\tif ((hw->cap & NFP_NET_CFG_CTRL_VXLAN) != 0)\n+\t\tif ((hw->super.cap & NFP_NET_CFG_CTRL_VXLAN) != 0)\n \t\t\tdev_info->tx_offload_capa |= RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO;\n \t}\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_GATHER) != 0)\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_GATHER) != 0)\n \t\tdev_info->tx_offload_capa |= RTE_ETH_TX_OFFLOAD_MULTI_SEGS;\n \n \tcap_extend = hw->cap_ext;\n@@ -1281,7 +1283,7 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \t\t.nb_mtu_seg_max = NFP_TX_MAX_MTU_SEG,\n \t};\n \n-\tif ((hw->cap & NFP_NET_CFG_CTRL_RSS_ANY) != 0) {\n+\tif ((hw->super.cap & NFP_NET_CFG_CTRL_RSS_ANY) != 0) {\n \t\tdev_info->rx_offload_capa |= RTE_ETH_RX_OFFLOAD_RSS_HASH;\n \n \t\tdev_info->flow_type_rss_offloads = RTE_ETH_RSS_IPV4 |\n@@ -1334,7 +1336,7 @@ nfp_net_common_init(struct rte_pci_device *pci_dev,\n \t\treturn -ENODEV;\n \n \t/* Get some of the read-only fields from the config BAR */\n-\thw->cap = nn_cfg_readl(hw, NFP_NET_CFG_CAP);\n+\thw->super.cap = nn_cfg_readl(hw, NFP_NET_CFG_CAP);\n \thw->cap_ext = nn_cfg_readl(hw, NFP_NET_CFG_CAP_WORD1);\n \thw->max_mtu = nn_cfg_readl(hw, NFP_NET_CFG_MAX_MTU);\n \thw->flbufsz = DEFAULT_FLBUF_SIZE;\n@@ -2025,14 +2027,14 @@ nfp_net_init_metadata_format(struct nfp_net_hw *hw)\n \t */\n \tif (hw->ver.major == 4) {\n \t\thw->meta_format = NFP_NET_METAFORMAT_CHAINED;\n-\t} else if ((hw->cap & NFP_NET_CFG_CTRL_CHAIN_META) != 0) {\n+\t} else if ((hw->super.cap & NFP_NET_CFG_CTRL_CHAIN_META) != 0) {\n \t\thw->meta_format = NFP_NET_METAFORMAT_CHAINED;\n \t\t/*\n-\t\t * RSS is incompatible with chained metadata. hw->cap just represents\n+\t\t * RSS is incompatible with chained metadata. hw->super.cap just represents\n \t\t * firmware's ability rather than the firmware's configuration. We decide\n-\t\t * to reduce the confusion to allow us can use hw->cap to identify RSS later.\n+\t\t * to reduce the confusion to allow us can use hw->super.cap to identify RSS later.\n \t\t */\n-\t\thw->cap &= ~NFP_NET_CFG_CTRL_RSS;\n+\t\thw->super.cap &= ~NFP_NET_CFG_CTRL_RSS;\n \t} else {\n \t\thw->meta_format = NFP_NET_METAFORMAT_SINGLE;\n \t}\ndiff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h\nindex 8a02911c45..269fb4930e 100644\n--- a/drivers/net/nfp/nfp_net_common.h\n+++ b/drivers/net/nfp/nfp_net_common.h\n@@ -112,7 +112,14 @@ struct nfp_app_fw_nic {\n \tuint8_t total_phyports;\n };\n \n+struct nfp_hw {\n+\tuint32_t cap;\n+};\n+\n struct nfp_net_hw {\n+\t/** The parent class */\n+\tstruct nfp_hw super;\n+\n \t/** Backpointer to the PF this port belongs to */\n \tstruct nfp_pf_dev *pf_dev;\n \n@@ -122,7 +129,6 @@ struct nfp_net_hw {\n \t/** Info from the firmware */\n \tuint32_t cap_ext;\n \tstruct nfp_net_fw_ver ver;\n-\tuint32_t cap;\n \tuint32_t max_mtu;\n \tuint32_t mtu;\n \tuint32_t rx_offset;\ndiff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c\nindex efdca7fccf..a0c7e0e9b5 100644\n--- a/drivers/net/nfp/nfp_rxtx.c\n+++ b/drivers/net/nfp/nfp_rxtx.c\n@@ -386,7 +386,7 @@ nfp_net_parse_meta_qinq(const struct nfp_meta_parsed *meta,\n \tstruct nfp_net_hw *hw = rxq->hw;\n \n \tif ((hw->ctrl & NFP_NET_CFG_CTRL_RXQINQ) == 0 ||\n-\t\t\t(hw->cap & NFP_NET_CFG_CTRL_RXQINQ) == 0)\n+\t\t\t(hw->super.cap & NFP_NET_CFG_CTRL_RXQINQ) == 0)\n \t\treturn;\n \n \tif (meta->vlan_layer < NFP_META_MAX_VLANS)\n", "prefixes": [ "05/25" ] }