From patchwork Tue Oct 24 02:28:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133212 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id A1DD8431EB; Tue, 24 Oct 2023 04:30:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CFA0240EE5; Tue, 24 Oct 2023 04:29:55 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2091.outbound.protection.outlook.com [40.107.93.91]) by mails.dpdk.org (Postfix) with ESMTP id 49AB44069F for ; Tue, 24 Oct 2023 04:29:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QXwjPTS9PjM2pTGJHr13brZVHEmWD8GSw/ttUZ3bhpKtT5H8vykO9m07F+y3LdG//ZzPpWVNb0T3eUe5V0A7Ob/aYOEBOIYCEMUDjJAk/8BkRN+8yhs9VElHNyiQxA3UKM6fk6/OXD0lWb01RtyHAUF2GyKTo+GqqtmYwglIegZYnGJPo3oj8EJt2hefDY2YaooN4pcKLUxzFhaL70ncRZvWdTm2Tzs4+kp/g7rR9mepxv0ydk7QQUl6vtCVd5rOn165SXoaw/p/nXgOopshPaXP/p4W/PAtuQ/WqlWGsvS9kbnfZCzDq4UgoWGS7ORnwARt5b03dFm7cJNbKKn6Ig== 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=CzfoqNOZQNdA3T7dvHM2HwA7Xgo3dkAC+SCwUHGDsgZJPScwCyQiu3mIc5bL+4fhU2tL9QavtYDXoSjVSC+uqFcBDJwc3xLAlO+YXOWeevpyhypk6aOVvFZtqcTIkQSovdAwKXXbLfigHP381BE7SB0MpeYBs1FiqgG18eYRUs0IYKeaqMb9P+cGqAiyf8vCTs74w+x+CeRQUFwYV3cX3b6l0e1xQ6T/95CFiGq3NGJ/ewSoN5J444tKVHRsS89Q1S3huRy37fTO34x12iB7kQTd+e7+whbfIrRfxD1RsXXo3+3Gc5cbR0T10VBogWa3UYSPDq0mAaqTbfYCgx3FIA== 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=NdPWlxg2LJBiOCS9NHifemzzIU9HzYbaizQt34h0TKJRVmdhIydHr6KguYpUij1Sl0E+FW915/U95O7Gw+1ltljjQVI41QsRigEI0RRcLcMuVI3BV4PKZW7dwDuFFJ1vDT2vpmA+T9NAsFRveH7arkU/q8CWuZrUDYLESA0MQCQ= 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 BLAPR13MB4691.namprd13.prod.outlook.com (2603:10b6:208:306::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Tue, 24 Oct 2023 02:29:50 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d%4]) with mapi id 15.20.6907.021; Tue, 24 Oct 2023 02:29:50 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v2 07/25] net/nfp: extract the ctrl BAR data field Date: Tue, 24 Oct 2023 10:28:31 +0800 Message-Id: <20231024022849.3092506-8-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231024022849.3092506-1-chaoyong.he@corigine.com> References: <20231017054545.1692509-1-chaoyong.he@corigine.com> <20231024022849.3092506-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR04CA0015.namprd04.prod.outlook.com (2603:10b6:a03:40::28) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BLAPR13MB4691:EE_ X-MS-Office365-Filtering-Correlation-Id: 5f29df0f-7f33-4694-5a0c-08dbd4391905 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Jx1LACcGFDAF37rcYyRX6koLMaJ7bklrMXEhIUBB0AY8f6GEBUUWREjFCIz5eVuajqCDSm5L/J3srrqM/6ws3Q4QikQ+f4OPowkAWd73pIpZzTRZxvaXJTFtVRxy+eZ8qILkO4RD7NPcqp8Jnx+yTpmBccJa4VvvRwQcwCqSF5ckG9PT6HOPayB1hWcpkb4st5mKMXa22tHcAxQxmkn8XB6apUi0XMTBYPRm0hzlexwNzi0Q5dXd7VLj0Z06ln4qnEflm+oGyeco31hf20J7L4hLdzHv8VtigWlehROBSSVbtKONqxWeMk3pQccd+XUm+TgJL28CL48qpiIUbJqmY4oo5mH2Qd9yDMQlAEWumfEsLTyf6A0vk804Cf2YSYHkYxp2v4QoO0K1WanIsx3sAb1BQ9OUR5DftvKS3TKZQXNVKs+54s2tO/QPtCibtLqA1nJVG4xCs5/s4+F3Tmkf+OcjT51Dy/qpBBHiYSeCq5DyAFc3mSI1jiSPQtynbIm60i17b09JIEvrFITqrEuk6MW82X263VkFvPMlQWP1JfqFeNyKgKybfBv1Y4GIMHLNoYevc48/U3HfIBOxJKi6BO4DkhYKySYc37OnLoIC5gY3GbNAYG7r0826FAth4ZJGhsSLEqphFb0pTxqa4vXvYgnw7kussLxN6K2o/6HNiuc= 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)(39830400003)(366004)(376002)(346002)(396003)(136003)(230922051799003)(186009)(451199024)(1800799009)(64100799003)(83380400001)(38350700005)(2906002)(4326008)(8936002)(36756003)(44832011)(8676002)(26005)(52116002)(107886003)(2616005)(1076003)(38100700002)(6506007)(6666004)(6512007)(316002)(6916009)(478600001)(6486002)(5660300002)(66476007)(86362001)(54906003)(41300700001)(66946007)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5guY5PTN1FrAXXhyz2YfMNsVdlgAytjACFIbnSUaCXSaH8eJwBTyGQ3SLb71oJLXRwF8ldFpWHM6T42SjaXH/+ku4ngjRGQVqDOgvgg5mqsLMHta+/ivLdP5grLRzaYVN6yoVspU8trliMgtoYUOBZCbGVJWqx3qKGSXSMdc3jFPbqXUh30mETzkRdt44rYZZVqV2H/AbqXbezPjo+CEcA3AFnUt9dBc9Djvb7vqTnh98AH0ITs18TBuayw4cx/zngvNJzVYruqu7bgeFuGNz+b/5hhf9U0qYXSrnGHgCXmR9MihDw2FvTAjzKJXBRZoClFKEX2A6DSBvb3vEDwLzfoiJY1QJtgkCtMKgY8W6ADwNJ88lwBeLhEZrrqUJrURLc4/4hYc4wS0/+elfcwD/R/bLQowMx1B+Gy3Ya+JwquKcxHzzJ/EvVXOmEToPuzb+MvmefPqnJNtQhlXc8doXdkTeVLzlzk6IWctZ25jvKnaeA2Uq8lAfGLgl1XvPjMhHOCbXP+zRxx6Wkm977F647EL//AZpZBpbMSt3ZRVTM9MYTysrkcZ/6yPcvbdxXhxjJG2OUt5Qwmli3QtrGwOI3zvCc14JbFJWQzgUOzNhTuw07o8tigvIaBu5zI+SEn6CbDas0oIWa8pLhZfMrLpYBaL8+qs/GfKpTkTuLHsKer6sQfA55sDGgckmiL4CJJBpJls3yfdAJVLQIleQY+1ilBiAIoasUIP3aqbjpXVgp1cvxWOwoGBVd3vbDIeAICcJtpMrIOT49N02xdkmxce5SHo113Y+QrqTANjnFhV03clelyh36771MgOWYw8nZ0dREvX0t8NPAX980+MyVwcePEbV7QZQNiodYTkaHjRFr9LVU2ohsfq8bChFQvRLziPIFwQ9vDwRQI5Sd1aF7EM3hA2DOQPnd86+8yHp5gjbbYYXRuCgaJlpTo6MFHblqItDZdPz8COa6u46VZnTQx7o5pZnJwoJerQcSPNyqeQPtx5Qb7r4RG5/CAxHn1UROJcwsyxCc9a98/JPwFVJ+I4tf+fP2yDUVVGJNGQqFWwEYwhA4e+dLl2Uqwd7sJKRLJymjCnTi9lKCAVDF3LnWtZWHe5VFmP9ZIM5rS4/Ffml4cYOwLVpDuvVneZfNs4BDJI0PJjlBU3sI9Q977O+rn7uksw2YmtQ2vZHF6spNMtyhdqgcl6Ue31+5G5gUbojCtowcxT9ROuwa12v2993ZEslPgJvCz9013oGsCbzpx9xwYdnWl0Uix/xeAG/7sj3H6/jSFeCY4PZ2GKHavRZ5WG14Zqu9ax7rt7Pnzzhvc7MjrpA7n/u3qFqigX9eBQXzOIOvVOMJ/e882YrGHx4gmvuirbJqzOVmVgAgFFoi/IWP3jITMlLPorvcyAs5R6T3z9RtZzJcqriOwJM9ti1GNghwlc77JKS50HMqbkIuP6tKJ5YCWlXPxVSET902LyYu5pwEohqitv/KgZ5fKqmnvjAcIOOjP+fAWsDwXmUDqESJylWIwtYAXXapgXKC+rUQ5b7jmKnRuaQI3zatfP9tAJtWZCXDaFwNhT1OSjvYNsAHHgUJY7wkXQ2YCP1h6ssrS2XQQykhrrChwqLt9UXeaV5g== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f29df0f-7f33-4694-5a0c-08dbd4391905 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2023 02:29:50.3909 (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: e2JGOM+VGS6ZHQIxsxuOs0Fa5Fi1QaFwxw2MTsnecPwdXCCBMtpx21RMJzfkLzR/nx0h18JRredpJo7pTG+BUHE/N8QK58Xds9xIE39kcB4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR13MB4691 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions 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;