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 98C1A43186; Tue, 17 Oct 2023 07:47:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1AFC2410E3; Tue, 17 Oct 2023 07:46:30 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2111.outbound.protection.outlook.com [40.107.244.111]) by mails.dpdk.org (Postfix) with ESMTP id 82B60410D0 for ; Tue, 17 Oct 2023 07:46:25 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ckCN0XVgMzSTlX+TBDTg38CCRTJ4UZli9KkWiCRu04p5Nt5BuZuvA6bai16qFrZ2Y1vIlV+OdG+voEh3ASq4PfMfudsesO2mAqCEZLLhFBsdpr2c/TeTWZ0rNU0TvQKKZNhCtZjQOXgO5quLnN7aKhEP82xqpKHEUQBHOPdiGHJPMw5cz9OgbTSQD2an+43bJeaVLhQWHHbYCU8AwxxxsOeTC8lVfE8T8Wh0nm87/cLD0qSu2OS1zCgrlspbEdAt7nQtsnb41DdTA1BJp9TfUY5vS9yx4WKlmerQzHplaAmCw/rcctYbOJRiZynN6rg1bjyWI7awuJPif6MKb0Jd5w== 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=K6KMEy3jvtiufUJ0n7y7hQ3h3HmYrU2+bv1EUez3mlo=; b=hJLqsg0ahv1gvY0jsNs3Q741kG7e67PpRxGnusnZZS4PEBEWZ6mf+TtQt242IqxyRjLSGvLF4mdPN/446r2UNUauErmrGu5Cq/aEGJtAkb8BHEx45NjNRq2qasUHl4fgnFouwcA2Clyh7CkDZTb5luCBDIpJwmPZwsheMI4us0eKE6h0ghPEl76Zn985Bx7GDGVESv5Sr3WdOpMqYdWc5egYhA+IIwb8ZKeIA2SLbGSO8eUdYLtTCztxcyKNQcfYso7WaT8wX+t+Z+6dafX840YSAYfYpKBKU7sKohzhcl32RhPAkHCKNYoNzNmnFr+tgdgBCkSbTcpkYZw80eHn0g== 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=K6KMEy3jvtiufUJ0n7y7hQ3h3HmYrU2+bv1EUez3mlo=; b=ezQx3JWUMgXEkxrnynKEegbXBBZrEbGfRB0h0NXBcalegXv9nysF+JqdxSXiGqkgXbuU8sWfLzQ2nM6+2hSb40loLjWcQYR+uN2/doTspAsAo1nX1fqnRBW+oupN3pi8iBZmYVJC2NQIcuPIOmr88qbvXLOLqU1mLS67eUKyoio= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16) by MW5PR13MB5904.namprd13.prod.outlook.com (2603:10b6:303:1ce::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.45; Tue, 17 Oct 2023 05:46:23 +0000 Received: from PH0PR13MB5568.namprd13.prod.outlook.com ([fe80::b070:92e1:931e:fee7]) by PH0PR13MB5568.namprd13.prod.outlook.com ([fe80::b070:92e1:931e:fee7%4]) with mapi id 15.20.6863.047; Tue, 17 Oct 2023 05:46:23 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang 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 (2603:10b6:510:325::29) To PH0PR13MB5568.namprd13.prod.outlook.com (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: 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:; IPV:NLI; SFV:NSPM; H:PH0PR13MB5568.namprd13.prod.outlook.com; PTR:; CAT:NONE; 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); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ct6/RNJ2hI5RMCYx6J+w/gs05wpfvprVu1fnxMvBpmabcyDIUkBWGroFme+E?= =?us-ascii?Q?P7ZaCZtPp5VWyJqGeXElf4jzCfgiqJfO5oAgaXkKN1E+hQxnk2Ntw8oWqccS?= =?us-ascii?Q?gNqzfic28adiGgeSR6bX/s+Pe+/RqOS1JXQyPIlCDgHhG6FLI1bO2MdWSExM?= =?us-ascii?Q?psERkfR61E9h2iBIM360gIDxbCO+BmN5LUxT77piF7H3AXCgXzjS4XqDu/kY?= =?us-ascii?Q?1ctloJ//5TmEWAw6aSVGaI2q8rVT50ti8ODNpMOugIqPY+pGzu3GObR6dbU3?= =?us-ascii?Q?CdSXjpL5Y01g5BfWEHgUqPmS6z6neHPjVdvQXwrRvPoH8WZDT6Wtzn0OEned?= =?us-ascii?Q?9pzv+1lbKVKZS4fkBF90aKZKexrIJJd26Rv8fqrV5KIVh7VJsFP6HzBdcwjk?= =?us-ascii?Q?4eOn+M0mttLPoXoH02AE2kE+Ut0d7Iw9UM5NYV8TXZmyYmYKI8cJ2YWJya52?= =?us-ascii?Q?CUaWiFC/WVqmY+NDw9pDB+Rkn0FvST7iFej4zJMh3Z0ZeWrxdH6SSoLJs8NQ?= =?us-ascii?Q?rHU274K6ztq4edLDIDYrtl9cBtXSl+jFnVNQcZNI4oqI2DGGjBOYdrt44cqd?= =?us-ascii?Q?V4Bg5a2iL5bUj6OkPRrOfnEiQVhgq7vCr3SLVet9vtJSsR37csu6KUaSOIPc?= =?us-ascii?Q?o+KwAJjiyItWe1aZqYDuu2lCWriiMdRHt/U75PLhoJPoCLlijwggSZcbOLDX?= =?us-ascii?Q?U/cpKVgDh6B+cQ5YmxRS49xhLZIJ6rwRdJ64nW9dkfEtKIVYDXx/SPj0WMza?= =?us-ascii?Q?hgJgJqWFo2V44F9VRx/i/M+pBSx6G+stjJK0EmuvB+/A9+22XAoL8Ds7jcbV?= =?us-ascii?Q?80OIccG2vK3pS1rp7adR/IkiOWY9pBk/YwzKwnPNiOsrN11FjAk5NP3gwlUU?= =?us-ascii?Q?qNfTvRyZrz265lF3gmmWiIjYZvdFTjAUVD2uE0c0HR0I+7sKS1IIRB4YlS1K?= =?us-ascii?Q?eJVVekSbh4owNw+YOk1P0mjseOgoOuwZN6pEqg+wYzRh4tuc2d/60J5uzw7a?= =?us-ascii?Q?Dv3C/N8TIPawB/+9zck2gIukC/dYcQN7CdEHxIwWbJt8qpLkbUfvEgi6jDJ1?= =?us-ascii?Q?Q5BDHKvpe//atYdUPExZd4c0YLtustOdt0fgFqgRFKOhDmeIXo0bHbfOFUCj?= =?us-ascii?Q?V3xcc7l91VA/hKV6bBrrOItLOw8zXhWEa48kbsZNGKMdH2l0xZgjkkB0Fpkl?= =?us-ascii?Q?dzU95S7eKDGxafC7l0aa3sieRA3jNWw4Wsd8lU6cyWn3x++AgKwZFo/PQdev?= =?us-ascii?Q?JVPmn3ZAqc3qae0a39wqbMxIGzewiyAp5ZMzBRVxCzq/QA63O+fy0WujkgmF?= =?us-ascii?Q?EJ5rSn+q7DrKbOME1zplnA6wKlGm2O4HahX/n4nbXTlAMsDlhD9zSPQXW9oK?= =?us-ascii?Q?nKEYF8FtAP4chgaL7Jn6YmAW8oNsC+CfnIpbzRYB18yROKKDljGOS3FEIRaU?= =?us-ascii?Q?93kU5MQrosxC6v9Jn8gpdycYEOp1yiGK+jUNbAsfbmv7i9ScQ6HQGG+N6UQy?= =?us-ascii?Q?KgxRyQ1FA7mm2F2Aolx/HUhE9c2sujxoJEmIn6FoFWVWHBYM/VYgHPILCMqj?= =?us-ascii?Q?bf3BUBExHgsUq+RZLBVba/xzv/D6D0e+bUe9o6Q13+gzUV9yxzFohZM2QXdL?= =?us-ascii?Q?gA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 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: 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 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 c758add734..28bdb8e214 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -351,7 +351,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) @@ -875,7 +875,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; @@ -893,9 +893,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 329589e90f..9ff1c297a4 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -507,16 +507,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); @@ -531,12 +531,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); @@ -574,7 +574,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 a5548074fb..283f5ee627 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 cc7d438011..2f02803ea4 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; }; @@ -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