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 6C4BA45610 for ; Fri, 12 Jul 2024 12:50:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 658B4402E5; Fri, 12 Jul 2024 12:50:50 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2041.outbound.protection.outlook.com [40.107.94.41]) by mails.dpdk.org (Postfix) with ESMTP id EDC0740261 for ; Fri, 12 Jul 2024 12:50:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WrQfjiHJNYRQIKno8VVq1tCs0DiH/jij4i38/P8W4YrAYxNQ/L0tqtvBej5YfcoHSvYFeNp23RHN0EPDmTqqNmLHizNy71+K0DONaXzv/5sSOzz9ZnPEAlSH91beweW9E8V/RY0RBJTZq0z/zER4xoKpiO65ytHMFqKYCrAuWHP+acwIaEOPUj2PMZnW3mcXAg8h4TKluR9LbCc6f6c/EsMWOGEeXQ+lFjdDyMPB45SvH/AOtQ0jaV2oz9ImlEP+DIBvjzNq8UZ3zjOYvsgxE1WAUNE/YLLv9qahPIGeULeDKq8/ydnpMBt4V/T9MMLPZBeiWppGdxh1EcuDK5OOrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=vqElntKPfC6KiB6Fx/2A/H5nAcfsam++bwZEKJ8Y9XI=; b=eQdLvVEZq1aT9I/nwCRNTJ5Ednnx07wF63t7o1Jul+m/2dTwVWvL8g3/6RI9DqpIP4pxSopwZKRV0Mi6rmMIMFkpu+fBFOjzXfeeI000ULV2AXGbkD241KFITbBRVrbvdeteswSolDT9bXUNEAQZIDA0Yo3oBeKOh9Lij2eSjLoYZiIO/R1c8rqAJGo88c+Yo7rmGR6KZU7G+/2J5+zIzHOkXx4Vda3S6ifDVfkLjDGzd9fvKhcplm2s9ELgbeSzR0XuPNXHpBiUMt8a2N4lpv5SlCdiHSK8X6ZloN62PXdfWl/6X/I4kCmTREmc0/e0+tEhqmSQKXyXdD1dNOBxaw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=corigine.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vqElntKPfC6KiB6Fx/2A/H5nAcfsam++bwZEKJ8Y9XI=; b=Rw6BfV5AZAKdDHpOAR10zsj8q1CQG5cOUlDup2mwxptcbFOzBE1MWM/S69UbDOWwlXJ7NuFMN5WBkDNJdx832/8x2V88WrHVglt03ZMI+GNDwUa4hZV/+ebmEl12Pn4zDZXxXO733jJyUvF5GnlMApdL5SSUQDW6dE6nVvXdusuNLF/r/1JJjNneqxKqSBxtOm36bc0DbNfFSChR6aVbvvMzrrdnTjKjvBFPhCyrpiTrk6pnYlKMW7eFM7XIpzjz8f0gga39++LkPihfuP8PPqtRGT0qccAAtJJrEhlkM4JNcjKSWQZrpWj4nHkGR/KbV+hgBQZ4O366eoip4tJcDw== Received: from DM6PR04CA0004.namprd04.prod.outlook.com (2603:10b6:5:334::9) by SA1PR12MB6919.namprd12.prod.outlook.com (2603:10b6:806:24e::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.20; Fri, 12 Jul 2024 10:50:45 +0000 Received: from DS1PEPF00017096.namprd05.prod.outlook.com (2603:10b6:5:334:cafe::ed) by DM6PR04CA0004.outlook.office365.com (2603:10b6:5:334::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:50:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DS1PEPF00017096.mail.protection.outlook.com (10.167.18.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 10:50:44 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:50:31 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:50:28 -0700 From: Xueming Li To: Chaoyong He CC: Long Wu , Peng Zhang , "dpdk stable" Subject: patch 'net/nfp: fix xstats for multi PF firmware' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:34 +0800 Message-ID: <20240712104528.308638-49-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF00017096:EE_|SA1PR12MB6919:EE_ X-MS-Office365-Filtering-Correlation-Id: 32b5e9ef-c3c1-458d-e0ef-08dca2607b73 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?X6pWEtZrXqikVPnza0FYbc/ceN+X+0gBERZ4F0eWSs5jKQ7fMi0WZSgrq1YI?= =?us-ascii?Q?1SuzG+zQsZzctvO+15URgkxSGKnz8oT9Rs68dtgdyATXeCiWbOnMAic5FvTt?= =?us-ascii?Q?4DjYFhpymjrdfXVdXWzJDjpDrbtT3bri+sus+e4k51VFTefIfmxO1H0n7rrL?= =?us-ascii?Q?Dfw7R0WoiL40NbgYKJMEOJKY8lTKWx0UTUqS6dDmLX2eYMnzDmWcEYZrWiA2?= =?us-ascii?Q?zbvXFFUNo5oaRxnagRKp39Fh+qOtxwBUJrnJGrYLED87ACbMzJ+OkV8jeuF5?= =?us-ascii?Q?yZeSRJ0y4p7/+V5gzue74jtqTG/VymKrOEfO0z2Yzx9mfLd3mJLDlZm9n9Ce?= =?us-ascii?Q?/gas3TQjKwtB2P0ousGokEBi5C2vGSjk1kIqMMfXfGit9ZTeKHlKAH2Re2JG?= =?us-ascii?Q?0C1h3McnkRGEsW5LAI9zCXbMgfsLK+blpNsfydjbosDS+116zmhX/DwtTQTq?= =?us-ascii?Q?mUjSmCaBDe2HUvExhyToX9FHJHT8JE3dO3S+KPIIKcUmarxdcXmcFse5t3ci?= =?us-ascii?Q?Vt8pTHZUfA2/i2/hRblBPIq0n+y6kzBmMHNrbZ38w9CIAT3cjfcM5EA0wZlZ?= =?us-ascii?Q?PWPy5gsfp/jHgybQ1tRS0Ccyzd4mJxq97++r/YpwEuizayxJRbZGUtwdOxSI?= =?us-ascii?Q?ZcmMEsR+meN4JUJhvlP/qKG/znw2atCo0uYRF8qXvSwsXP8Jp3usSVh6PM2v?= =?us-ascii?Q?dL6kNlA+5w5XGUeUdSdu9LpavuXjHTYS0uUJTgaWM8I3D9rCZMxDj7tPkBQ6?= =?us-ascii?Q?8mP8DLh7xPxd18QTWWKUd0HoF9REwR0G++f16Fd7I9BXLJidXETGRZFtArjC?= =?us-ascii?Q?6ktL7EXW1Fg7CotJAYPRsH/eYETziLDjuQoOezltwHFmpWbK3mWsizY+zxUw?= =?us-ascii?Q?12lrNzQjYB1n9K0YiqbYdCKh+OkdFct5kU7I7IrvBvYlU68EpBhXDEPTG4oG?= =?us-ascii?Q?LR9jALNHIe0sK6Mm67Yjd3csGwckuoXNJ0QLb9T5+1eoRIcsrL3NhVVoxmHl?= =?us-ascii?Q?lNSlgqhQetClwa4fAwHBxfiw1fXAqflE1kO20P2xOCHN7rRgkFuVRU4/eUKy?= =?us-ascii?Q?SD++wa8pVIQfeJFvi3wBJ/g7l0lNDv/SszPiR4XjagjkQGmJF/u6eQnlsahz?= =?us-ascii?Q?to2jPwKfA23BIns/c+jqNLXBQNVA1lCDngRTfChmrdKO0lOg50w0ZdVpk3Wd?= =?us-ascii?Q?l5vOFRQGxg3DXL94xycMZKR/IHnUFGvoJwAkfvcJVasxpUcbVZmPtOyhDUpH?= =?us-ascii?Q?d8/NM1UTC7kSRADO7weHWQAtxPm3kXo0JSewA0D54TGUDjuo4xGLuz2SFGWg?= =?us-ascii?Q?kx9rnuRksins+BPB4OFGviGWl1u67tM9WS/866EwkqOaxtJkfvonFxGklWex?= =?us-ascii?Q?Fm4ZAWNCwFdkBhX1mw6spW2haFwag3CyLlbl03Pv5YiupGCszfkzYEcE4iOb?= =?us-ascii?Q?QlOYkw1owZiMNfRcvh5n38pPl+kwt+OE?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(376014)(82310400026)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:50:44.9957 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 32b5e9ef-c3c1-458d-e0ef-08dca2607b73 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF00017096.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6919 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 23.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=28d17414fc241e3e996f1127fc93cd547237875b Thanks. Xueming Li --- >From 28d17414fc241e3e996f1127fc93cd547237875b Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Thu, 23 May 2024 10:49:15 +0800 Subject: [PATCH] net/nfp: fix xstats for multi PF firmware Cc: Xueming Li [ upstream commit e54d68a0e3b8de418afa4141930b216ae583fcac ] When using multi PF firmware, the other ports always get the xstats of the first port. Fix it by adding the offset for other ports. Fixes: 8ad2cc8fec37 ("net/nfp: add flag for multiple PFs support") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 50 ++++++++++++++------------------ drivers/net/nfp/nfp_net_common.h | 5 ++-- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index e632051d42..7d86618bc9 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -318,8 +318,6 @@ nfp_net_uninit(struct rte_eth_dev *eth_dev) net_hw = eth_dev->data->dev_private; rte_free(net_hw->eth_xstats_base); nfp_ipsec_uninit(eth_dev); - if (net_hw->mac_stats_area != NULL) - nfp_cpp_area_release_free(net_hw->mac_stats_area); } static void @@ -349,6 +347,7 @@ nfp_uninit_app_fw_nic(struct nfp_pf_dev *pf_dev) void nfp_pf_uninit(struct nfp_pf_dev *pf_dev) { + nfp_cpp_area_release_free(pf_dev->mac_stats_area); nfp_cpp_area_release_free(pf_dev->qc_area); free(pf_dev->sym_tbl); if (pf_dev->multi_pf.enabled) { @@ -639,43 +638,31 @@ nfp_net_init(struct rte_eth_dev *eth_dev) rte_eth_copy_pci_info(eth_dev, pci_dev); - if (port == 0 || pf_dev->multi_pf.enabled) { - uint32_t min_size; - + if (pf_dev->multi_pf.enabled) hw->ctrl_bar = pf_dev->ctrl_bar; - min_size = NFP_MAC_STATS_SIZE * net_hw->pf_dev->nfp_eth_table->max_index; - net_hw->mac_stats_bar = nfp_rtsym_map(net_hw->pf_dev->sym_tbl, "_mac_stats", - min_size, &net_hw->mac_stats_area); - if (net_hw->mac_stats_bar == NULL) { - PMD_INIT_LOG(ERR, "nfp_rtsym_map fails for _mac_stats_bar"); - return -EIO; - } - - net_hw->mac_stats = net_hw->mac_stats_bar; - } else { - /* Use port offset in pf ctrl_bar for this ports control bar */ + else hw->ctrl_bar = pf_dev->ctrl_bar + (port * NFP_NET_CFG_BAR_SZ); - net_hw->mac_stats = app_fw_nic->ports[0]->mac_stats_bar + + + net_hw->mac_stats = pf_dev->mac_stats_bar + (net_hw->nfp_idx * NFP_MAC_STATS_SIZE); - } PMD_INIT_LOG(DEBUG, "ctrl bar: %p", hw->ctrl_bar); PMD_INIT_LOG(DEBUG, "MAC stats: %p", net_hw->mac_stats); err = nfp_net_common_init(pci_dev, net_hw); if (err != 0) - goto free_area; + return err; err = nfp_net_tlv_caps_parse(eth_dev); if (err != 0) { PMD_INIT_LOG(ERR, "Failed to parser TLV caps"); - goto free_area; + return err; } err = nfp_ipsec_init(eth_dev); if (err != 0) { PMD_INIT_LOG(ERR, "Failed to init IPsec module"); - goto free_area; + return err; } nfp_net_ethdev_ops_mount(net_hw, eth_dev); @@ -760,9 +747,6 @@ xstats_free: rte_free(net_hw->eth_xstats_base); ipsec_exit: nfp_ipsec_uninit(eth_dev); -free_area: - if (net_hw->mac_stats_area != NULL) - nfp_cpp_area_release_free(net_hw->mac_stats_area); return err; } @@ -1335,6 +1319,14 @@ nfp_pf_init(struct rte_pci_device *pci_dev) PMD_INIT_LOG(DEBUG, "qc_bar address: %p", pf_dev->qc_bar); + pf_dev->mac_stats_bar = nfp_rtsym_map(sym_tbl, "_mac_stats", + NFP_MAC_STATS_SIZE * nfp_eth_table->max_index, + &pf_dev->mac_stats_area); + if (pf_dev->mac_stats_bar == NULL) { + PMD_INIT_LOG(ERR, "nfp_rtsym_map fails for _mac_stats"); + goto hwqueues_cleanup; + } + /* * PF initialization has been done at this point. Call app specific * init code now. @@ -1344,14 +1336,14 @@ nfp_pf_init(struct rte_pci_device *pci_dev) if (pf_dev->multi_pf.enabled) { ret = nfp_enable_multi_pf(pf_dev); if (ret != 0) - goto hwqueues_cleanup; + goto mac_stats_cleanup; } PMD_INIT_LOG(INFO, "Initializing coreNIC"); ret = nfp_init_app_fw_nic(pf_dev, dev_info); if (ret != 0) { PMD_INIT_LOG(ERR, "Could not initialize coreNIC!"); - goto hwqueues_cleanup; + goto mac_stats_cleanup; } break; case NFP_APP_FW_FLOWER_NIC: @@ -1359,13 +1351,13 @@ nfp_pf_init(struct rte_pci_device *pci_dev) ret = nfp_init_app_fw_flower(pf_dev, dev_info); if (ret != 0) { PMD_INIT_LOG(ERR, "Could not initialize Flower!"); - goto hwqueues_cleanup; + goto mac_stats_cleanup; } break; default: PMD_INIT_LOG(ERR, "Unsupported Firmware loaded"); ret = -EINVAL; - goto hwqueues_cleanup; + goto mac_stats_cleanup; } /* Register the CPP bridge service here for primary use */ @@ -1375,6 +1367,8 @@ nfp_pf_init(struct rte_pci_device *pci_dev) return 0; +mac_stats_cleanup: + nfp_cpp_area_release_free(pf_dev->mac_stats_area); hwqueues_cleanup: nfp_cpp_area_release_free(pf_dev->qc_area); sym_tbl_cleanup: diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index ded491cbdc..c96f55976a 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -98,6 +98,9 @@ struct nfp_pf_dev { uint8_t *qc_bar; + struct nfp_cpp_area *mac_stats_area; + uint8_t *mac_stats_bar; + struct nfp_hwinfo *hwinfo; struct nfp_rtsym_table *sym_tbl; @@ -165,8 +168,6 @@ struct nfp_net_hw { struct nfp_cpp *cpp; struct nfp_cpp_area *ctrl_area; - struct nfp_cpp_area *mac_stats_area; - uint8_t *mac_stats_bar; uint8_t *mac_stats; /** Sequential physical port number, only valid for CoreNIC firmware */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:16.288797465 +0800 +++ 0048-net-nfp-fix-xstats-for-multi-PF-firmware.patch 2024-07-12 18:40:14.076594231 +0800 @@ -1 +1 @@ -From e54d68a0e3b8de418afa4141930b216ae583fcac Mon Sep 17 00:00:00 2001 +From 28d17414fc241e3e996f1127fc93cd547237875b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e54d68a0e3b8de418afa4141930b216ae583fcac ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index cdc946faff..f98af2044b 100644 +index e632051d42..7d86618bc9 100644 @@ -26,3 +28,3 @@ -@@ -585,8 +585,6 @@ nfp_net_uninit(struct rte_eth_dev *eth_dev) - if ((net_hw->super.cap & NFP_NET_CFG_CTRL_TXRWB) != 0) - nfp_net_txrwb_free(eth_dev); +@@ -318,8 +318,6 @@ nfp_net_uninit(struct rte_eth_dev *eth_dev) + net_hw = eth_dev->data->dev_private; + rte_free(net_hw->eth_xstats_base); @@ -32,2 +33,0 @@ - - return 0; @@ -35,3 +34,0 @@ -@@ -617,6 +615,7 @@ nfp_pf_uninit(struct nfp_net_hw_priv *hw_priv) - { - struct nfp_pf_dev *pf_dev = hw_priv->pf_dev; @@ -38,0 +36,5 @@ + static void +@@ -349,6 +347,7 @@ nfp_uninit_app_fw_nic(struct nfp_pf_dev *pf_dev) + void + nfp_pf_uninit(struct nfp_pf_dev *pf_dev) + { @@ -43 +45 @@ -@@ -933,43 +932,31 @@ nfp_net_init(struct rte_eth_dev *eth_dev, +@@ -639,43 +638,31 @@ nfp_net_init(struct rte_eth_dev *eth_dev) @@ -52,2 +54,2 @@ -- min_size = NFP_MAC_STATS_SIZE * pf_dev->nfp_eth_table->max_index; -- net_hw->mac_stats_bar = nfp_rtsym_map(pf_dev->sym_tbl, "_mac_stats", +- min_size = NFP_MAC_STATS_SIZE * net_hw->pf_dev->nfp_eth_table->max_index; +- net_hw->mac_stats_bar = nfp_rtsym_map(net_hw->pf_dev->sym_tbl, "_mac_stats", @@ -94 +96 @@ -@@ -1070,9 +1057,6 @@ xstats_free: +@@ -760,9 +747,6 @@ xstats_free: @@ -104 +106 @@ -@@ -1931,6 +1915,14 @@ nfp_pf_init(struct rte_pci_device *pci_dev) +@@ -1335,6 +1319,14 @@ nfp_pf_init(struct rte_pci_device *pci_dev) @@ -116,4 +118,4 @@ - hw_priv->pf_dev = pf_dev; - hw_priv->dev_info = dev_info; - -@@ -1943,14 +1935,14 @@ nfp_pf_init(struct rte_pci_device *pci_dev) + /* + * PF initialization has been done at this point. Call app specific + * init code now. +@@ -1344,14 +1336,14 @@ nfp_pf_init(struct rte_pci_device *pci_dev) @@ -128 +130 @@ - ret = nfp_init_app_fw_nic(hw_priv); + ret = nfp_init_app_fw_nic(pf_dev, dev_info); @@ -136,2 +138,2 @@ -@@ -1958,13 +1950,13 @@ nfp_pf_init(struct rte_pci_device *pci_dev) - ret = nfp_init_app_fw_flower(hw_priv); +@@ -1359,13 +1351,13 @@ nfp_pf_init(struct rte_pci_device *pci_dev) + ret = nfp_init_app_fw_flower(pf_dev, dev_info); @@ -152 +154 @@ -@@ -1974,6 +1966,8 @@ nfp_pf_init(struct rte_pci_device *pci_dev) +@@ -1375,6 +1367,8 @@ nfp_pf_init(struct rte_pci_device *pci_dev) @@ -162 +164 @@ -index a4eaed6433..8d9851f969 100644 +index ded491cbdc..c96f55976a 100644 @@ -165 +167 @@ -@@ -116,6 +116,9 @@ struct nfp_pf_dev { +@@ -98,6 +98,9 @@ struct nfp_pf_dev { @@ -175,2 +177 @@ -@@ -199,8 +202,6 @@ struct nfp_net_hw { - struct rte_eth_xstat *eth_xstats_base; +@@ -165,8 +168,6 @@ struct nfp_net_hw { @@ -177,0 +179 @@ + struct nfp_cpp *cpp;