Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 132700,
    "url": "http://patchwork.dpdk.org/api/patches/132700/?format=api",
    "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20231017054545.1692509-11-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-11-chaoyong.he@corigine.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20231017054545.1692509-11-chaoyong.he@corigine.com",
    "date": "2023-10-17T05:45:30",
    "name": "[10/25] net/nfp: change the parameter of reconfig",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "077983e50236259510b10ebb3017f53e9d7ba620",
    "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-11-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/132700/comments/",
    "check": "success",
    "checks": "http://patchwork.dpdk.org/api/patches/132700/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 95A2443186;\n\tTue, 17 Oct 2023 07:47:34 +0200 (CEST)",
            "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 20B3641151;\n\tTue, 17 Oct 2023 07:46:39 +0200 (CEST)",
            "from NAM04-BN8-obe.outbound.protection.outlook.com\n (mail-bn8nam04on2094.outbound.protection.outlook.com [40.107.100.94])\n by mails.dpdk.org (Postfix) with ESMTP id C64D941151\n for <dev@dpdk.org>; Tue, 17 Oct 2023 07:46:37 +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:34 +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:34 +0000"
        ],
        "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=RkJjPyDWJmzBXgS380cPH1LbgVhsUujmfelSg2YdMqjEJJH5/+NozqY2V3pjkbxTD0MOH9s2oe9IJLCLO1Qf+ZOg4NxUGCpwLYLID5AZZSC2ueIYfeRouSYAgtN7LPg0sxc+HOaARh+aqc6FzU1iGBlCvk6961hXuvlBdOYBwmdd2cif/PxnJaIrvNr5i/2Vhoyz2bExyIBtXsFoy/CRJjbWviu5typ12KZ0PgtvVcPww4l6AIf+qNeG1CWUcVnR2ZWv+6fAcvVNtcoJx4X6NKi4M0k2RIS07sI85u9oqZsZF7LpVxnWvObhB9KX1o0YDvyeUknAdEaW7b48qwhZWg==",
        "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=cXI8f+QjUf34NnydXs19wBpplD3yjgudUgFTkCGg9Ec=;\n b=X55wR+SHBYYZmwHhcVLxdGvX73yVs43PzG+nqwjSpTneBGMbouA5gy+W4w0XWcAN+ycsWDrtJcLMLIIalcN8E3wVyZlMt2kTeUlIOrh4jz29inf8k/gTL3MsRvJeMQp2dRYvmr37Bjt3/lbMiPJVhBEodiOK+XiLCW85nUXv8DWYJkgit1r5vYeAGOa4PkF7DqF3+DzKpGMOwZmfD1dH9j4ApYFmyLB+palA+cy5vQ02w6AD50AzLEZQBYEKwSC7BhEeEQlKdHS1yNdlj0aWvwvyWpvOVMLlAfGWj+Ox3Faj21Uid9UDjsGhUdodSvzr/NT1BZKghGeR/vbu/KBGNg==",
        "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=cXI8f+QjUf34NnydXs19wBpplD3yjgudUgFTkCGg9Ec=;\n b=BYm6ArF8Er+qZ9UXtvFkoheRyEcoXnnayMRxkKGeaWYEvhDrsK1n7RF2usP7aZ4DSMNRZRZxAKDFbCFQpG4OK+125uYy/0jbfqwIYwKL8JuNjFPV5VTCqA9aiG/YRYqhbYePz2n0ycZlFP/sCE4QlknNu71tcwzFkMfs1IsQPsY=",
        "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 10/25] net/nfp: change the parameter of reconfig",
        "Date": "Tue, 17 Oct 2023 13:45:30 +0800",
        "Message-Id": "<20231017054545.1692509-11-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": "7d24d04b-8e24-42f8-a217-08dbced46b47",
        "X-MS-Exchange-SenderADCheck": "1",
        "X-MS-Exchange-AntiSpam-Relay": "0",
        "X-Microsoft-Antispam": "BCL:0;",
        "X-Microsoft-Antispam-Message-Info": "\n CaLsRxhrdGzH9T+c67d/G4yLAQKnENh2qYZLbebGdVYXah/tFr3j7hEWBTe2afZ+YJ2EQoSVzkBF3POtyWQAZEfF8S0LLAeYDVVxdlhCidPRwsXZiPm6uwAe/IdsPhwJbR8zNXGJZttclNWyx5Xi8rQODJfkNzjJZ1emFfJcbF92xrLUQju7BRhaowq5jK35FVtZhGu4roBLEBVejC8gn536FFVZTNeWRFTXoS4Cp1WDCsevGSUY6+8SgBIoa7rqVF26GaeUx8g2WI4k6oSaPuIxJLihaZs/e+xmlRRzkR5RX8x6W0eIxcOT3t0t1sXDet0ROfuqgM0BpgVmHjfo72X8gSanDMcWpb03Ro1nUYoFk7j3bSGVDkF2NqZ8Z89Fm/LxhGIAPQYBSJszmZFhEzva+psiq/EX3yHmkLK/p/eCbzKbKNQ4odF7t2+GoklU9PgkmhNCxacU5uMmfGowoCgoGrLwyY4o0ztVjtaROQkLOm3xkPUc+GXZwquUlveieZCwmdaVWnOSFZQmeelHrqYeKyXJo2YRUAECAc89aB72j4NylYRiml0t9UhLogk5aHv6CsvFF0n1JyXRmQQgFlW2YnlzSYOLW3TxOpa3Gku5kTO6GMmTWULX7mVYYJor5ADdBDPQDHGzfHaAuP76ywxz0kPlcAtSftlZO5z6QWY=",
        "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 BePKJ+hzdMiPqjHlVJ/Wq246CzlAMPx04tp97uQin34ldDC3y5EJhy6ClkDMyOmZv63kkn66Vi2JiaOogMIIkje3ID06bty3sXLZRz92rFM8+LSA4RqIV/23BEmNvM4EL5X3k971XwBSUWtFy1ICe/+dos1eyIQr6BkNSAnl/X7bUJwoBvMXvtilOwtUIerCmGaYoCC9EKyCG+iZOx/gerYbdZsptnPRRPkWIUCZBJK6I6EaVcn6zAyxoCB6aXtgT4/gNyvqtXLYJigv9rlmfaY0l1IaXnmyn9fm9vF7TVpJZmjYdxrv4Vy2ObzKMJ8iflvr7n9g0z7ZUnx5CC2jwF+a79v+UAmGGoSsRDJdnhNYzuVNG0IepPFQdlZ5xk0Kb6Kt/mxsPCYqRNKmOvH/kFyBmr7lhy2wcxqXRvZfxB7cP9YJDy3cwM1EjwOXkqgpDxyRXMZzFpH30ZXbgVxTvSHjbaAVwj+6UN6eUvSNw8Wn8jMokBxi44zr3tEogENag1IJAZmmdRy6ROS3DgkgVRoYhf7Teb1aijaR3z6myTLLDBztKfmmtYuB3AkwNh+sVsa0813kd9JTYAljRKcwu1B8IWC6DwY87LN+FlhgcRVD280jHL4CZEqNZRbysvgAz2emHa3DQ2D2knAUjXYzpRbRTNtrxXcpFza+6uWj+uPKObV0pIhFIZ6DidIasqk7tj1XqBUTksp3YKxlka0bEkGevWZXy9PK7rK09lRWK9M3YG4J7kS1auQKn+vgXcoaXt8Np4uqFL7ajk89Tx7hMOlBnqLJs1wGwFxEHOzRdai6Cjb82hU8RoYoe8eGnCv8UbcW+/PZyvRxr0+YOrTuy4jOSWpDj/xhBQalN5TUz4E6n61M6WANOn+N3uJzRYxvR6BZMNRo5NFTT9P8SSo5784z1+S4+b7Sq4igphof9S9ca1VrTuECRhdX5lMX2cEcrFN1yairEkbrtKA7eDlNtHhrYAaTipnQ4oTKswW/kiaWGcs1iCm1hEPgvXAaeFBccgJH2Bqzfo9s1gMzWZeQ0Iwf2jPyZMMTRkoZu3+D9qAKwZ+FFzwimtLw1ZzS6S6FLwZT2tWGhbwIB+udTomwv8iqU5vzzjeER04BOlQi+7Klp28vrg/kzfreUU6LJom+FblRgGxi32pDhracTFqA/crrxQqxwlWuQjjh1ejCxMbnkLck5k2RRZbuHxwId5ocj6Us0nY6XAhGLEnNZD9Xs+Ht8gZI7xwVWcnr4Gdl5mgTzbGIHvbTyey0dTQQmAbjM6y1gu/sh/ycXnvT/2wbfqs4xRONFx3yTE8kqNi/zbgThXksPynSuJCojop7YfO5iiWuBA6JVTwlQkIy2qEfD/E/g8J6PKIs3JITHSYE0MrHePqgdRck2mf2WdipbqeZhYbgNps1znhhVo6/39CrNLXPYVbag2uv0q9AYzySdLokuHuKuiD9tF3f1dcnXLOErPgIYNolBuF9kc+DdTki/CeXczp28FKbTGPv9TUsOzo2FCfam3QQ5lpRkp+Aewo9nZq7SBzdRwHH9PEpl2KDpvlipei9o0ssepYVU2ehYyqXE/Recgsb2swyin6DWYG7TsAkwKUEpaAETlrjQWSHvg==",
        "X-OriginatorOrg": "corigine.com",
        "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 7d24d04b-8e24-42f8-a217-08dbced46b47",
        "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:34.8395 (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 quFDrp1upNYZTXyU82c9JpytBmvNza7K4cgv1w6dCBSGL3Nsa9inqcLUUaFGnRx3RQMfgo2PC6G9DEf/nv4oDP7C4ZOYUKIdyEkVJcqscX0=",
        "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 'reconfig_lock' data field into the super class, also change\nthe parameter of the related APIs, prepare for the upcoming common\nlibrary.\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 |  50 +++++----\n drivers/net/nfp/nfp_ethdev.c        |  32 +++---\n drivers/net/nfp/nfp_ethdev_vf.c     |  20 ++--\n drivers/net/nfp/nfp_net_common.c    | 155 +++++++++++++++-------------\n drivers/net/nfp/nfp_net_common.h    |   5 +-\n 5 files changed, 144 insertions(+), 118 deletions(-)",
    "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c\nindex 0fc1342740..a68b63f4ee 100644\n--- a/drivers/net/nfp/flower/nfp_flower.c\n+++ b/drivers/net/nfp/flower/nfp_flower.c\n@@ -52,27 +52,29 @@ nfp_pf_repr_disable_queues(struct rte_eth_dev *dev)\n {\n \tuint32_t update;\n \tuint32_t new_ctrl;\n-\tstruct nfp_net_hw *hw;\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-\thw = repr->app_fw_flower->pf_hw;\n+\tnet_hw = repr->app_fw_flower->pf_hw;\n+\thw = &net_hw->super;\n \n-\tnn_cfg_writeq(&hw->super, NFP_NET_CFG_TXRS_ENABLE, 0);\n-\tnn_cfg_writeq(&hw->super, NFP_NET_CFG_RXRS_ENABLE, 0);\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->super.ctrl & ~NFP_NET_CFG_CTRL_ENABLE;\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->super.cap & NFP_NET_CFG_CTRL_RINGCFG)\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_net_reconfig(hw, new_ctrl, update) != 0)\n+\tif (nfp_reconfig(hw, new_ctrl, update) < 0)\n \t\treturn;\n \n-\thw->super.ctrl = new_ctrl;\n+\thw->ctrl = new_ctrl;\n }\n \n int\n@@ -80,13 +82,15 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)\n {\n \tint ret;\n \tuint16_t i;\n+\tstruct nfp_hw *hw;\n \tuint32_t new_ctrl;\n \tuint32_t update = 0;\n-\tstruct nfp_net_hw *hw;\n+\tstruct nfp_net_hw *net_hw;\n \tstruct nfp_flower_representor *repr;\n \n \trepr = dev->data->dev_private;\n-\thw = repr->app_fw_flower->pf_hw;\n+\tnet_hw = repr->app_fw_flower->pf_hw;\n+\thw = &net_hw->super;\n \n \t/* Disabling queues just in case... */\n \tnfp_pf_repr_disable_queues(dev);\n@@ -97,11 +101,11 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)\n \tnew_ctrl = nfp_check_offloads(dev);\n \n \t/* Writing configuration parameters in the device */\n-\tnfp_net_params_setup(hw);\n+\tnfp_net_params_setup(net_hw);\n \n \tupdate |= NFP_NET_CFG_UPDATE_RSS;\n \n-\tif ((hw->super.cap & NFP_NET_CFG_CTRL_RSS2) != 0)\n+\tif ((hw->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,19 +115,19 @@ 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->super.cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n \t\tnew_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;\n \n-\tnn_cfg_writel(&hw->super, NFP_NET_CFG_CTRL, new_ctrl);\n+\tnn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl);\n \n \t/* If an error when reconfig we avoid to change hw state */\n-\tret = nfp_net_reconfig(hw, new_ctrl, update);\n+\tret = nfp_reconfig(hw, new_ctrl, update);\n \tif (ret != 0) {\n \t\tPMD_INIT_LOG(ERR, \"Failed to reconfig PF vnic\");\n \t\treturn -EIO;\n \t}\n \n-\thw->super.ctrl = new_ctrl;\n+\thw->ctrl = new_ctrl;\n \n \t/* Setup the freelist ring */\n \tret = nfp_net_rx_freelist_setup(dev);\n@@ -376,7 +380,7 @@ nfp_flower_init_vnic_common(struct nfp_net_hw *hw,\n \t\t\tvnic_type, hw->max_rx_queues, hw->max_tx_queues);\n \n \t/* Initializing spinlock for reconfigs */\n-\trte_spinlock_init(&hw->reconfig_lock);\n+\trte_spinlock_init(&hw->super.reconfig_lock);\n \n \treturn 0;\n }\n@@ -692,14 +696,16 @@ nfp_flower_cleanup_ctrl_vnic(struct nfp_net_hw *hw)\n }\n \n static int\n-nfp_flower_start_ctrl_vnic(struct nfp_net_hw *hw)\n+nfp_flower_start_ctrl_vnic(struct nfp_net_hw *net_hw)\n {\n \tint ret;\n \tuint32_t update;\n \tuint32_t new_ctrl;\n+\tstruct nfp_hw *hw;\n \tstruct rte_eth_dev *dev;\n \n-\tdev = hw->eth_dev;\n+\tdev = net_hw->eth_dev;\n+\thw = &net_hw->super;\n \n \t/* Disabling queues just in case... */\n \tnfp_net_disable_queues(dev);\n@@ -708,7 +714,7 @@ nfp_flower_start_ctrl_vnic(struct nfp_net_hw *hw)\n \tnfp_net_enable_queues(dev);\n \n \t/* Writing configuration parameters in the device */\n-\tnfp_net_params_setup(hw);\n+\tnfp_net_params_setup(net_hw);\n \n \tnew_ctrl = NFP_NET_CFG_CTRL_ENABLE;\n \tupdate = NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING |\n@@ -717,13 +723,13 @@ nfp_flower_start_ctrl_vnic(struct nfp_net_hw *hw)\n \trte_wmb();\n \n \t/* If an error when reconfig we avoid to change hw state */\n-\tret = nfp_net_reconfig(hw, new_ctrl, update);\n+\tret = nfp_reconfig(hw, new_ctrl, update);\n \tif (ret != 0) {\n \t\tPMD_INIT_LOG(ERR, \"Failed to reconfig ctrl vnic\");\n \t\treturn -EIO;\n \t}\n \n-\thw->super.ctrl = new_ctrl;\n+\thw->ctrl = new_ctrl;\n \n \t/* Setup the freelist ring */\n \tret = nfp_net_rx_freelist_setup(dev);\ndiff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex 6a4455e50f..2f8df1c936 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -45,12 +45,13 @@ nfp_net_start(struct rte_eth_dev *dev)\n {\n \tint ret;\n \tuint16_t i;\n+\tstruct nfp_hw *hw;\n \tuint32_t new_ctrl;\n \tuint32_t update = 0;\n \tuint32_t cap_extend;\n \tuint32_t intr_vector;\n-\tstruct nfp_net_hw *hw;\n \tuint32_t ctrl_extend = 0;\n+\tstruct nfp_net_hw *net_hw;\n \tstruct nfp_pf_dev *pf_dev;\n \tstruct rte_eth_conf *dev_conf;\n \tstruct rte_eth_rxmode *rxmode;\n@@ -58,9 +59,10 @@ nfp_net_start(struct rte_eth_dev *dev)\n \tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n \tstruct rte_intr_handle *intr_handle = pci_dev->intr_handle;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tpf_dev = NFP_NET_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n \tapp_fw_nic = NFP_PRIV_TO_APP_FW_NIC(pf_dev->app_fw_priv);\n+\thw = &net_hw->super;\n \n \t/* Disabling queues just in case... */\n \tnfp_net_disable_queues(dev);\n@@ -100,9 +102,9 @@ nfp_net_start(struct rte_eth_dev *dev)\n \t}\n \n \t/* Checking MTU set */\n-\tif (dev->data->mtu > hw->flbufsz) {\n+\tif (dev->data->mtu > net_hw->flbufsz) {\n \t\tPMD_INIT_LOG(ERR, \"MTU (%u) can't be larger than the current NFP_FRAME_SIZE (%u)\",\n-\t\t\t\tdev->data->mtu, hw->flbufsz);\n+\t\t\t\tdev->data->mtu, net_hw->flbufsz);\n \t\treturn -ERANGE;\n \t}\n \n@@ -111,7 +113,7 @@ nfp_net_start(struct rte_eth_dev *dev)\n \tnew_ctrl = nfp_check_offloads(dev);\n \n \t/* Writing configuration parameters in the device */\n-\tnfp_net_params_setup(hw);\n+\tnfp_net_params_setup(net_hw);\n \n \tdev_conf = &dev->data->dev_conf;\n \trxmode = &dev_conf->rxmode;\n@@ -119,7 +121,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->super.cap);\n+\t\tnew_ctrl |= nfp_net_cfg_ctrl_rss(hw->cap);\n \t}\n \n \t/* Enable device */\n@@ -128,19 +130,19 @@ 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->super.cap & NFP_NET_CFG_CTRL_VXLAN) != 0) {\n+\tif ((hw->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->super.cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n+\tif ((hw->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+\tif (nfp_reconfig(hw, new_ctrl, update) != 0)\n \t\treturn -EIO;\n \n \t/* Enable packet type offload by extend ctrl word1. */\n-\tcap_extend = hw->cap_ext;\n+\tcap_extend = net_hw->cap_ext;\n \tif ((cap_extend & NFP_NET_CFG_CTRL_PKT_TYPE) != 0)\n \t\tctrl_extend = NFP_NET_CFG_CTRL_PKT_TYPE;\n \n@@ -149,7 +151,7 @@ nfp_net_start(struct rte_eth_dev *dev)\n \t\t\t\t| NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP;\n \n \tupdate = NFP_NET_CFG_UPDATE_GEN;\n-\tif (nfp_net_ext_reconfig(hw, ctrl_extend, update) != 0)\n+\tif (nfp_net_ext_reconfig(net_hw, ctrl_extend, update) != 0)\n \t\treturn -EIO;\n \n \t/*\n@@ -163,11 +165,11 @@ nfp_net_start(struct rte_eth_dev *dev)\n \n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY)\n \t\t/* Configure the physical port up */\n-\t\tnfp_eth_set_configured(hw->cpp, hw->nfp_idx, 1);\n+\t\tnfp_eth_set_configured(net_hw->cpp, net_hw->nfp_idx, 1);\n \telse\n-\t\tnfp_eth_set_configured(dev->process_private, hw->nfp_idx, 1);\n+\t\tnfp_eth_set_configured(dev->process_private, net_hw->nfp_idx, 1);\n \n-\thw->super.ctrl = new_ctrl;\n+\thw->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;\n@@ -586,7 +588,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \tnfp_net_log_device_information(hw);\n \n \t/* Initializing spinlock for reconfigs */\n-\trte_spinlock_init(&hw->reconfig_lock);\n+\trte_spinlock_init(&hw->super.reconfig_lock);\n \n \t/* Allocating memory for mac addr */\n \teth_dev->data->mac_addrs = rte_zmalloc(\"mac_addr\", RTE_ETHER_ADDR_LEN, 0);\ndiff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c\nindex 7fb2a3d378..6ead7e02b8 100644\n--- a/drivers/net/nfp/nfp_ethdev_vf.c\n+++ b/drivers/net/nfp/nfp_ethdev_vf.c\n@@ -32,10 +32,11 @@ nfp_netvf_start(struct rte_eth_dev *dev)\n {\n \tint ret;\n \tuint16_t i;\n+\tstruct nfp_hw *hw;\n \tuint32_t new_ctrl;\n \tuint32_t update = 0;\n \tuint32_t intr_vector;\n-\tstruct nfp_net_hw *hw;\n+\tstruct nfp_net_hw *net_hw;\n \tstruct rte_eth_conf *dev_conf;\n \tstruct rte_eth_rxmode *rxmode;\n \tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n@@ -77,8 +78,9 @@ nfp_netvf_start(struct rte_eth_dev *dev)\n \tnew_ctrl = nfp_check_offloads(dev);\n \n \t/* Writing configuration parameters in the device */\n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\tnfp_net_params_setup(hw);\n+\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = &net_hw->super;\n+\tnfp_net_params_setup(net_hw);\n \n \tdev_conf = &dev->data->dev_conf;\n \trxmode = &dev_conf->rxmode;\n@@ -86,7 +88,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->super.cap);\n+\t\tnew_ctrl |= nfp_net_cfg_ctrl_rss(hw->cap);\n \t}\n \n \t/* Enable device */\n@@ -94,11 +96,11 @@ 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->super.cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n \t\tnew_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;\n \n-\tnn_cfg_writel(&hw->super, NFP_NET_CFG_CTRL, new_ctrl);\n-\tif (nfp_net_reconfig(hw, new_ctrl, update) != 0)\n+\tnn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl);\n+\tif (nfp_reconfig(hw, new_ctrl, update) != 0)\n \t\treturn -EIO;\n \n \t/*\n@@ -110,7 +112,7 @@ nfp_netvf_start(struct rte_eth_dev *dev)\n \t\tgoto error;\n \t}\n \n-\thw->super.ctrl = new_ctrl;\n+\thw->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;\n@@ -320,7 +322,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)\n \tnfp_net_log_device_information(hw);\n \n \t/* Initializing spinlock for reconfigs */\n-\trte_spinlock_init(&hw->reconfig_lock);\n+\trte_spinlock_init(&hw->super.reconfig_lock);\n \n \t/* Allocating memory for mac addr */\n \teth_dev->data->mac_addrs = rte_zmalloc(\"mac_addr\", RTE_ETHER_ADDR_LEN, 0);\ndiff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c\nindex 4f830f2a2a..94d9072740 100644\n--- a/drivers/net/nfp/nfp_net_common.c\n+++ b/drivers/net/nfp/nfp_net_common.c\n@@ -199,7 +199,7 @@ nfp_net_notify_port_speed(struct nfp_net_hw *hw,\n #define FW_VER_LEN        32\n \n static int\n-__nfp_net_reconfig(struct nfp_net_hw *hw,\n+nfp_reconfig_real(struct nfp_hw *hw,\n \t\tuint32_t update)\n {\n \tuint32_t cnt;\n@@ -207,14 +207,14 @@ __nfp_net_reconfig(struct nfp_net_hw *hw,\n \tstruct timespec wait;\n \n \tPMD_DRV_LOG(DEBUG, \"Writing to the configuration queue (%p)...\",\n-\t\t\thw->super.qcp_cfg);\n+\t\t\thw->qcp_cfg);\n \n-\tif (hw->super.qcp_cfg == NULL) {\n+\tif (hw->qcp_cfg == NULL) {\n \t\tPMD_DRV_LOG(ERR, \"Bad configuration queue pointer\");\n \t\treturn -ENXIO;\n \t}\n \n-\tnfp_qcp_ptr_add(hw->super.qcp_cfg, NFP_QCP_WRITE_PTR, 1);\n+\tnfp_qcp_ptr_add(hw->qcp_cfg, NFP_QCP_WRITE_PTR, 1);\n \n \twait.tv_sec = 0;\n \twait.tv_nsec = 1000000; /* 1ms */\n@@ -223,7 +223,7 @@ __nfp_net_reconfig(struct nfp_net_hw *hw,\n \n \t/* Poll update field, waiting for NFP to ack the config */\n \tfor (cnt = 0; ; cnt++) {\n-\t\tnew = nn_cfg_readl(&hw->super, NFP_NET_CFG_UPDATE);\n+\t\tnew = nn_cfg_readl(hw, NFP_NET_CFG_UPDATE);\n \t\tif (new == 0)\n \t\t\tbreak;\n \n@@ -263,7 +263,7 @@ __nfp_net_reconfig(struct nfp_net_hw *hw,\n  *   - (-EIO) if I/O err and fail to reconfigure the device.\n  */\n int\n-nfp_net_reconfig(struct nfp_net_hw *hw,\n+nfp_reconfig(struct nfp_hw *hw,\n \t\tuint32_t ctrl,\n \t\tuint32_t update)\n {\n@@ -271,12 +271,12 @@ nfp_net_reconfig(struct nfp_net_hw *hw,\n \n \trte_spinlock_lock(&hw->reconfig_lock);\n \n-\tnn_cfg_writel(&hw->super, NFP_NET_CFG_CTRL, ctrl);\n-\tnn_cfg_writel(&hw->super, NFP_NET_CFG_UPDATE, update);\n+\tnn_cfg_writel(hw, NFP_NET_CFG_CTRL, ctrl);\n+\tnn_cfg_writel(hw, NFP_NET_CFG_UPDATE, update);\n \n \trte_wmb();\n \n-\tret = __nfp_net_reconfig(hw, update);\n+\tret = nfp_reconfig_real(hw, update);\n \n \trte_spinlock_unlock(&hw->reconfig_lock);\n \n@@ -313,16 +313,16 @@ nfp_net_ext_reconfig(struct nfp_net_hw *hw,\n {\n \tint ret;\n \n-\trte_spinlock_lock(&hw->reconfig_lock);\n+\trte_spinlock_lock(&hw->super.reconfig_lock);\n \n \tnn_cfg_writel(&hw->super, NFP_NET_CFG_CTRL_WORD1, ctrl_ext);\n \tnn_cfg_writel(&hw->super, NFP_NET_CFG_UPDATE, update);\n \n \trte_wmb();\n \n-\tret = __nfp_net_reconfig(hw, update);\n+\tret = nfp_reconfig_real(&hw->super, update);\n \n-\trte_spinlock_unlock(&hw->reconfig_lock);\n+\trte_spinlock_unlock(&hw->super.reconfig_lock);\n \n \tif (ret != 0) {\n \t\tPMD_DRV_LOG(ERR, \"Error nft net ext reconfig: ctrl_ext=%#08x update=%#08x\",\n@@ -354,16 +354,16 @@ nfp_net_mbox_reconfig(struct nfp_net_hw *hw,\n \n \tmbox = hw->tlv_caps.mbox_off;\n \n-\trte_spinlock_lock(&hw->reconfig_lock);\n+\trte_spinlock_lock(&hw->super.reconfig_lock);\n \n \tnn_cfg_writeq(&hw->super, mbox + NFP_NET_CFG_MBOX_SIMPLE_CMD, mbox_cmd);\n \tnn_cfg_writel(&hw->super, NFP_NET_CFG_UPDATE, NFP_NET_CFG_UPDATE_MBOX);\n \n \trte_wmb();\n \n-\tret = __nfp_net_reconfig(hw, NFP_NET_CFG_UPDATE_MBOX);\n+\tret = nfp_reconfig_real(&hw->super, NFP_NET_CFG_UPDATE_MBOX);\n \n-\trte_spinlock_unlock(&hw->reconfig_lock);\n+\trte_spinlock_unlock(&hw->super.reconfig_lock);\n \n \tif (ret != 0) {\n \t\tPMD_DRV_LOG(ERR, \"Error nft net mailbox reconfig: mbox=%#08x update=%#08x\",\n@@ -494,26 +494,28 @@ nfp_net_disable_queues(struct rte_eth_dev *dev)\n {\n \tuint32_t update;\n \tuint32_t new_ctrl;\n-\tstruct nfp_net_hw *hw;\n+\tstruct nfp_hw *hw;\n+\tstruct nfp_net_hw *net_hw;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = &net_hw->super;\n \n-\tnn_cfg_writeq(&hw->super, NFP_NET_CFG_TXRS_ENABLE, 0);\n-\tnn_cfg_writeq(&hw->super, NFP_NET_CFG_RXRS_ENABLE, 0);\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->super.ctrl & ~NFP_NET_CFG_CTRL_ENABLE;\n+\tnew_ctrl = hw->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 \n-\tif ((hw->super.cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n+\tif ((hw->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-\tif (nfp_net_reconfig(hw, new_ctrl, update) != 0)\n+\tif (nfp_reconfig(hw, new_ctrl, update) != 0)\n \t\treturn;\n \n-\thw->super.ctrl = new_ctrl;\n+\thw->ctrl = new_ctrl;\n }\n \n void\n@@ -551,26 +553,28 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev,\n {\n \tuint32_t ctrl;\n \tuint32_t update;\n-\tstruct nfp_net_hw *hw;\n+\tstruct nfp_hw *hw;\n+\tstruct nfp_net_hw *net_hw;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\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+\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\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 \t\tPMD_DRV_LOG(ERR, \"MAC address unable to change when port enabled\");\n \t\treturn -EBUSY;\n \t}\n \n \t/* Writing new MAC to the specific port BAR address */\n-\tnfp_net_write_mac(hw, (uint8_t *)mac_addr);\n+\tnfp_net_write_mac(net_hw, (uint8_t *)mac_addr);\n \n \tupdate = NFP_NET_CFG_UPDATE_MACADDR;\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+\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\tctrl |= NFP_NET_CFG_CTRL_LIVE_ADDR;\n \n \t/* Signal the NIC about the change */\n-\tif (nfp_net_reconfig(hw, ctrl, update) != 0) {\n+\tif (nfp_reconfig(hw, ctrl, update) != 0) {\n \t\tPMD_DRV_LOG(ERR, \"MAC address update failed\");\n \t\treturn -EIO;\n \t}\n@@ -689,36 +693,38 @@ int\n nfp_net_promisc_enable(struct rte_eth_dev *dev)\n {\n \tint ret;\n+\tuint32_t update;\n \tuint32_t new_ctrl;\n-\tuint32_t update = 0;\n-\tstruct nfp_net_hw *hw;\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\thw = repr->app_fw_flower->pf_hw;\n+\t\tnet_hw = repr->app_fw_flower->pf_hw;\n \t} else {\n-\t\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\t\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \t}\n \n-\tif ((hw->super.cap & NFP_NET_CFG_CTRL_PROMISC) == 0) {\n+\thw = &net_hw->super;\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_PROMISC) == 0) {\n \t\tPMD_DRV_LOG(ERR, \"Promiscuous mode not supported\");\n \t\treturn -ENOTSUP;\n \t}\n \n-\tif ((hw->super.ctrl & NFP_NET_CFG_CTRL_PROMISC) != 0) {\n+\tif ((hw->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->super.ctrl | NFP_NET_CFG_CTRL_PROMISC;\n+\tnew_ctrl = hw->ctrl | NFP_NET_CFG_CTRL_PROMISC;\n \tupdate = NFP_NET_CFG_UPDATE_GEN;\n \n-\tret = nfp_net_reconfig(hw, new_ctrl, update);\n+\tret = nfp_reconfig(hw, new_ctrl, update);\n \tif (ret != 0)\n \t\treturn ret;\n \n-\thw->super.ctrl = new_ctrl;\n+\thw->ctrl = new_ctrl;\n \n \treturn 0;\n }\n@@ -727,25 +733,27 @@ int\n nfp_net_promisc_disable(struct rte_eth_dev *dev)\n {\n \tint ret;\n+\tuint32_t update;\n \tuint32_t new_ctrl;\n-\tuint32_t update = 0;\n-\tstruct nfp_net_hw *hw;\n+\tstruct nfp_hw *hw;\n+\tstruct nfp_net_hw *net_hw;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = &net_hw->super;\n \n-\tif ((hw->super.ctrl & NFP_NET_CFG_CTRL_PROMISC) == 0) {\n+\tif ((hw->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->super.ctrl & ~NFP_NET_CFG_CTRL_PROMISC;\n+\tnew_ctrl = hw->ctrl & ~NFP_NET_CFG_CTRL_PROMISC;\n \tupdate = NFP_NET_CFG_UPDATE_GEN;\n \n-\tret = nfp_net_reconfig(hw, new_ctrl, update);\n+\tret = nfp_reconfig(hw, new_ctrl, update);\n \tif (ret != 0)\n \t\treturn ret;\n \n-\thw->super.ctrl = new_ctrl;\n+\thw->ctrl = new_ctrl;\n \n \treturn 0;\n }\n@@ -1554,17 +1562,20 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev,\n \tint ret;\n \tuint32_t update;\n \tuint32_t new_ctrl;\n+\tstruct nfp_hw *hw;\n \tuint64_t rx_offload;\n-\tstruct nfp_net_hw *hw;\n+\tstruct nfp_net_hw *net_hw;\n \tuint32_t rxvlan_ctrl = 0;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = &net_hw->super;\n+\n \trx_offload = dev->data->dev_conf.rxmode.offloads;\n-\tnew_ctrl = hw->super.ctrl;\n+\tnew_ctrl = hw->ctrl;\n \n \t/* VLAN stripping setting */\n \tif ((mask & RTE_ETH_VLAN_STRIP_MASK) != 0) {\n-\t\tnfp_net_enable_rxvlan_cap(hw, &rxvlan_ctrl);\n+\t\tnfp_net_enable_rxvlan_cap(net_hw, &rxvlan_ctrl);\n \t\tif ((rx_offload & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) != 0)\n \t\t\tnew_ctrl |= rxvlan_ctrl;\n \t\telse\n@@ -1579,16 +1590,16 @@ 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->super.ctrl)\n+\tif (new_ctrl == hw->ctrl)\n \t\treturn 0;\n \n \tupdate = NFP_NET_CFG_UPDATE_GEN;\n \n-\tret = nfp_net_reconfig(hw, new_ctrl, update);\n+\tret = nfp_reconfig(hw, new_ctrl, update);\n \tif (ret != 0)\n \t\treturn ret;\n \n-\thw->super.ctrl = new_ctrl;\n+\thw->ctrl = new_ctrl;\n \n \treturn 0;\n }\n@@ -1658,10 +1669,13 @@ nfp_net_reta_update(struct rte_eth_dev *dev,\n {\n \tint ret;\n \tuint32_t update;\n-\tstruct nfp_net_hw *hw;\n+\tstruct nfp_hw *hw;\n+\tstruct nfp_net_hw *net_hw;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\tif ((hw->super.ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)\n+\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = &net_hw->super;\n+\n+\tif ((hw->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@@ -1670,7 +1684,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->super.ctrl, update) != 0)\n+\tif (nfp_reconfig(hw, hw->ctrl, update) != 0)\n \t\treturn -EIO;\n \n \treturn 0;\n@@ -1789,14 +1803,16 @@ nfp_net_rss_hash_update(struct rte_eth_dev *dev,\n {\n \tuint32_t update;\n \tuint64_t rss_hf;\n-\tstruct nfp_net_hw *hw;\n+\tstruct nfp_hw *hw;\n+\tstruct nfp_net_hw *net_hw;\n \n-\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tnet_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\thw = &net_hw->super;\n \n \trss_hf = rss_conf->rss_hf;\n \n \t/* Checking if RSS is enabled */\n-\tif ((hw->super.ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0) {\n+\tif ((hw->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@@ -1814,7 +1830,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->super.ctrl, update) != 0)\n+\tif (nfp_reconfig(hw, hw->ctrl, update) != 0)\n \t\treturn -EIO;\n \n \treturn 0;\n@@ -1969,31 +1985,32 @@ nfp_net_close_tx_queue(struct rte_eth_dev *dev)\n }\n \n int\n-nfp_net_set_vxlan_port(struct nfp_net_hw *hw,\n+nfp_net_set_vxlan_port(struct nfp_net_hw *net_hw,\n \t\tsize_t idx,\n \t\tuint16_t port)\n {\n \tint ret;\n \tuint32_t i;\n+\tstruct nfp_hw *hw = &net_hw->super;\n \n \tif (idx >= NFP_NET_N_VXLAN_PORTS) {\n \t\tPMD_DRV_LOG(ERR, \"The idx value is out of range.\");\n \t\treturn -ERANGE;\n \t}\n \n-\thw->vxlan_ports[idx] = port;\n+\tnet_hw->vxlan_ports[idx] = port;\n \n \tfor (i = 0; i < NFP_NET_N_VXLAN_PORTS; i += 2) {\n-\t\tnn_cfg_writel(&hw->super, NFP_NET_CFG_VXLAN_PORT + i * sizeof(port),\n-\t\t\t\t(hw->vxlan_ports[i + 1] << 16) | hw->vxlan_ports[i]);\n+\t\tnn_cfg_writel(hw, NFP_NET_CFG_VXLAN_PORT + i * sizeof(port),\n+\t\t\t\t(net_hw->vxlan_ports[i + 1] << 16) | net_hw->vxlan_ports[i]);\n \t}\n \n \trte_spinlock_lock(&hw->reconfig_lock);\n \n-\tnn_cfg_writel(&hw->super, NFP_NET_CFG_UPDATE, NFP_NET_CFG_UPDATE_VXLAN);\n+\tnn_cfg_writel(hw, NFP_NET_CFG_UPDATE, NFP_NET_CFG_UPDATE_VXLAN);\n \trte_wmb();\n \n-\tret = __nfp_net_reconfig(hw, NFP_NET_CFG_UPDATE_VXLAN);\n+\tret = nfp_reconfig_real(hw, NFP_NET_CFG_UPDATE_VXLAN);\n \n \trte_spinlock_unlock(&hw->reconfig_lock);\n \ndiff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h\nindex 6576769214..02ec854498 100644\n--- a/drivers/net/nfp/nfp_net_common.h\n+++ b/drivers/net/nfp/nfp_net_common.h\n@@ -117,6 +117,7 @@ struct nfp_hw {\n \tuint8_t *qcp_cfg;\n \tuint32_t cap;\n \tuint32_t ctrl;    /**< Current values for control */\n+\trte_spinlock_t reconfig_lock;\n };\n \n struct nfp_net_hw {\n@@ -149,8 +150,6 @@ struct nfp_net_hw {\n \tuint16_t vxlan_ports[NFP_NET_N_VXLAN_PORTS];\n \tuint8_t vxlan_usecnt[NFP_NET_N_VXLAN_PORTS];\n \n-\trte_spinlock_t reconfig_lock;\n-\n \tuint32_t max_tx_queues;\n \tuint32_t max_rx_queues;\n \tuint16_t flbufsz;\n@@ -367,7 +366,7 @@ nfp_qcp_queue_offset(const struct nfp_dev_info *dev_info,\n }\n \n /* Prototypes for common NFP functions */\n-int nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t ctrl, uint32_t update);\n+int nfp_reconfig(struct nfp_hw *hw, uint32_t ctrl, uint32_t update);\n int nfp_net_ext_reconfig(struct nfp_net_hw *hw, uint32_t ctrl_ext, uint32_t update);\n int nfp_net_mbox_reconfig(struct nfp_net_hw *hw, uint32_t mbox_cmd);\n int nfp_net_configure(struct rte_eth_dev *dev);\n",
    "prefixes": [
        "10/25"
    ]
}