From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6750843204; Thu, 26 Oct 2023 08:44:54 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 032D1410D5; Thu, 26 Oct 2023 08:44:06 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2127.outbound.protection.outlook.com [40.107.223.127]) by mails.dpdk.org (Postfix) with ESMTP id 3920A40EAB for ; Thu, 26 Oct 2023 08:43:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gZocV0YjYqX1elsKHb/XV6mWMykh9KrWtu9uWX/IelZ85of0w4HRzRwj/CLGodud5uFxSpok/maUaRGhroSlMUlWdxhWnj9vC4DcYQatj7trC19s0Zv1wRe6Lpgx+kWNbR6qRiYbUROW8xk6I8NfkJ81BXCo3e/namyKpMfn8mqsyPiteOqZXMcI+7IFKw7hqBe4JQddUWuccb+R//rmhpuA3Pyvy7Du7RDFSGIlmSiSc0w34YgDR5aLrI3kumX3XI6CjBHeP8Si7ysLroqG0t+0qTnZbT6NF6x3NR9kNJ1EmEx+u/1O31YyCuK3h5phZHxZPOyUPZxsPyQPewCn1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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; bh=8/kI7NU5TxyorUR8LL4wOEHqLzBegBRM7sjKPDePIOk=; b=WcC9482QJKRTxHjwQ/iPO64XpUfFDLRdlx9Bo+dkL1mCiRlBY9/ibPHUH4xqjYaJHf2KhWQY4GV1+51dX9C0fiXsZ9HgUCdf3aQd47O0PG9DzyfLfbIBZZveGfP12PI8K37SP/Bu/92fpzJC3JrkppoI1KzCaRs6XWewsZhlfUQfVG+gLW/lNg9hOvgkx1UzFv7DHDYqqf7fzQEERVVrRQPzk7j+sAdoc7IJ/WKGSkUZlBLDXX7TsS9NkLSSf3tuoLkFl4OlR9caFakB98R4THDi8JjxXtXNTVdzLD7dwajNinarjtxo6XjnVuGMX2zfaNFBZgiPPIhrViMOsgnNLw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8/kI7NU5TxyorUR8LL4wOEHqLzBegBRM7sjKPDePIOk=; b=PsTe/bsQa91/GCWCcE5zJRa7O0hRHlcbOf8sV7e7rv/EhaoxHuV0v4h0vDjYaHAm7ryTJcrY0shwVL+nEC/OPITItXUZPWg49DrmTmjErm5Mj1jJGOmepoMW39Wg5qfwMy2/h0CghPo/MTSxZUoxbJr6bMOpLwMm+asy/nljdQM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SJ0PR13MB5965.namprd13.prod.outlook.com (2603:10b6:a03:43d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Thu, 26 Oct 2023 06:43:57 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.6933.022; Thu, 26 Oct 2023 06:43:57 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v3 07/25] net/nfp: extract the ctrl BAR data field Date: Thu, 26 Oct 2023 14:43:06 +0800 Message-Id: <20231026064324.177531-8-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231026064324.177531-1-chaoyong.he@corigine.com> References: <20231024022849.3092506-1-chaoyong.he@corigine.com> <20231026064324.177531-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BYAPR07CA0034.namprd07.prod.outlook.com (2603:10b6:a02:bc::47) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5965:EE_ X-MS-Office365-Filtering-Correlation-Id: 51719d6a-6df3-46e3-2d3b-08dbd5eeedcb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KF1ojmLgVMFj1yuQbNxeDZVkYXlH3jJimAbbhWwModz9uHTs4Gu1yLUWCPEvMR4wyJ0RuWeaYaegErUPckEGlHbY7oGcWYpMxig8fQ/csDbNU2zzNnFrhopt+Tcjl0kTMJtrvzzMlzzGuaWI7/vSDbJuafo3FvfJ9BeyINkaOcBXZsjF0k0/qEY+QC9aSmrrCuZAjz1KsFRRG6rYhav4eNyw1kHv5/qxwauYWUS3cm/KBtgVoOzjb0P4tpbbYFO7metrvXvve4an02kOZ0KJgiYMezGSQwq8PGFBseLRTg87lfnD7pE4a8M38Ktvc6uDEfcOm3+8PmqhfJscy6kZ99Il2LlzEbiJV/HejeZ1DXjqZa6SoR56coto1skBGdhjnw38kl/EFVDIrQeC2x3UgoezJDw+oCqaIQrAhw8RIf6Th9AyEVYrm8/Yl28ad/OKQ3k01iy6tERBANhDYUGJCgPKnmw8vCIQoK3ywzOshZdFjhtAAhcWI//tZwIZcgMfPvjwDSID5ceNuBPFRsnljfznDY12kSvDLKCRv2odjLMVuddDXucavqS9c+2MqRQ47qNsuvqCnG5xvyrV+AY84hg2cSEITYzIZ2qWZbB3X3kX4DzOPIc55EdRoQLIvnB+siVDARB7qACUYRkklWFzsLB3PF/r2U7qnYp7zbv3j14= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(346002)(39830400003)(136003)(366004)(376002)(396003)(230922051799003)(64100799003)(186009)(1800799009)(451199024)(6512007)(478600001)(6506007)(52116002)(2616005)(8676002)(83380400001)(107886003)(41300700001)(26005)(1076003)(6486002)(5660300002)(6666004)(44832011)(6916009)(316002)(66556008)(54906003)(66476007)(66946007)(2906002)(4326008)(8936002)(38350700005)(38100700002)(86362001)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?F8N/R6BK6tWnSx4KeZ4A40FBl/5hzQZ4kQGFsg9V2Y+Gg6Lu14h5TZVFpA8W?= =?us-ascii?Q?koBDcIktMuaTapR7wSMvLYuIQixIdl3D8qjdOj0sawNvxfG6PEf8RLO7/tsC?= =?us-ascii?Q?bU4TQ6D+DrZKIy30zmuoR6VMApkx64nWowhYsjERSgbAil97T60s/9EdCy6C?= =?us-ascii?Q?9G5yu5il7aqXxaCuPnxk03UlDkXcAT8BWW0zRqK0wjHEeocs/67//HjEFH9n?= =?us-ascii?Q?bbsD1i/NFmsyZOKE3zWERlUP6t4KH3ENWUd9Lp4pq/Tx0RU+KXA46Um+FZgs?= =?us-ascii?Q?ZL4wtXCRcGouoHW7p2WY3l6hdU/XPOPloZYcohCKT+nQ+m8ZeweYB9JGbPi+?= =?us-ascii?Q?paPGqrAw5EqtbrUXDwyiGVX5JKhKDZrN4qKFjB5HnYXRfaVCzYlK+T8S0Qs0?= =?us-ascii?Q?MLQDnYYkHar2jGJgmHYO3ZSgmTBgWqhwB/Vy+OeS/sO9xnQtZuTzDes8UvbZ?= =?us-ascii?Q?towGbI1mz2Lep85fN8PMfA2J2XkHxecS+gV4SluUmyd9+Gy3HZ6MhX/G+9gu?= =?us-ascii?Q?AcRWVMUIom5HnN0U4yBdIhO69gesvkZb8wPVILjzucZG0Tc+bcl/up2VgK76?= =?us-ascii?Q?K0b3QsJ32dOCbS64JKw98ZuT8d2vcIrRctRDGNNl79mGLSt0O3MQEp/NnNV1?= =?us-ascii?Q?FEixj4hkDVlA6TAPlCeuH57qys9hubTUW7STkm4nD0l6BkykOSrFo2kX5fI2?= =?us-ascii?Q?aQ+ZGZrBW6TmCDrSvvaEf6ESeQw1YiRVdFmVEkp4WI20g9mwYeL2s52VHr1c?= =?us-ascii?Q?KuxNuJkkgb6o4XSSvUcp6lSrY/JbGgDGFpC/2pneZG89YfFVs0UIt0VpkhwG?= =?us-ascii?Q?Asg7D5SvZTm/CfRIwCKK+S2Egf754b+AILQfUa+qvP0ximuAwoBBkhgTFRFo?= =?us-ascii?Q?hVhBgxqSpcNXTiFY+gjQiceu1HkM//lniuzv4+HpBix+g8leOFXExT9vAIky?= =?us-ascii?Q?PEYdqLY9dUa+7D2SXC+SIb1OV0GVR1wSlqEZyjQceg25ErTKDEZyMmjYgM03?= =?us-ascii?Q?7266Ef3bjjOhhxBJm4N8kA2O2VZc5bJYupUXE5Im7e5sHFALHtmhv+dnxnk2?= =?us-ascii?Q?pnRLHuVTyWAFZHScSP6r8Dn0a86aKwAa7rVOVxNRQQkz+q8EJRrNQG+qozeO?= =?us-ascii?Q?gL1reOebjSC3ilW4GFSQ4B/i91urQQY0GuXYufKZmqVQpEXMk9UQxvqXMWn9?= =?us-ascii?Q?xgvA5YYjktDjCucEAm3CtHho6Rn6Yy9SJKiyH+rBf+IgDVsQMVmnbG/0qNE4?= =?us-ascii?Q?JuAgaEQMv6QWoW9QdWkTNrvjDr0sqtM7VM3uMkGo1bn0byI60Y7nCSh5WNvN?= =?us-ascii?Q?e2pjOQaVVCtdQrt8QybcV4xLshXphkoMNVETBsPsqLR8IQNLXSlwo9hjZEPr?= =?us-ascii?Q?ycmLU0803OTfFIaOdwAFo6gjxDB8d/ByRI2sJ5SpiyH4aQri7uLfgS1ZQeiW?= =?us-ascii?Q?a0W3w6mo9D+Wh1+mxVBrxbk4pqyfNVfALmZcNox1WFzVrVMCpBIrE0ojIW2K?= =?us-ascii?Q?/tbr/1ARDt5A2njmZ5hQy8JYWLHEcr1z2Pycd65BOenkzLta3uZkIWalZkXv?= =?us-ascii?Q?DkGLGBv2DIw8o+40KgdM/bYtzx09P1SrUn51eYIh2Qv3Qd9/GGhFnu1sghER?= =?us-ascii?Q?NQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 51719d6a-6df3-46e3-2d3b-08dbd5eeedcb X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2023 06:43:57.4113 (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: GEyDDLXNRdfkiz3U78GKHD7LxurRu+o+Kn5KJyD54Ykc8CisN1PSpWlvMvqfv+wfWT0bHjAWHdsAtYs3ZAI9G9AVCyRSI2ZirS5Y83KpRho= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5965 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Extract the 'ctrl_bar' data filed into the super class, prepare for the upcoming common library. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower.c | 8 ++++---- drivers/net/nfp/nfp_ethdev.c | 14 +++++++------- drivers/net/nfp/nfp_ethdev_vf.c | 10 +++++----- drivers/net/nfp/nfp_net_common.c | 4 ++-- drivers/net/nfp/nfp_net_common.h | 18 +++++++++--------- drivers/net/nfp/nfp_net_ctrl.c | 8 ++++---- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 453080f521..c8455e0241 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -349,7 +349,7 @@ nfp_flower_init_vnic_common(struct nfp_net_hw *hw, pf_dev = hw->pf_dev; pci_dev = hw->pf_dev->pci_dev; - PMD_INIT_LOG(DEBUG, "%s vNIC ctrl bar: %p", vnic_type, hw->ctrl_bar); + PMD_INIT_LOG(DEBUG, "%s vNIC ctrl bar: %p", vnic_type, hw->super.ctrl_bar); err = nfp_net_common_init(pci_dev, hw); if (err != 0) @@ -873,7 +873,7 @@ nfp_init_app_fw_flower(struct nfp_pf_dev *pf_dev, /* Fill in the PF vNIC and populate app struct */ app_fw_flower->pf_hw = pf_hw; - pf_hw->ctrl_bar = pf_dev->ctrl_bar; + pf_hw->super.ctrl_bar = pf_dev->ctrl_bar; pf_hw->pf_dev = pf_dev; pf_hw->cpp = pf_dev->cpp; pf_hw->dev_info = dev_info; @@ -891,9 +891,9 @@ nfp_init_app_fw_flower(struct nfp_pf_dev *pf_dev, ctrl_hw = app_fw_flower->ctrl_hw; /* Map the ctrl vNIC ctrl bar */ - ctrl_hw->ctrl_bar = nfp_rtsym_map(pf_dev->sym_tbl, "_pf0_net_ctrl_bar", + ctrl_hw->super.ctrl_bar = nfp_rtsym_map(pf_dev->sym_tbl, "_pf0_net_ctrl_bar", NFP_NET_CFG_BAR_SZ, &ctrl_hw->ctrl_area); - if (ctrl_hw->ctrl_bar == NULL) { + if (ctrl_hw->super.ctrl_bar == NULL) { PMD_INIT_LOG(ERR, "Cloud not map the ctrl vNIC ctrl bar"); ret = -ENODEV; goto pf_cpp_area_cleanup; diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 8ac2acea7b..b7c60b642f 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -506,16 +506,16 @@ nfp_net_init(struct rte_eth_dev *eth_dev) rte_eth_copy_pci_info(eth_dev, pci_dev); - hw->ctrl_bar = pci_dev->mem_resource[0].addr; - if (hw->ctrl_bar == NULL) { - PMD_DRV_LOG(ERR, "hw->ctrl_bar is NULL. BAR0 not configured"); + hw->super.ctrl_bar = pci_dev->mem_resource[0].addr; + if (hw->super.ctrl_bar == NULL) { + PMD_DRV_LOG(ERR, "hw->super.ctrl_bar is NULL. BAR0 not configured"); return -ENODEV; } if (port == 0) { uint32_t min_size; - hw->ctrl_bar = pf_dev->ctrl_bar; + hw->super.ctrl_bar = pf_dev->ctrl_bar; min_size = NFP_MAC_STATS_SIZE * hw->pf_dev->nfp_eth_table->max_index; hw->mac_stats_bar = nfp_rtsym_map(hw->pf_dev->sym_tbl, "_mac_stats", min_size, &hw->mac_stats_area); @@ -530,12 +530,12 @@ nfp_net_init(struct rte_eth_dev *eth_dev) return -ENODEV; /* Use port offset in pf ctrl_bar for this ports control bar */ - hw->ctrl_bar = pf_dev->ctrl_bar + (port * NFP_NET_CFG_BAR_SZ); + hw->super.ctrl_bar = pf_dev->ctrl_bar + (port * NFP_NET_CFG_BAR_SZ); hw->mac_stats = app_fw_nic->ports[0]->mac_stats_bar + (hw->nfp_idx * NFP_MAC_STATS_SIZE); } - PMD_INIT_LOG(DEBUG, "ctrl bar: %p", hw->ctrl_bar); + PMD_INIT_LOG(DEBUG, "ctrl bar: %p", hw->super.ctrl_bar); PMD_INIT_LOG(DEBUG, "MAC stats: %p", hw->mac_stats); err = nfp_net_common_init(pci_dev, hw); @@ -573,7 +573,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev) eth_dev->data->dev_private = hw; PMD_INIT_LOG(DEBUG, "ctrl_bar: %p, tx_bar: %p, rx_bar: %p", - hw->ctrl_bar, hw->tx_bar, hw->rx_bar); + hw->super.ctrl_bar, hw->tx_bar, hw->rx_bar); nfp_net_cfg_queue_setup(hw); hw->mtu = RTE_ETHER_MTU; diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index 293d1ed53c..641fed6fcf 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -270,13 +270,13 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); hw->dev_info = dev_info; - hw->ctrl_bar = pci_dev->mem_resource[0].addr; - if (hw->ctrl_bar == NULL) { - PMD_DRV_LOG(ERR, "hw->ctrl_bar is NULL. BAR0 not configured"); + hw->super.ctrl_bar = pci_dev->mem_resource[0].addr; + if (hw->super.ctrl_bar == NULL) { + PMD_DRV_LOG(ERR, "hw->super.ctrl_bar is NULL. BAR0 not configured"); return -ENODEV; } - PMD_INIT_LOG(DEBUG, "ctrl bar: %p", hw->ctrl_bar); + PMD_INIT_LOG(DEBUG, "ctrl bar: %p", hw->super.ctrl_bar); err = nfp_net_common_init(pci_dev, hw); if (err != 0) @@ -308,7 +308,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) hw->rx_bar = (uint8_t *)pci_dev->mem_resource[2].addr + rx_bar_off; PMD_INIT_LOG(DEBUG, "ctrl_bar: %p, tx_bar: %p, rx_bar: %p", - hw->ctrl_bar, hw->tx_bar, hw->rx_bar); + hw->super.ctrl_bar, hw->tx_bar, hw->rx_bar); nfp_net_cfg_queue_setup(hw); hw->mtu = RTE_ETHER_MTU; diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index cb64fa13c5..29f836c31e 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -536,12 +536,12 @@ nfp_net_write_mac(struct nfp_net_hw *hw, uint16_t mac1; mac0 = *(uint32_t *)mac; - nn_writel(rte_cpu_to_be_32(mac0), hw->ctrl_bar + NFP_NET_CFG_MACADDR); + nn_writel(rte_cpu_to_be_32(mac0), hw->super.ctrl_bar + NFP_NET_CFG_MACADDR); mac += 4; mac1 = *(uint16_t *)mac; nn_writew(rte_cpu_to_be_16(mac1), - hw->ctrl_bar + NFP_NET_CFG_MACADDR + 6); + hw->super.ctrl_bar + NFP_NET_CFG_MACADDR + 6); } int diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index 4bfb3174b0..dd62ec6d83 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -113,6 +113,7 @@ struct nfp_app_fw_nic { }; struct nfp_hw { + uint8_t *ctrl_bar; uint8_t *qcp_cfg; uint32_t cap; uint32_t cap_ext; @@ -141,7 +142,6 @@ struct nfp_net_hw { /** Current values for control */ uint32_t ctrl; - uint8_t *ctrl_bar; uint8_t *tx_bar; uint8_t *rx_bar; @@ -251,7 +251,7 @@ static inline uint8_t nn_cfg_readb(struct nfp_net_hw *hw, uint32_t off) { - return nn_readb(hw->ctrl_bar + off); + return nn_readb(hw->super.ctrl_bar + off); } static inline void @@ -259,14 +259,14 @@ nn_cfg_writeb(struct nfp_net_hw *hw, uint32_t off, uint8_t val) { - nn_writeb(val, hw->ctrl_bar + off); + nn_writeb(val, hw->super.ctrl_bar + off); } static inline uint16_t nn_cfg_readw(struct nfp_net_hw *hw, uint32_t off) { - return rte_le_to_cpu_16(nn_readw(hw->ctrl_bar + off)); + return rte_le_to_cpu_16(nn_readw(hw->super.ctrl_bar + off)); } static inline void @@ -274,14 +274,14 @@ nn_cfg_writew(struct nfp_net_hw *hw, uint32_t off, uint16_t val) { - nn_writew(rte_cpu_to_le_16(val), hw->ctrl_bar + off); + nn_writew(rte_cpu_to_le_16(val), hw->super.ctrl_bar + off); } static inline uint32_t nn_cfg_readl(struct nfp_net_hw *hw, uint32_t off) { - return rte_le_to_cpu_32(nn_readl(hw->ctrl_bar + off)); + return rte_le_to_cpu_32(nn_readl(hw->super.ctrl_bar + off)); } static inline void @@ -289,14 +289,14 @@ nn_cfg_writel(struct nfp_net_hw *hw, uint32_t off, uint32_t val) { - nn_writel(rte_cpu_to_le_32(val), hw->ctrl_bar + off); + nn_writel(rte_cpu_to_le_32(val), hw->super.ctrl_bar + off); } static inline uint64_t nn_cfg_readq(struct nfp_net_hw *hw, uint32_t off) { - return rte_le_to_cpu_64(nn_readq(hw->ctrl_bar + off)); + return rte_le_to_cpu_64(nn_readq(hw->super.ctrl_bar + off)); } static inline void @@ -304,7 +304,7 @@ nn_cfg_writeq(struct nfp_net_hw *hw, uint32_t off, uint64_t val) { - nn_writeq(rte_cpu_to_le_64(val), hw->ctrl_bar + off); + nn_writeq(rte_cpu_to_le_64(val), hw->super.ctrl_bar + off); } /** diff --git a/drivers/net/nfp/nfp_net_ctrl.c b/drivers/net/nfp/nfp_net_ctrl.c index b0a427c98e..d469896a64 100644 --- a/drivers/net/nfp/nfp_net_ctrl.c +++ b/drivers/net/nfp/nfp_net_ctrl.c @@ -36,8 +36,8 @@ nfp_net_tlv_caps_parse(struct rte_eth_dev *dev) caps = &hw->tlv_caps; nfp_net_tlv_caps_reset(caps); - data = hw->ctrl_bar + NFP_NET_CFG_TLV_BASE; - end = hw->ctrl_bar + NFP_NET_CFG_BAR_SZ; + data = hw->super.ctrl_bar + NFP_NET_CFG_TLV_BASE; + end = hw->super.ctrl_bar + NFP_NET_CFG_BAR_SZ; hdr = rte_read32(data); if (hdr == 0) { @@ -46,7 +46,7 @@ nfp_net_tlv_caps_parse(struct rte_eth_dev *dev) } for (; ; data += length) { - offset = data - hw->ctrl_bar; + offset = data - hw->super.ctrl_bar; if (data + NFP_NET_CFG_TLV_VALUE > end) { PMD_DRV_LOG(ERR, "Reached end of BAR without END TLV"); @@ -87,7 +87,7 @@ nfp_net_tlv_caps_parse(struct rte_eth_dev *dev) caps->mbox_len = length; if (length != 0) - caps->mbox_off = data - hw->ctrl_bar; + caps->mbox_off = data - hw->super.ctrl_bar; else caps->mbox_off = 0; break; -- 2.39.1