Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/132697/?format=api
{ "id": 132697, "url": "http://patchwork.dpdk.org/api/patches/132697/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20231017054545.1692509-8-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-8-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231017054545.1692509-8-chaoyong.he@corigine.com", "date": "2023-10-17T05:45:27", "name": "[07/25] net/nfp: extract the ctrl BAR data field", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "88f3ec370a2aefac09561c973b7522356df624b6", "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-8-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/132697/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/132697/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 98C1A43186;\n\tTue, 17 Oct 2023 07:47:07 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 1AFC2410E3;\n\tTue, 17 Oct 2023 07:46:30 +0200 (CEST)", "from NAM12-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam12on2111.outbound.protection.outlook.com [40.107.244.111])\n by mails.dpdk.org (Postfix) with ESMTP id 82B60410D0\n for <dev@dpdk.org>; Tue, 17 Oct 2023 07:46:25 +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:23 +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:23 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=ckCN0XVgMzSTlX+TBDTg38CCRTJ4UZli9KkWiCRu04p5Nt5BuZuvA6bai16qFrZ2Y1vIlV+OdG+voEh3ASq4PfMfudsesO2mAqCEZLLhFBsdpr2c/TeTWZ0rNU0TvQKKZNhCtZjQOXgO5quLnN7aKhEP82xqpKHEUQBHOPdiGHJPMw5cz9OgbTSQD2an+43bJeaVLhQWHHbYCU8AwxxxsOeTC8lVfE8T8Wh0nm87/cLD0qSu2OS1zCgrlspbEdAt7nQtsnb41DdTA1BJp9TfUY5vS9yx4WKlmerQzHplaAmCw/rcctYbOJRiZynN6rg1bjyWI7awuJPif6MKb0Jd5w==", "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=K6KMEy3jvtiufUJ0n7y7hQ3h3HmYrU2+bv1EUez3mlo=;\n b=hJLqsg0ahv1gvY0jsNs3Q741kG7e67PpRxGnusnZZS4PEBEWZ6mf+TtQt242IqxyRjLSGvLF4mdPN/446r2UNUauErmrGu5Cq/aEGJtAkb8BHEx45NjNRq2qasUHl4fgnFouwcA2Clyh7CkDZTb5luCBDIpJwmPZwsheMI4us0eKE6h0ghPEl76Zn985Bx7GDGVESv5Sr3WdOpMqYdWc5egYhA+IIwb8ZKeIA2SLbGSO8eUdYLtTCztxcyKNQcfYso7WaT8wX+t+Z+6dafX840YSAYfYpKBKU7sKohzhcl32RhPAkHCKNYoNzNmnFr+tgdgBCkSbTcpkYZw80eHn0g==", "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=K6KMEy3jvtiufUJ0n7y7hQ3h3HmYrU2+bv1EUez3mlo=;\n b=ezQx3JWUMgXEkxrnynKEegbXBBZrEbGfRB0h0NXBcalegXv9nysF+JqdxSXiGqkgXbuU8sWfLzQ2nM6+2hSb40loLjWcQYR+uN2/doTspAsAo1nX1fqnRBW+oupN3pi8iBZmYVJC2NQIcuPIOmr88qbvXLOLqU1mLS67eUKyoio=", "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 07/25] net/nfp: extract the ctrl BAR data field", "Date": "Tue, 17 Oct 2023 13:45:27 +0800", "Message-Id": "<20231017054545.1692509-8-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": "5f2686ad-455b-4b67-116a-08dbced464f5", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n 6Qs9WpD/xPB/YPb+bCYdGuLBJ1VRAuY+Q7Rca0qT4rlJno56/aSNPPcpjeMmibcSm17B6Ywwwz+BGtUrOwtlBtRqeczG75NzO/TV2Wi2G4wp4pcCOBaAY24zzTVjk7p6kP5KRFpifAQuhp3x3TcxZfnYKjhhwLdr5nzyc1nStrWS892Va7AhWeYFMQLzsuuVJPtbnzOaWkdYqz2o4pqzyFUy+4033XBlFloT+f1hr6pqeePDTI1RGB8UpAS2Ur1mvatlhm0ANqv63jpVlAsfz0hC6Q1XzwLdzc7zlxXlWGsNC9dJXnLY7Kv0J8RSrNmDyxLsCTJngAfwcBPK/bQijsNGPcheS+Svay7h6krERjXedAklT1TRiSm7QveQNuwQki34StayduZNSWP5rZubeUMjWZN8fgLy8nVXgVjryjRwKhbYS0AO+JsVybqWlB51IPKLpnXOYWdRO8kW8VgNxVXS5QHTAb68/d7V0YmF/+Pz3fj7s4CvoWNmT+pdsqp0YTE8Y7eS0tfU1jLfkRgbWJcJ/gUajNGGmPIjdWW6TzF06IyksRYiEjbNjDNX/qcDCvcg9czO0s+p1Ze7QHt/XNSeryj2INPhgJaUakLaNtOlBBjhMH974eAt7DDTkzVi7Za8wYGfYYrHOIHGbBaxu4ksyaNuFV/BZM86W3ycDs0=", "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)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(54906003)(41300700001)(478600001)(4326008)(6486002)(44832011)(6512007)(6506007)(107886003)(38350700005)(2616005)(1076003)(26005)(36756003)(38100700002)(52116002)(86362001);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n ct6/RNJ2hI5RMCYx6J+w/gs05wpfvprVu1fnxMvBpmabcyDIUkBWGroFme+EP7ZaCZtPp5VWyJqGeXElf4jzCfgiqJfO5oAgaXkKN1E+hQxnk2Ntw8oWqccSgNqzfic28adiGgeSR6bX/s+Pe+/RqOS1JXQyPIlCDgHhG6FLI1bO2MdWSExMpsERkfR61E9h2iBIM360gIDxbCO+BmN5LUxT77piF7H3AXCgXzjS4XqDu/kY1ctloJ//5TmEWAw6aSVGaI2q8rVT50ti8ODNpMOugIqPY+pGzu3GObR6dbU3CdSXjpL5Y01g5BfWEHgUqPmS6z6neHPjVdvQXwrRvPoH8WZDT6Wtzn0OEned9pzv+1lbKVKZS4fkBF90aKZKexrIJJd26Rv8fqrV5KIVh7VJsFP6HzBdcwjk4eOn+M0mttLPoXoH02AE2kE+Ut0d7Iw9UM5NYV8TXZmyYmYKI8cJ2YWJya52CUaWiFC/WVqmY+NDw9pDB+Rkn0FvST7iFej4zJMh3Z0ZeWrxdH6SSoLJs8NQrHU274K6ztq4edLDIDYrtl9cBtXSl+jFnVNQcZNI4oqI2DGGjBOYdrt44cqdV4Bg5a2iL5bUj6OkPRrOfnEiQVhgq7vCr3SLVet9vtJSsR37csu6KUaSOIPco+KwAJjiyItWe1aZqYDuu2lCWriiMdRHt/U75PLhoJPoCLlijwggSZcbOLDXU/cpKVgDh6B+cQ5YmxRS49xhLZIJ6rwRdJ64nW9dkfEtKIVYDXx/SPj0WMzahgJgJqWFo2V44F9VRx/i/M+pBSx6G+stjJK0EmuvB+/A9+22XAoL8Ds7jcbV80OIccG2vK3pS1rp7adR/IkiOWY9pBk/YwzKwnPNiOsrN11FjAk5NP3gwlUUqNfTvRyZrz265lF3gmmWiIjYZvdFTjAUVD2uE0c0HR0I+7sKS1IIRB4YlS1KeJVVekSbh4owNw+YOk1P0mjseOgoOuwZN6pEqg+wYzRh4tuc2d/60J5uzw7aDv3C/N8TIPawB/+9zck2gIukC/dYcQN7CdEHxIwWbJt8qpLkbUfvEgi6jDJ1Q5BDHKvpe//atYdUPExZd4c0YLtustOdt0fgFqgRFKOhDmeIXo0bHbfOFUCjV3xcc7l91VA/hKV6bBrrOItLOw8zXhWEa48kbsZNGKMdH2l0xZgjkkB0FpkldzU95S7eKDGxafC7l0aa3sieRA3jNWw4Wsd8lU6cyWn3x++AgKwZFo/PQdevJVPmn3ZAqc3qae0a39wqbMxIGzewiyAp5ZMzBRVxCzq/QA63O+fy0WujkgmFEJ5rSn+q7DrKbOME1zplnA6wKlGm2O4HahX/n4nbXTlAMsDlhD9zSPQXW9oKnKEYF8FtAP4chgaL7Jn6YmAW8oNsC+CfnIpbzRYB18yROKKDljGOS3FEIRaU93kU5MQrosxC6v9Jn8gpdycYEOp1yiGK+jUNbAsfbmv7i9ScQ6HQGG+N6UQyKgxRyQ1FA7mm2F2Aolx/HUhE9c2sujxoJEmIn6FoFWVWHBYM/VYgHPILCMqjbf3BUBExHgsUq+RZLBVba/xzv/D6D0e+bUe9o6Q13+gzUV9yxzFohZM2QXdLgA==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 5f2686ad-455b-4b67-116a-08dbced464f5", "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:23.5196 (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 ed5ljKfK2rWmoyUEPfGmCfnd8Jlt4XmxsmuhS7rl0y1lLb67RAW1u/hh8ck45uSJNrz8AeCx7GC5d/mkwM/9k2eOkaZY05NFNs5taUbsP5w=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MW5PR13MB5904", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Extract the 'ctrl_bar' 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/nfp_ethdev.c | 14 +++++++-------\n drivers/net/nfp/nfp_ethdev_vf.c | 10 +++++-----\n drivers/net/nfp/nfp_net_common.c | 4 ++--\n drivers/net/nfp/nfp_net_common.h | 18 +++++++++---------\n drivers/net/nfp/nfp_net_ctrl.c | 8 ++++----\n 6 files changed, 31 insertions(+), 31 deletions(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c\nindex c758add734..28bdb8e214 100644\n--- a/drivers/net/nfp/flower/nfp_flower.c\n+++ b/drivers/net/nfp/flower/nfp_flower.c\n@@ -351,7 +351,7 @@ nfp_flower_init_vnic_common(struct nfp_net_hw *hw,\n \tpf_dev = hw->pf_dev;\n \tpci_dev = hw->pf_dev->pci_dev;\n \n-\tPMD_INIT_LOG(DEBUG, \"%s vNIC ctrl bar: %p\", vnic_type, hw->ctrl_bar);\n+\tPMD_INIT_LOG(DEBUG, \"%s vNIC ctrl bar: %p\", vnic_type, hw->super.ctrl_bar);\n \n \terr = nfp_net_common_init(pci_dev, hw);\n \tif (err != 0)\n@@ -875,7 +875,7 @@ nfp_init_app_fw_flower(struct nfp_pf_dev *pf_dev,\n \n \t/* Fill in the PF vNIC and populate app struct */\n \tapp_fw_flower->pf_hw = pf_hw;\n-\tpf_hw->ctrl_bar = pf_dev->ctrl_bar;\n+\tpf_hw->super.ctrl_bar = pf_dev->ctrl_bar;\n \tpf_hw->pf_dev = pf_dev;\n \tpf_hw->cpp = pf_dev->cpp;\n \tpf_hw->dev_info = dev_info;\n@@ -893,9 +893,9 @@ nfp_init_app_fw_flower(struct nfp_pf_dev *pf_dev,\n \tctrl_hw = app_fw_flower->ctrl_hw;\n \n \t/* Map the ctrl vNIC ctrl bar */\n-\tctrl_hw->ctrl_bar = nfp_rtsym_map(pf_dev->sym_tbl, \"_pf0_net_ctrl_bar\",\n+\tctrl_hw->super.ctrl_bar = nfp_rtsym_map(pf_dev->sym_tbl, \"_pf0_net_ctrl_bar\",\n \t\t\tNFP_NET_CFG_BAR_SZ, &ctrl_hw->ctrl_area);\n-\tif (ctrl_hw->ctrl_bar == NULL) {\n+\tif (ctrl_hw->super.ctrl_bar == NULL) {\n \t\tPMD_INIT_LOG(ERR, \"Cloud not map the ctrl vNIC ctrl bar\");\n \t\tret = -ENODEV;\n \t\tgoto pf_cpp_area_cleanup;\ndiff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex 329589e90f..9ff1c297a4 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -507,16 +507,16 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \n \trte_eth_copy_pci_info(eth_dev, pci_dev);\n \n-\thw->ctrl_bar = pci_dev->mem_resource[0].addr;\n-\tif (hw->ctrl_bar == NULL) {\n-\t\tPMD_DRV_LOG(ERR, \"hw->ctrl_bar is NULL. BAR0 not configured\");\n+\thw->super.ctrl_bar = pci_dev->mem_resource[0].addr;\n+\tif (hw->super.ctrl_bar == NULL) {\n+\t\tPMD_DRV_LOG(ERR, \"hw->super.ctrl_bar is NULL. BAR0 not configured\");\n \t\treturn -ENODEV;\n \t}\n \n \tif (port == 0) {\n \t\tuint32_t min_size;\n \n-\t\thw->ctrl_bar = pf_dev->ctrl_bar;\n+\t\thw->super.ctrl_bar = pf_dev->ctrl_bar;\n \t\tmin_size = NFP_MAC_STATS_SIZE * hw->pf_dev->nfp_eth_table->max_index;\n \t\thw->mac_stats_bar = nfp_rtsym_map(hw->pf_dev->sym_tbl, \"_mac_stats\",\n \t\t\t\tmin_size, &hw->mac_stats_area);\n@@ -531,12 +531,12 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \t\t\treturn -ENODEV;\n \n \t\t/* Use port offset in pf ctrl_bar for this ports control bar */\n-\t\thw->ctrl_bar = pf_dev->ctrl_bar + (port * NFP_NET_CFG_BAR_SZ);\n+\t\thw->super.ctrl_bar = pf_dev->ctrl_bar + (port * NFP_NET_CFG_BAR_SZ);\n \t\thw->mac_stats = app_fw_nic->ports[0]->mac_stats_bar +\n \t\t\t\t(hw->nfp_idx * NFP_MAC_STATS_SIZE);\n \t}\n \n-\tPMD_INIT_LOG(DEBUG, \"ctrl bar: %p\", hw->ctrl_bar);\n+\tPMD_INIT_LOG(DEBUG, \"ctrl bar: %p\", hw->super.ctrl_bar);\n \tPMD_INIT_LOG(DEBUG, \"MAC stats: %p\", hw->mac_stats);\n \n \terr = nfp_net_common_init(pci_dev, hw);\n@@ -574,7 +574,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \teth_dev->data->dev_private = hw;\n \n \tPMD_INIT_LOG(DEBUG, \"ctrl_bar: %p, tx_bar: %p, rx_bar: %p\",\n-\t\t\thw->ctrl_bar, hw->tx_bar, hw->rx_bar);\n+\t\t\thw->super.ctrl_bar, hw->tx_bar, hw->rx_bar);\n \n \tnfp_net_cfg_queue_setup(hw);\n \thw->mtu = RTE_ETHER_MTU;\ndiff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c\nindex 293d1ed53c..641fed6fcf 100644\n--- a/drivers/net/nfp/nfp_ethdev_vf.c\n+++ b/drivers/net/nfp/nfp_ethdev_vf.c\n@@ -270,13 +270,13 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)\n \thw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n \thw->dev_info = dev_info;\n \n-\thw->ctrl_bar = pci_dev->mem_resource[0].addr;\n-\tif (hw->ctrl_bar == NULL) {\n-\t\tPMD_DRV_LOG(ERR, \"hw->ctrl_bar is NULL. BAR0 not configured\");\n+\thw->super.ctrl_bar = pci_dev->mem_resource[0].addr;\n+\tif (hw->super.ctrl_bar == NULL) {\n+\t\tPMD_DRV_LOG(ERR, \"hw->super.ctrl_bar is NULL. BAR0 not configured\");\n \t\treturn -ENODEV;\n \t}\n \n-\tPMD_INIT_LOG(DEBUG, \"ctrl bar: %p\", hw->ctrl_bar);\n+\tPMD_INIT_LOG(DEBUG, \"ctrl bar: %p\", hw->super.ctrl_bar);\n \n \terr = nfp_net_common_init(pci_dev, hw);\n \tif (err != 0)\n@@ -308,7 +308,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)\n \thw->rx_bar = (uint8_t *)pci_dev->mem_resource[2].addr + rx_bar_off;\n \n \tPMD_INIT_LOG(DEBUG, \"ctrl_bar: %p, tx_bar: %p, rx_bar: %p\",\n-\t\t\thw->ctrl_bar, hw->tx_bar, hw->rx_bar);\n+\t\t\thw->super.ctrl_bar, hw->tx_bar, hw->rx_bar);\n \n \tnfp_net_cfg_queue_setup(hw);\n \thw->mtu = RTE_ETHER_MTU;\ndiff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c\nindex a5548074fb..283f5ee627 100644\n--- a/drivers/net/nfp/nfp_net_common.c\n+++ b/drivers/net/nfp/nfp_net_common.c\n@@ -536,12 +536,12 @@ nfp_net_write_mac(struct nfp_net_hw *hw,\n \tuint16_t mac1;\n \n \tmac0 = *(uint32_t *)mac;\n-\tnn_writel(rte_cpu_to_be_32(mac0), hw->ctrl_bar + NFP_NET_CFG_MACADDR);\n+\tnn_writel(rte_cpu_to_be_32(mac0), hw->super.ctrl_bar + NFP_NET_CFG_MACADDR);\n \n \tmac += 4;\n \tmac1 = *(uint16_t *)mac;\n \tnn_writew(rte_cpu_to_be_16(mac1),\n-\t\t\thw->ctrl_bar + NFP_NET_CFG_MACADDR + 6);\n+\t\t\thw->super.ctrl_bar + NFP_NET_CFG_MACADDR + 6);\n }\n \n int\ndiff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h\nindex cc7d438011..2f02803ea4 100644\n--- a/drivers/net/nfp/nfp_net_common.h\n+++ b/drivers/net/nfp/nfp_net_common.h\n@@ -113,6 +113,7 @@ struct nfp_app_fw_nic {\n };\n \n struct nfp_hw {\n+\tuint8_t *ctrl_bar;\n \tuint8_t *qcp_cfg;\n \tuint32_t cap;\n };\n@@ -141,7 +142,6 @@ struct nfp_net_hw {\n \t/** Current values for control */\n \tuint32_t ctrl;\n \n-\tuint8_t *ctrl_bar;\n \tuint8_t *tx_bar;\n \tuint8_t *rx_bar;\n \n@@ -251,7 +251,7 @@ static inline uint8_t\n nn_cfg_readb(struct nfp_net_hw *hw,\n \t\tuint32_t off)\n {\n-\treturn nn_readb(hw->ctrl_bar + off);\n+\treturn nn_readb(hw->super.ctrl_bar + off);\n }\n \n static inline void\n@@ -259,14 +259,14 @@ nn_cfg_writeb(struct nfp_net_hw *hw,\n \t\tuint32_t off,\n \t\tuint8_t val)\n {\n-\tnn_writeb(val, hw->ctrl_bar + off);\n+\tnn_writeb(val, hw->super.ctrl_bar + off);\n }\n \n static inline uint16_t\n nn_cfg_readw(struct nfp_net_hw *hw,\n \t\tuint32_t off)\n {\n-\treturn rte_le_to_cpu_16(nn_readw(hw->ctrl_bar + off));\n+\treturn rte_le_to_cpu_16(nn_readw(hw->super.ctrl_bar + off));\n }\n \n static inline void\n@@ -274,14 +274,14 @@ nn_cfg_writew(struct nfp_net_hw *hw,\n \t\tuint32_t off,\n \t\tuint16_t val)\n {\n-\tnn_writew(rte_cpu_to_le_16(val), hw->ctrl_bar + off);\n+\tnn_writew(rte_cpu_to_le_16(val), hw->super.ctrl_bar + off);\n }\n \n static inline uint32_t\n nn_cfg_readl(struct nfp_net_hw *hw,\n \t\tuint32_t off)\n {\n-\treturn rte_le_to_cpu_32(nn_readl(hw->ctrl_bar + off));\n+\treturn rte_le_to_cpu_32(nn_readl(hw->super.ctrl_bar + off));\n }\n \n static inline void\n@@ -289,14 +289,14 @@ nn_cfg_writel(struct nfp_net_hw *hw,\n \t\tuint32_t off,\n \t\tuint32_t val)\n {\n-\tnn_writel(rte_cpu_to_le_32(val), hw->ctrl_bar + off);\n+\tnn_writel(rte_cpu_to_le_32(val), hw->super.ctrl_bar + off);\n }\n \n static inline uint64_t\n nn_cfg_readq(struct nfp_net_hw *hw,\n \t\tuint32_t off)\n {\n-\treturn rte_le_to_cpu_64(nn_readq(hw->ctrl_bar + off));\n+\treturn rte_le_to_cpu_64(nn_readq(hw->super.ctrl_bar + off));\n }\n \n static inline void\n@@ -304,7 +304,7 @@ nn_cfg_writeq(struct nfp_net_hw *hw,\n \t\tuint32_t off,\n \t\tuint64_t val)\n {\n-\tnn_writeq(rte_cpu_to_le_64(val), hw->ctrl_bar + off);\n+\tnn_writeq(rte_cpu_to_le_64(val), hw->super.ctrl_bar + off);\n }\n \n /**\ndiff --git a/drivers/net/nfp/nfp_net_ctrl.c b/drivers/net/nfp/nfp_net_ctrl.c\nindex b0a427c98e..d469896a64 100644\n--- a/drivers/net/nfp/nfp_net_ctrl.c\n+++ b/drivers/net/nfp/nfp_net_ctrl.c\n@@ -36,8 +36,8 @@ nfp_net_tlv_caps_parse(struct rte_eth_dev *dev)\n \tcaps = &hw->tlv_caps;\n \tnfp_net_tlv_caps_reset(caps);\n \n-\tdata = hw->ctrl_bar + NFP_NET_CFG_TLV_BASE;\n-\tend = hw->ctrl_bar + NFP_NET_CFG_BAR_SZ;\n+\tdata = hw->super.ctrl_bar + NFP_NET_CFG_TLV_BASE;\n+\tend = hw->super.ctrl_bar + NFP_NET_CFG_BAR_SZ;\n \n \thdr = rte_read32(data);\n \tif (hdr == 0) {\n@@ -46,7 +46,7 @@ nfp_net_tlv_caps_parse(struct rte_eth_dev *dev)\n \t}\n \n \tfor (; ; data += length) {\n-\t\toffset = data - hw->ctrl_bar;\n+\t\toffset = data - hw->super.ctrl_bar;\n \n \t\tif (data + NFP_NET_CFG_TLV_VALUE > end) {\n \t\t\tPMD_DRV_LOG(ERR, \"Reached end of BAR without END TLV\");\n@@ -87,7 +87,7 @@ nfp_net_tlv_caps_parse(struct rte_eth_dev *dev)\n \t\t\tcaps->mbox_len = length;\n \n \t\t\tif (length != 0)\n-\t\t\t\tcaps->mbox_off = data - hw->ctrl_bar;\n+\t\t\t\tcaps->mbox_off = data - hw->super.ctrl_bar;\n \t\t\telse\n \t\t\t\tcaps->mbox_off = 0;\n \t\t\tbreak;\n", "prefixes": [ "07/25" ] }