From patchwork Sat Oct 28 06:53:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133556 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 9CB7A43220; Sat, 28 Oct 2023 08:53:52 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0CA20402DE; Sat, 28 Oct 2023 08:53:49 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2093.outbound.protection.outlook.com [40.107.101.93]) by mails.dpdk.org (Postfix) with ESMTP id 82F6740272 for ; Sat, 28 Oct 2023 08:53:45 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dixV2LqVo6dyY/yOLDHhDBY8besmVtpCmP1OOVwtAo+LVwtKB5QU18pHRGU/RHg9O5KVWDEho7NP9pEkdCvT865k4iiMxfCFR6vgDX1u2Ox+rcEytrCJrvOWaxPnhStfdwZQ3LwA2sv7HVStLJTCAgbatAcXWMee/xTKz7Cs/qWzsW2bv0why6AkjexS/hTx+VMk6wXDjK6OOpEIRedLqexQhkw0fxkW3/m0M3eyCv9CG3tvdkXvV7/EryWvI4R5VDpugu/+31Y/KA1t/cUF/Eep/DBY9/1qWiyLaVw4xG3zYcxxD4I9huz+Z+NEiBTbVnD4b9CX00psN24Pk+ofEw== 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=ngAzIZj7ZKSlER+atxQd3+kIA+MCvahvi3zEZ8i/4Xk=; b=SG7Aplm30SB02inAo04wG7XvdbkVQCxLoAd3yMTkGHjuGVAebpqgT72xlXApaLgvyG2PVX8yvLLzImF2i2/j9+8wW4jmhNPQwusHasUPfpLQJ/YrcY5h5xnNGV5LkgQ1cS533/pEU4ulE/XyUifXN1876ZcE3W+q0sFTxAi4TNiSxPiRePkyy+l4xgCLHcaoARizWjPpdDE4KOoXaaC0o6y+9kGwIKdbHxc5Ty/FLveFFieijs4ySFITUOUdIfE+o2nAa7KNhdECAsVRKuxmPFAqcY9we8bEvaQjtu4W9j6vHJVSfq04/srhUqeWS3KbQKR5yKQNHApxpiGt5DTJnQ== 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=ngAzIZj7ZKSlER+atxQd3+kIA+MCvahvi3zEZ8i/4Xk=; b=G7cx2Cx0CUv3YuV6Mjg3H8B+wYBuoqlrUi2mcl5yZQE8dt8k1uDoA403BeSei6pDhCnJcnkAeEkUyrsK4Nlo5esyjhKc76iErOZwdQf8j7Akpl7gJ2uoqwJyhjNqbMzh88ZzZFAfpkBSKhUthdqtp1XBE7RPdbXDEECWbdXDfXA= 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 SA1PR13MB6055.namprd13.prod.outlook.com (2603:10b6:806:338::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19; Sat, 28 Oct 2023 06:53:43 +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; Sat, 28 Oct 2023 06:53:43 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH v2 01/11] net/nfp: use the suitable helper macro Date: Sat, 28 Oct 2023 14:53:05 +0800 Message-Id: <20231028065315.1937188-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028065315.1937188-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> <20231028065315.1937188-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SA0PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:d3::25) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB6055:EE_ X-MS-Office365-Filtering-Correlation-Id: 648d9d16-5912-4c78-ffbd-08dbd7829fde X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: etGVYj6n05HjK+ds6tEzWzgx+Wx2tSqzYHlYx3cOvy+fN8Q4UECDDsTZsy39N/ouJkr+YbBhPDxXs4E0qffKiOYWRrlWfw39WrZnJXYJwQbZbblQ2paN9hvrjNj2SJHiZMnKTREq0xJP+zpzoBuP+L/DW8xMAXOQXsqmsOsn5jV3f91RRz5IqWGid1N/NOsC8DLxM1pBnpeVHw9eMkCclveYJWSgFYKqjER/5NgJdNbY7nhtXclx9QW5avsnbeQqitz7YXJGeZFNnNWDGJH3EFZgGF8AWXMZgBEc4r0RwKV2aG9fdgfHygRcoBBZeYwZSluIT71eelU2mWFfspdBMTZeHEW1p20o9nMdRq8PQp8ESIAmabZZFZDDovP9x40yoRcpfpiwcH496TnjhZqmU5ET2pMf6Szbkz/ltf5GNMV1Plsy+EHAhElZw6Y22ZVmZPGtrQ5RwlBvRVbb+BiMObJFAU8ZIxgobdoZ/wk+BDcwLLGSVUWWOUJ8IQSUMTXJ7abVYtT3jNYsFIFckyc4M4x/wdPMEmCKLha0u9cRDRVDboRhPBZL1oMaBqyG69N2UllJM0up2pO1BNT30PRNFrUAD9lokuSSfUjw8sb+0K/SdGyf/+ez2UjI9N/VBR2mDHscL1dbClAW65XwHVlF+lfkph8RrY4EezXj8fXkyNc= 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)(136003)(396003)(366004)(39830400003)(376002)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(6486002)(8676002)(8936002)(478600001)(6666004)(54906003)(66476007)(66946007)(66556008)(86362001)(4326008)(41300700001)(5660300002)(6916009)(2906002)(44832011)(316002)(6506007)(52116002)(38100700002)(36756003)(2616005)(1076003)(107886003)(6512007)(26005)(38350700005)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jUSyfQFI0BChJna+SMv1Fz3bOSEBAnxDvmNMMgyDVGaXy69sxviGE5XgHop4EXO1bsXYyRLmPoCtrWWa5G7Wgadq8aKJY7XTxzkvOYta11iahc5XQ9kw3e/k50eEAWvy9pam6W+pBRhzSaiWF8fwiRZhaXq6KSNU1Lyv5FnaZn304SSnQBexYEROZNoXMfcCNx4c4hdxq50+wjYcuiogmq0dOrxuUhHAz+dcdCPHkGHg/i83IFbQ9plNOCqHxCzHOauwouPoNUwPbfe2G9m9eFTtR92flkRtKF7W2yZafKiDeSJJApz8bGQQFDk/0ljQeM1QPqPU2qXrQdoJ3y1pYowi+dBto+ePJBg2qb/qs2hYrIlitW0ku7PYUkywOhcZkrSZsTDiufcQ6ikqS2354yuZqmJAln8idrLHJVQNvIAbC0pb2BG9EDoeLMaPbLml9JjvFv2EE19QFgja4mGXr35kBXPuW3kzCsYG2jNNR6zcz1o8Kwi0d1WPpXgunsvyyOiCyRf6i+xpZQu55YztIrfG6nFy7NQXdMWfe1PcAtmNEKeEbAauGofSsrMqn+Biy7TUkxmjOqKJ2aDfSKsRB6MMo0bK6D6NWjVjl/K9oA428dhT0lcZcAR+Nv3Fr+xM4kpmmUNUHvi0MRX+bMBCynH5AIyYLcrP0aOeVytZgu4f9tuGiMW/gl8kM/XF8cdneBVKdmBSD7QLj9+EzisdDFL64lwMxih4N9l2R8t59uuZ4H/OOTSfYw4+l5tqs0XgRtgEhJ5E8wEcVVQxbjDrucuyhTm9DIhfyxeQxB6Xt5jcKmBSERF4t7akXA8Ynpu7vNdlydkXkngWE02TrQ+yQ+w7Sjbs9zBM1/AtY+14rbGqMzMXIrYmDY2Mx8t/wNXXaRukNhI9zemccLGO78QwZjNxc35fVaRUmj0YLl7iNtlsQLp8uuecHis9yPvFeFRvEtBJxRV9kJ0UZU5S4/7IXBoMZDgVt3bW4I5hY1YMIceaokUhfpgkQyqQTD/0Kl2aj+OmNLfWQmCe1jmCwE9BPPqObBK64xH0MdHjrvaQmiZTkq3V9Utz8NFUPijtW+qI4mdD+H7vQzxmZZgY0K8oJftuPjUVRS3bX3vaUYo28ShWTENCUoMSZuYA7I/+jI6aZLDxcq+Mtl1l2w0bMFBPzP53dCX9YfWoFfYXyXmy7jbjWJ1vnUQvJwnQzGmcmHIJEVLQruF4lYG/mVscLQIS1SIGzroKBVYhzPsb9Dt9gojlxjsWjb43X+izOl9YyIPVyp/jJ3LY6I+0GiwXO1FC1+pqznF/XJWGK1xJys6p7k8OokZCxzo7Ir70UeiCZTh32d/VLfhtgWJ9qzFT/0AyShrLoW515CCciUXWmz7AG7ZjXQOowzZX3gA+180yewXk9rOGULo5QxSDDBWcOS3gJlLd1pd9HzRSVtb8ofZBNSpBkUBHfUuY3JYHJrzTAGQ1/CLtqUpFvrrJ4G9d2Cy94yR4faOejH+GZhtxB+eRrd1HAELqvpzp1ig6IJdJ9DlpZmL8PvP3G22xdZVNEOk+maInaacPep9vvE6SWI1q2zb43YV2JUsiwnSFQvKsovS/VlBCLFqgBL1p3SsNqpobBg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 648d9d16-5912-4c78-ffbd-08dbd7829fde X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2023 06:53:43.4411 (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: rRgyY2tnUwmeckqlFPjP0iIDgehR8KSA3PBUK1DY4db2W5gZnPnldQfgdf4Mc2DBmzzNrLtdxe0bMotCEycGiCOsk+SWFH367ahNPMendsA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB6055 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 Replace the `rte_pktmbuf_mtod()` macro to with the more suitable `rte_pktmbuf_mtod_offset()`. Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower_cmsg.c | 2 +- drivers/net/nfp/flower/nfp_flower_ctrl.c | 4 ++-- drivers/net/nfp/nfp_rxtx.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.c b/drivers/net/nfp/flower/nfp_flower_cmsg.c index 2ec9498d22..4013b32fd0 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.c +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.c @@ -13,7 +13,7 @@ static char* nfp_flower_cmsg_get_data(struct rte_mbuf *m) { - return rte_pktmbuf_mtod(m, char *) + 4 + 4 + NFP_FLOWER_CMSG_HLEN; + return rte_pktmbuf_mtod_offset(m, char *, 4 + 4 + NFP_FLOWER_CMSG_HLEN); } static void * diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c index b4be28ccdf..d19b60bc69 100644 --- a/drivers/net/nfp/flower/nfp_flower_ctrl.c +++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c @@ -375,7 +375,7 @@ nfp_flower_cmsg_rx_stats(struct nfp_flow_priv *flow_priv, uint32_t ctx_id; struct nfp_flower_stats_frame *stats; - msg = rte_pktmbuf_mtod(mbuf, char *) + NFP_FLOWER_CMSG_HLEN; + msg = rte_pktmbuf_mtod_offset(mbuf, char *, NFP_FLOWER_CMSG_HLEN); msg_len = mbuf->data_len - NFP_FLOWER_CMSG_HLEN; count = msg_len / sizeof(struct nfp_flower_stats_frame); @@ -398,7 +398,7 @@ nfp_flower_cmsg_rx_qos_stats(struct nfp_mtr_priv *mtr_priv, struct nfp_mtr *mtr; struct nfp_mtr_stats_reply *mtr_stats; - msg = rte_pktmbuf_mtod(mbuf, char *) + NFP_FLOWER_CMSG_HLEN; + msg = rte_pktmbuf_mtod_offset(mbuf, char *, NFP_FLOWER_CMSG_HLEN); mtr_stats = (struct nfp_mtr_stats_reply *)msg; profile_id = rte_be_to_cpu_32(mtr_stats->head.profile_id); diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index fc94e5f0b9..644be2700e 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -448,8 +448,7 @@ nfp_net_parse_meta(struct nfp_net_rx_desc *rxds, if (unlikely(NFP_DESC_META_LEN(rxds) == 0)) return; - meta_base = rte_pktmbuf_mtod(mb, uint8_t *); - meta_base -= NFP_DESC_META_LEN(rxds); + meta_base = rte_pktmbuf_mtod_offset(mb, uint8_t *, -NFP_DESC_META_LEN(rxds)); meta_header = *(rte_be32_t *)meta_base; switch (hw->meta_format) { From patchwork Sat Oct 28 06:53:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133557 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 7AEAA43220; Sat, 28 Oct 2023 08:53:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2B35D4069D; Sat, 28 Oct 2023 08:53:50 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2128.outbound.protection.outlook.com [40.107.101.128]) by mails.dpdk.org (Postfix) with ESMTP id A43A94064C for ; Sat, 28 Oct 2023 08:53:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NcknuzFdv1gbq/62cfY/nFUilReabj0159JP79p5mf32FB9d7k4nuUHqejlqE5U8b41tRwqxx2T1fKOGTwnaN8KYWS31y3FP0sc0lESZ2kaJqhqGBwBhiLWoQgwivGDIxtxzxreAtgIBotS3yGmQu8k0WwnlyKHAkE4/ln+S4hckVYL8m2V/rFiBS6VzaULdWDiXHK3nBLnISVEl+sEkLfzdIRpnNgr3llaztf4v6DzCp6GrTq7Vqlu+5MIrNIJ2ASH2Vrn/Ncxl94YZuq6OONbboq7DHQHcLku0ZTPBfFMZ4bg0YioVDGui5ZYWZTRpLIYHS+pVAH0UGzejawsxAA== 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=jJ2KealchQyOffBQAnd0TdJ4UTOH0Q/rzFfFuUO5yDE=; b=l7qp1i3OlCi1z4pujF0YItnpQmpwtue49E4hQDue/wnAibEwVyNB5aGkvRhxqOVwhRI+QPdLbGzMHt0f03mfXHyhALm1u5KPrx3PgL35WD1dt1e+9m4THNFZ2z1vt0JslDvjgY9aj9J1W//k6Nj59P0+vmYAVE3kvni6KQJjlis1XVot0tCve/7gnWVvW8HbwOYgBicPL13GCC6HVAUvyzPExMUxcx8Q2Ac8Y5/QLQyfbYlLSpr1zNm2AnJMklJ1wQjZnbIYAJ05eOj0d9j7hhwth/BH0IFSE1ISxma91h3pNcT1yu88jFupABWu+NKZ3zE85GCrVoiHuFsxWY4O4g== 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=jJ2KealchQyOffBQAnd0TdJ4UTOH0Q/rzFfFuUO5yDE=; b=NWu7Uk99ODIvXMWuoGfFu7X16XwJvB2coylkBE/EKtQz4fyYrfKo8eWB3mcfUjY5xmz0ls27BUGi5weSUl4t9xsY//CLgVrDollH2HoX6HmUmrgBmdOAjRTE2t/TNlb+u5E0i/SrtkJKppujbZX1y7WabpoWLrAnXDJ/U/yoeA0= 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 SA1PR13MB6055.namprd13.prod.outlook.com (2603:10b6:806:338::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19; Sat, 28 Oct 2023 06:53:45 +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; Sat, 28 Oct 2023 06:53:45 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH v2 02/11] net/nfp: remove the unneeded call of underlying API Date: Sat, 28 Oct 2023 14:53:06 +0800 Message-Id: <20231028065315.1937188-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028065315.1937188-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> <20231028065315.1937188-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SA0PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:d3::25) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB6055:EE_ X-MS-Office365-Filtering-Correlation-Id: 39e9e6c5-cf4e-4ee8-29a4-08dbd782a12f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OOj0kXXMw2i0kXdl2gtEEMGSz9U8WKeOwq/0eNA8IM+GHt7wMK/Ij+ToLle40gXgrrGdTJqndD3tYf8aZB0oZ2fYVJVUGgPlTq4KmtlvlwR/NiNCjTWk6j7ZaDimeIZ+9RzqhW3fuXPv5J3TIrJUUZMC7Roldk4I2uWP/CuyUWUVwtWN2HwkXTGHkJhsqBPcTQmVP72XYZDzkvqsvcJzAuuKTvRdUmlqDenA02Po3bePs6babkCyf6p9ojfe2oGNYznJnhIDbexbLIxk3qpe/DEXogX4wFDdRmUeWRCaEsPoVA28cuOBEJ0OfUMfIKkrd/rCHt7fEhcNkfsxhKxRaxi5nkj9g/HeZUm6ROcclvMkVVsSF+rZ3ulfNWZpSYGq/YVrECTyUPcxWkJFHn2JndCC7quiHOp+XcIyILJfhCE9n7LCQ1lPfmwtxJwqPezfyfHM8wCkGZIzqerTXuyLBCey3hWDVck5u391uCj49z9IZx0DpO6/6zaYeRGy9bjcuCUSLqY7Y0TZ1+TpHvFwDifwNeA5JviMzUKpo4AkSyWlV3Y2ZtWz7ibRgTfSV8hBx/ExED9ek6UkQbaZG3BmoL5E6pmyQ5l0oQ4TdqgbwS1Ex53TGZNnVmSxhPSnXwEDVOzPigu/0dsKlGxCwM6M3b136nSLLGJzsUqgpmsdGzY= 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)(136003)(396003)(366004)(39830400003)(376002)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(6486002)(8676002)(8936002)(478600001)(6666004)(54906003)(66476007)(66946007)(66556008)(86362001)(4326008)(41300700001)(5660300002)(6916009)(2906002)(44832011)(316002)(6506007)(52116002)(38100700002)(36756003)(2616005)(1076003)(107886003)(6512007)(26005)(38350700005)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: W0bnA9oNrYk7ZF1jk0QXWkPPa4Fw7nt+rZAY9srMtfP1b1+wGv1K96AZAXcnXU6eJSynhwlm+Jm0m9gifUZLgW3r9NYJg+y6NDtiu9JS66ArgSorY+6ozbIa13rgd4Av5TCwPVO2/crIn/v6flmW9qL3tLNXC9aQGvPzVyrybQra1Tg0D6gMxyWzszVkqaCF/Tl5C27CamI2qjSSg/Bm/yIMiVJGPVwQzTKgc0JyZnFeVxryz6YQ/gFcenAFCDs3WYs7JJCTbylQIkibpn/Vcc2Q09ZpgyXO/ynO/gFWu5JCjxTbiw/Ikm3U+UUzf2Vi5T2rtktjhOHURTvowVADOnaOWC77wtULDL0bIdfnMQLMsqessiLBx1OsVObSUgcONN2ptmxlc/k6vZy/68G7pU2GoEzMbUtEe7vNNoKFDWQ6xbg5eHgdsRi09ISlpcF9XZkMVFdIaZe1xxZpPJ+xtdk+8dFfzTMSssNsPLwWpB+i2akQniFNcyDC7kkn+FnwdMSJd4LL6HBY47HRNjN9FIH5iWgB1fFSlB0J8x+cNXVROaZOKDoRjsHve3Ufa18rhRmNJSYBJffcI9YMAk+khAIbl0ahnNmy9/VKAbqt4HWjJaz8gs4aJ00Lran+qZLAibhd6f1sOiXXq+tENPfBieGz0m5iLFB7nzp58ELPvLsyw8PnUDCxPhQzEq3diS2Bd6NBGMRDVQVLgbGGXt2Qy4dnk2PVkMObzhWziqBSEXTKrjDb1y/R7yI5dXTKkoC72+Fwz/DauT1fUjjhcSdH9WSiRlhwKWwhUw5nCMh6kSaUDV/Y7lipAHqre01xdrlJLXfmdXX+3cTFpfHL6Ab+Z3KG0at4LP0GueDF1XSh5t5FHMmP3qf0aD+BVIXDIkUnyNx+N1KLvrc9K02Ftvq2NKFmMXqIXr/bdykd3bBX12mQFAJzCk2roDO4ui0V0q/pgaiEdDXxeVZnN3n/Od0iesMLWSgV0ZnL15yxCPFhyxoLr/ZTS1F4CPrHYoUoBdLa6LMuZxxZSWPHT6klXDihYYVL9dOQSbPLkzop7aedsYYdXrEED9PJmXPrsFTh8DcSljI9aCRmEOeoB/O5eS9wlLC3A448ebeeG2FHCxWV3tXbIR51RN16gDxHgOLLTTRSE5Is+zrA3SszibUapzslURG1CecvEHlzE80G2bxzlmk3nGLVTKuwhdt7/6OHBfJGQ96HIkEtcqYaGeq7xGV2gIf5o0Q8AHxd5XVcniTEBlGA+U0FgNJ2HxBhiN5Kj3uJWs3HtC7yxBqL/g0tSzsuolqxBbwQzmIPa0C70nxgQysYJBsL62brb4XJ6fpGTI7oQg9Ew5cOfZhGYgXYqNRWMmuLsHPlvoJQsZGU87qf6KyCcokDz11h4JwEDx/bRuhQWIeCY3bbOpPtvLZm+z4RlWdb+/FiV39ecKr+j2balABngy3P64+ZSSL7T+eSjFlHEdD7LjcKQuhzsvd7DS6aw47jdJSTyMMC6a2Lw6Xwrgz9IJDDflSQlLroMn8BaousFktjRpSC9gHl3Z2LaFsRxX2qzurMK7d1ZbD6kKDfjZekcJXlyp0hP4BhV4CGELYWdseek7o4U4uzvm8LqueFIg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39e9e6c5-cf4e-4ee8-29a4-08dbd782a12f X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2023 06:53:45.8608 (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: ttBFDIHdoF6gAhvutxun6iEPE2N1tB7Ap+dE5q3bG6g7Hkg9vByTQiTs5Cwp7q49ffTa6crtE/kO+7AltsHzcdt4TURvuST7ARlOhPlNDoA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB6055 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 Remove the unneeded call of underlying API in function 'nfp_net_pf_read_mac()`, because we already store the result of it in data structure. Also change the return type of this function to 'void' as there is no abnormal exit logic. Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 76317925ec..0fed0ef72d 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -21,7 +21,7 @@ #include "nfp_ipsec.h" #include "nfp_logs.h" -static int +static void nfp_net_pf_read_mac(struct nfp_app_fw_nic *app_fw_nic, uint16_t port) { @@ -31,13 +31,9 @@ nfp_net_pf_read_mac(struct nfp_app_fw_nic *app_fw_nic, /* Grab a pointer to the correct physical port */ hw = app_fw_nic->ports[port]; - nfp_eth_table = nfp_eth_read_ports(app_fw_nic->pf_dev->cpp); + nfp_eth_table = app_fw_nic->pf_dev->nfp_eth_table; rte_ether_addr_copy(&nfp_eth_table->ports[port].mac_addr, &hw->super.mac_addr); - - free(nfp_eth_table); - - return 0; } static int From patchwork Sat Oct 28 06:53:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133558 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 8831943220; Sat, 28 Oct 2023 08:54:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4EED840A72; Sat, 28 Oct 2023 08:53:52 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2097.outbound.protection.outlook.com [40.107.101.97]) by mails.dpdk.org (Postfix) with ESMTP id 8C7CE4064C for ; Sat, 28 Oct 2023 08:53:49 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mdrK4h8Ab12FifwUm8BuqPT8LX8xj6h9Z5bsNi4yO7zhB75+tTlG1uR04xuz+YM/rMcwIRO/NnkG7rMZ+6OfqO8FywFeJqSKtiZIhDrRKf2Nv+NgkkASR9kmjHy39+S+pB0nyWU+WZD5z+ni+9BzllVwfdwAxKHXw0PKN+Ab8u46Xpdd1z4Nr263cvDThGjXfay5P2kz4EA4qyxJ/tx0CyIX43Ti0cbd4t4CullKvjYT7U+MClA8Dt34Wp2vyXITKksHCKCVjCaibVIUhv4i5jKASJx6cl/Xnq//t61rW2FST6yHrsJ/AfLmu0KMMNPzog48EIjvwnhfCsnPZIDlMA== 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=oKH4OsNZEtPzm9zWiEFhNnb5pPu+qMN4eP/Lf9lzYDE=; b=aLEB/FpLnzsSlDV9C3kW0Nf6SUK9yUwbC+uQqJbaK9bVfJz0f0c02+ejLBBPsTWbXYEV0IMtqy0LBwB/G9kiAGmtXKz9m79F+3YmsAeK5UpdfLD448uXExViTjWIOFH7ciDnk2PS4ts9QJ8CGxFTgdSwFOcMGdaoXHiAyCrCOlrWgy2HfhPziDLUUcpELv/M/mRaT7xN4fkTxlNMaCP/SmTKaH9hQI3Tr5nT/96DqAP7SchDTl0Q3Ns/QFKtsqJs3d045Smw8bV8ipXukh3RChSBnoNPEEafV7IiN6+aKI3VgqnC9FTGLKsjXBYn54bszE77r8Nn8YhHJqIngjksPw== 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=oKH4OsNZEtPzm9zWiEFhNnb5pPu+qMN4eP/Lf9lzYDE=; b=MWoSt6upo4sxARONecVlQCUQLc//TLkpEMWBWxvCLVkBXJsPOsBoB9YfeKHz6+9nQ+3Yo6undaxOycEQq1nB9FSyr0vLSemP3qYBxPLcpyHNDRHZ1ODOPTsFo26DK58d8qbCBtErKfvWw8q174tORC1tPRkJIc2Z22fnGk65DPk= 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 SA1PR13MB6055.namprd13.prod.outlook.com (2603:10b6:806:338::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19; Sat, 28 Oct 2023 06:53:48 +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; Sat, 28 Oct 2023 06:53:48 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH v2 03/11] net/nfp: remove the unneeded check of process type Date: Sat, 28 Oct 2023 14:53:07 +0800 Message-Id: <20231028065315.1937188-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028065315.1937188-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> <20231028065315.1937188-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SA0PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:d3::25) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB6055:EE_ X-MS-Office365-Filtering-Correlation-Id: 22ddf9a9-3499-43fa-53ee-08dbd782a29e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L23Kfor0F0RGjogmQv4gxYDS0ChJtp0AoQAH6D4ApSNRrbnXBSScFMgF0hvwlg4FyhfLTu/C95J9aPFfORZJfhPXWd89FX3DXXuHlDCBkSmKqtRMC6Z6lKw7s2VyacE5+tHGfuQPeVD2LRLyB2XjKImUpKWjQHWJJm4dA/b6y5kdisZI2e8SUbZ5XJL+8fXQr61rlmi3JNAIjmD21yxpL0u6jSz9isBX8U29kJ1+Up4hpotQUQbHFMRRKiz/CFftpUPzMTl/jYKW+o3sOp6I99KPCNgXC2YBDziSb3xjzRrAezD97UbG5XBpOFPj8/VwjkMn60AXRv5ZCMpvOEHOUPvuST/0/kskm2fkn6UxovBJxhSNw5V+0JVzipMHlshYRAATzikz06RnlhPSyS2hw5hg/JmV9MBJS6+rm8jBX2KyytFVTI4khigH11V0UhLsDRBg6MQooN8ghhGbp0cre4mL2PDOwJoGxKT1IsLl62hvDqNFtynwOMiQzSxMmGxuSOkRzg/OLmP3GccnrF1bcdlQgT1TSw+Q9HVPo9ZQvzvzSE6JfKGLjKx+8bWNdZxvRylV+H3uZ160+3tqbxyApWaP6L+07uw/nhXen0Dcx0lr202EeJRvNUG0xqfiHC9UyG+AsvZKDvH7oKHty9fJ46Q/oxv53PPr2EiyK4GfN94= 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)(136003)(396003)(366004)(39830400003)(376002)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(6486002)(8676002)(8936002)(478600001)(6666004)(54906003)(66476007)(66946007)(66556008)(86362001)(4326008)(41300700001)(5660300002)(6916009)(2906002)(44832011)(316002)(6506007)(52116002)(38100700002)(36756003)(2616005)(1076003)(107886003)(6512007)(26005)(38350700005)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: itzwlSppgUVF3z8vijXPoNkymgbBIWvGTz+nNn+GcILa2/ObbZeZ0+Y9ovflFJz+Z/200gbDS+NFSJJknDDJGOVSAIwTRw6ScgUaqb3HwfwcD8VoAqDw+VPJskx+YVXinIuAFx7wYpzXP/r9VgeW5Hbb0pP/6CCvbO2IG0gIezRqZ03/8flBWoGXxINV8vg7IgvQ5sDYTS6D1wKiF0JVb3xXZgGaYGl8BZUOLP76tYtEf8OEWefshj1LhnX7TomTJUjReY8J31Dz6idhywD/qLPvI4OsJJ7OTjL/I76YsIfF2DAbHhVK4aHVXAGZjw3PM/2DQlBCxUK7IHNZlCRtTbeHR2mRD0+q+OiaQV1PoAMYy5d1yGgg3+o2sl8FARSPndf0JbqMhEd01KDKidhUtBtzr90566YpJiuDWE7SzUliD2GTrQbf+Fb7FuHl1Q6GujT81i9A2CodY54dwzKobpVWdGg8eBpRofO5lZ5rz6fBdURQfLHXEcEUiG0OLH6NhFz98yle/YsRyILINIB4KKoTXSD0bppiTPgE7kU/KEqBsIDIvG2jcqXEvJfAXdsEj8gVsojuwc/CZebVVicAArLdKtvTg19A7/5H1UCedjhX9SkAnuiNKQgzq2yHt2e30ucv4rU+wBjeZId2lhjhimFxMI+LCnF+i2/8DWoH0CKxbFSlz6cos6ND0KslJc7uAA8mk5esAGFpMSqN0TvFal3YA9sLA9QJAzoOFiKJ0xDCKmUuBTMPSNZmNjD6iF+6SAuWFRHEqmJBvLEL/aDfVqXfYA9O4QO2ZZsXUWtaAe6g2VqXWKJDfdhCsBsdkbgW8rh7iLhQh9z9J/4SUp8/srjBcGu6YjLq6aNUeqB1e3vPe7tnwuWkJs3pzYUvbbCk9vHXguyN9lB8dTeQySYOc4ylfazCCeWR3+vtLc/d7H82ErN93oLFXYhsZrOtUCUqxwmnEduI/8UO1KI39yhLnOfw5rec72+RWW06x1McM0iBolacTQV47EbMnW8j8CwlRBE5YJu1R+ckP/spo2VwluQuAnq58leZrhdYE8Slk3DikkLCvgJxMwBXGn3MmmMTZmjpXjc/fgd7GFaxfHtsnhif3v9UsJOeDxdZvReBoKIFLBMdm/sFMj9l+rxYVZ9BlBHgUkG/YOVM+wxE1JF1FcvLRY/mrAdyThw3fnUfFcf3IeYvaJMoPLTMBfCH8MAqbqxSco4IzTeFgnnzRk0jTKrqAUtNRk5o8cq9qDdCiQjnpVSyuhOfzzrgOBMwNATpIOt3S+W3KwaoRQ5nirFUYd/DAKbV87P5o6M4jY59rPJF+CqDH+diRvq7iNtsUNKnQ7XrglIgPN96wNadSDQ3ER0Dmgf+naPzkfCyvNG5EzdRlWUTOvfzR/u+Ldi3Kg564Dcw4/gtrUhKPLZ1IBmZw/5gwUxjUf83NgEMOpwZahO/L0Od4lmRiqBoI8vwnR1uJkEr+ZAqUKoZpMXAPuDUUkJJ35NEf4IUKpZEmrwp4MvZDgs6c/gt54uESWzsuE1eXDFmJdOq/767KY0f6lQlgMCTgnMKuXEab+8KmhV80RAZBjZG0OssLeV1gP2r/OBKRDE8qP7SKSwpCXg4IAAFuw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22ddf9a9-3499-43fa-53ee-08dbd782a29e X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2023 06:53:48.0131 (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: gM0i4EPhq4/mqfb/FLkEModRonJ+q4kaTFeqOymILNCpizdgvIbNzkr5VioSNSJScon4qwcEYAc6j/EM76CjYtUKjiyA9J//+sHFtKh/3xg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB6055 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 Remove the unneeded secondary call of 'rte_eal_process_type()' in 'nfp_netvf_init()', because the first call of it already make sure only the primary process can continue run the rest logic. Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev_vf.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index b9cfb48021..e24fec861d 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -344,15 +344,13 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) pci_dev->id.device_id, RTE_ETHER_ADDR_BYTES(&hw->mac_addr)); - if (rte_eal_process_type() == RTE_PROC_PRIMARY) { - /* Registering LSC interrupt handler */ - rte_intr_callback_register(pci_dev->intr_handle, - nfp_net_dev_interrupt_handler, (void *)eth_dev); - /* Telling the firmware about the LSC interrupt entry */ - nn_cfg_writeb(hw, NFP_NET_CFG_LSC, NFP_NET_IRQ_LSC_IDX); - /* Recording current stats counters values */ - nfp_net_stats_reset(eth_dev); - } + /* Registering LSC interrupt handler */ + rte_intr_callback_register(pci_dev->intr_handle, + nfp_net_dev_interrupt_handler, (void *)eth_dev); + /* Telling the firmware about the LSC interrupt entry */ + nn_cfg_writeb(hw, NFP_NET_CFG_LSC, NFP_NET_IRQ_LSC_IDX); + /* Recording current stats counters values */ + nfp_net_stats_reset(eth_dev); return 0; From patchwork Sat Oct 28 06:53:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133559 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 C94A843220; Sat, 28 Oct 2023 08:54:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 875CD40A89; Sat, 28 Oct 2023 08:53:54 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2108.outbound.protection.outlook.com [40.107.101.108]) by mails.dpdk.org (Postfix) with ESMTP id 9898840A80 for ; Sat, 28 Oct 2023 08:53:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TDkE7Sr41Ldp7GJ9nNp8xtWeTbTxGzPi3atOhVXolH2t+WQo+/oiqzDbyXbWtxGGVnauQJYRoGIEJIV1bk5BUq8LUjoy3bMQWWbWHGtoup2Y2C5+OOFdx/OzTHqD6pA+NOORnTnlXnvtym7bVEUmjtch8vTdUD3EkaLZtpUR6ObHqYxL945CuL7/Xn0b55gxB6gMBAPTssF2mD0MhtRSdu/NsK294/KxixsaILgbCEGRxhrtrikOeCuLuDqgz/Dh014UR+nHS7TvLRaDXAup771bw1/2vCpHmzv+gO0naZvoDudBpGYxZ7BUResB/KMq80Xj+GuEvCoK4S3O7yN3Gg== 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=l285+JTZtVMNbZ8+MYNvSt7IBq2CGiuTBd1qd9o2QUI=; b=VCOzB2C15gTCxdLJrEuZP/hgoIFYRwuDJgaF+Q0tcPRjH78UWkLvh9hvH438rcHybpBZxRGXzBV6RQok8+NpFcN82Kioc62urRMPEueieQG9w7lzlFqjJFYzaxvfTcjMUsWp4EJ/X1UoFwdlfUAQJERfD0h/rG7YtgG1sO+5QgcH0U98UBIrtjp9ZvFVca/TfUgniDwR6D1glmou/Ka41kdF60lc7HIcrK9h/TyFE0LZslf+7lP4uOom61es1PCcw+UzPccLXBKqyHv5ReMLaehu2Btr3wmdI7GWJ/r8yy/hQShdLJa6XBySu8pW3TTvgXeTGOqI8j6zanIZ7F+3og== 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=l285+JTZtVMNbZ8+MYNvSt7IBq2CGiuTBd1qd9o2QUI=; b=B2nf1CHmOkLRoTihv+zutHzmCxBqqJQj+wzdp3ylvL6YSaIddMmUJxoigfukYZJSIcP/KTZj5oFbbPzfmDPtIROHMkMte1LnQK6UQerPGp0iHMyziFv02x57T4K1TDvHb570v7i4EQ/etxwdBNvEcKET2xDIccTvk2Kh7zUQqhk= 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 SA1PR13MB6055.namprd13.prod.outlook.com (2603:10b6:806:338::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19; Sat, 28 Oct 2023 06:53:50 +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; Sat, 28 Oct 2023 06:53:50 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH v2 04/11] net/nfp: remove the unneeded data abstraction Date: Sat, 28 Oct 2023 14:53:08 +0800 Message-Id: <20231028065315.1937188-5-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028065315.1937188-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> <20231028065315.1937188-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SA0PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:d3::25) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB6055:EE_ X-MS-Office365-Filtering-Correlation-Id: ef35df98-6313-4f81-7fb7-08dbd782a3ee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: weeFygDIP+FHMfwmm0pDmYMfoOJbscZTQwElJt1m1eQMuj3HdrtzedmWdi3kNoDGYYjzo4e9wHBZaVywOGlGFx7OIonHOJ86/wFtQiFZKHGNcyo4AeZ0CR0iuTU58dy82vJ+y6bYC4yqpluEipODhbY54gisrckA206dM+1I7gYZMRgjf8uZVoJ6EKWDyTTVsMkUwpkHPQqw484LjJ5tVBsfr0YtEWek9z/qz5EJM2G+mD6naZaqeh5UyBLtQxrwN8vXOrGMRyFHE9W+QSanDe0dICX60TXyrbOJV+sRo6Y6jMhI9+JIML6j2CYEjimYUSczW5YD6eaU68VInWKrUCBo/UBv4S8rrvtzamk8laq1JEVh6OzWGvK7+4Y8C1sAc3e1ov0uk5sk2RvnCvu5c2k2zjEmYOvkHVSUBpRUEEPSAuTzg5H8xamXcD1thPomPTPc+56Wbu+NI4gF1x709IjoqH+LrAsHN9F1Arsidxb8sXCgF4ew23lMHFckekVmRWVky9Vpyez+cfbmhgD9eD0hrz8D+rW76g13kDTOOdo3bAsAJngXW9LWsG3D+QlbHxvJSEe8ck/wi1vf5XbTplfaDj/FDenUzmwZ9Y9tHdCf1kPz/XNBz+oSmWWhramH+uLLVHeEnT46l6DtJ+w0/SYd7/aNHBZb13f9N/0BnaU= 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)(136003)(396003)(366004)(39830400003)(376002)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(6486002)(8676002)(30864003)(8936002)(478600001)(6666004)(54906003)(66476007)(66946007)(66556008)(86362001)(4326008)(41300700001)(5660300002)(6916009)(2906002)(44832011)(316002)(6506007)(52116002)(38100700002)(36756003)(2616005)(1076003)(107886003)(6512007)(26005)(38350700005)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pV9xbrfKdSN59pRabpprlPI7eb4pkaNGScnfZtWU4wrSITFt4O52H5rCx5XI5RKIbQXoryz70lSasCd+NC+YGOuDboLGR9wBJkvCpDXarHH3XVwRRHp/N4TJ9+TqGHpKhjMzSuNTMBois/JQSItvS37HXGHmGuZCO/n8PC0NDPn1xtm/ebQ41+tAvQ8PmTq5ToouPtOZCSeZRqwH5X1tJA/OUYFnC2gpvWR6KWzPiP7j5RB5fG/hd1HvkJXTk1PMhT+lbLf0nWZu8NM2FPigYf8XheXis1QUVGgfnZeUiWHp3V61KV+ebJXTGLTvIPKIy92WPBgG6Ran6CjwET3lPeYGGMUb8q5NeWvXqJXm3Of/5jzxL1ZseFZQN7KNk7CllZapZtlA8Va9bYSofoMffJUg/BA7bQx8JwI1TG40s/7B1AdL1T5MYzE0/6Vm0NyRRKMYyTGJmRVimGNr8+ZTMS+3BLJsQLxJSYR6HfQNef1tIcx7kSvINvhTJFHQqfnTZCQ92eJNL3ShwryodP2zQe7krqMJUbHlWPvzzlY351A4RAu+C/bp/7ncvnOyH0nxawcWhjYDytx8J73yhoiyMgG5/hSYSSl5+/q1ugzfHsjMe94ybfx306+aYdWip1Ciizx41Wn9mZKRqyiyEDP1IU/v6xRDL4mLkcmOBIafnIboRBpNKIG19JSfzrbURaDgK70HpulhH9wMTpoRjs6FZouFSKVtUzaDAjoEGLJ1o7OEpf3k7TJE0oTBgSk5oOBVTueNpsQISZ2jLgnkDF4UIqCK6mSCc3yRvDxTRKzmo15J3ZvQ9yB1a3k2YCMvMi9OTcRakRZcKx6xPsDVLKuITH5fwvsMkCPeTOueQ/Uy70gogXuSrD9zAduF0FrDoiiDXOYVyxDz/z+RfpZAwsIn+7y8EJBjuje1rWZyqeESQs1K1pVCLL1ENKeZzwDYbp5ZfBN11R/SwimDsgUujr0fu4nFemh8d7hhABqWhrVcDVwAsfVNf7IRgsbruelgIs3QVndZrzFW7wdgJTvcBi6UqJF1M26jR62jVxUKSh56pjcrf/MGLs7NJF+LFgxjeYpYY4eeX2xi3r03sRxBCgNOwBA7L9nJDPHrCtuitDoGxx5Z4iV5cX6iM1BET/FGDqxxVvC1DNhM3VDHvM/bQlb+JEK3QGz13W3kQKty/zz01pO+RPTJ/0ZSHmoZGw77ONQvBl8EzVzCETcMAjiyd8xCHCAdqlyxNGZNw4FXhTYEpiSOG19kQ43NBsulYe6I75DWVsOsfK+OV8+GUn3CkJaMIpeqDTRYEkSnyWJE9DQQ1Q6YjG07HryEIdmGUKmt8P5caeC+eLrru92nIeWDNEEadL1x2ie6dWeLlpmE2P4Wvv+RVIXuFnX8oOiltnGMwFSGtbt+TQzDLGbHqQhwYwaqw0EUQJSuYdGCI1yaCS/nhIeQym6bbdeGnjEgbrxJ4VcU6DxILsJL09YEB5l5WvM4kdJfjmkYNLX8cBgu8vk25k0P01I6aZJkyQJ9fkxYFxcPE1Fi+/Xl9+ONVN85QdWxedo4HD4Rqq7OtnmHDKlgD1bn4v6jxnzgB1SaYF8AnTPZ9otXMFZgq2QxSLdYjJ//nw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef35df98-6313-4f81-7fb7-08dbd782a3ee X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2023 06:53:50.2158 (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: 6K1KB37XLIVbuujNkNPkGy9GxUsYL3Onci0xOUTKv/9CLccHz9kuGqvz8fwME7dBO49BUiTtrieJoNdfn+++9FSq3njfD54CyRgfI4Jwa1w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB6055 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 The data structure 'struct nfp_net_adapter' has only one data field and we won't extend it in the future, which makes this abstraction unneeded, so remove this data structure and the related macro 'NFP_NET_DEV_PRIVATE_TO_HW'. Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower.c | 2 +- drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 2 +- drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 2 +- drivers/net/nfp/nfp_ethdev.c | 18 ++++----- drivers/net/nfp/nfp_ethdev_vf.c | 6 +-- drivers/net/nfp/nfp_ipsec.c | 18 ++++----- drivers/net/nfp/nfp_net_common.c | 57 ++++++++++++++--------------- drivers/net/nfp/nfp_net_common.h | 3 -- drivers/net/nfp/nfp_net_ctrl.c | 2 +- drivers/net/nfp/nfp_rxtx.c | 4 +- 10 files changed, 55 insertions(+), 59 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index f3fedbf7e5..246dd2d454 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -848,7 +848,7 @@ nfp_init_app_fw_flower(struct nfp_pf_dev *pf_dev, } /* Allocate memory for the PF AND ctrl vNIC here (hence the * 2) */ - pf_hw = rte_zmalloc_socket("nfp_pf_vnic", 2 * sizeof(struct nfp_net_adapter), + pf_hw = rte_zmalloc_socket("nfp_pf_vnic", 2 * sizeof(struct nfp_net_hw), RTE_CACHE_LINE_SIZE, numa_node); if (pf_hw == NULL) { PMD_INIT_LOG(ERR, "Could not malloc nfp pf vnic"); diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c index c85fadc80d..3f9909c6e0 100644 --- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c +++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c @@ -377,7 +377,7 @@ nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_free_thresh; const struct rte_memzone *tz; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; nfp_net_tx_desc_limits(hw, &min_tx_desc, &max_tx_desc); diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index 10e6982c95..fe87ea3e25 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -454,7 +454,7 @@ nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev, struct nfp_net_txq *txq; const struct rte_memzone *tz; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; nfp_net_tx_desc_limits(hw, &min_tx_desc, &max_tx_desc); diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 0fed0ef72d..8e69fa67b2 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -55,7 +55,7 @@ nfp_net_start(struct rte_eth_dev *dev) struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct rte_intr_handle *intr_handle = pci_dev->intr_handle; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + net_hw = dev->data->dev_private; pf_dev = NFP_NET_DEV_PRIVATE_TO_PF(dev->data->dev_private); app_fw_nic = NFP_PRIV_TO_APP_FW_NIC(pf_dev->app_fw_priv); hw = &net_hw->super; @@ -201,7 +201,7 @@ nfp_net_stop(struct rte_eth_dev *dev) { struct nfp_net_hw *hw; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; nfp_net_disable_queues(dev); @@ -224,7 +224,7 @@ nfp_net_set_link_up(struct rte_eth_dev *dev) { struct nfp_net_hw *hw; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; if (rte_eal_process_type() == RTE_PROC_PRIMARY) /* Configure the physical port down */ @@ -239,7 +239,7 @@ nfp_net_set_link_down(struct rte_eth_dev *dev) { struct nfp_net_hw *hw; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; if (rte_eal_process_type() == RTE_PROC_PRIMARY) /* Configure the physical port down */ @@ -262,7 +262,7 @@ nfp_net_close(struct rte_eth_dev *dev) return 0; pf_dev = NFP_NET_DEV_PRIVATE_TO_PF(dev->data->dev_private); - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; pci_dev = RTE_ETH_DEV_TO_PCI(dev); app_fw_nic = NFP_PRIV_TO_APP_FW_NIC(pf_dev->app_fw_priv); @@ -350,7 +350,7 @@ nfp_udp_tunnel_port_add(struct rte_eth_dev *dev, struct nfp_net_hw *hw; enum rte_eth_tunnel_type tnl_type; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; vxlan_port = tunnel_udp->udp_port; tnl_type = tunnel_udp->prot_type; @@ -388,7 +388,7 @@ nfp_udp_tunnel_port_del(struct rte_eth_dev *dev, struct nfp_net_hw *hw; enum rte_eth_tunnel_type tnl_type; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; vxlan_port = tunnel_udp->udp_port; tnl_type = tunnel_udp->prot_type; @@ -828,7 +828,7 @@ nfp_init_app_fw_nic(struct nfp_pf_dev *pf_dev, goto port_cleanup; } - hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); + hw = eth_dev->data->dev_private; /* Add this device to the PF's array of physical ports */ app_fw_nic->ports[i] = hw; @@ -1067,7 +1067,7 @@ nfp_secondary_init_app_fw_nic(struct rte_pci_device *pci_dev, } eth_dev->process_private = cpp; - hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); + hw = eth_dev->data->dev_private; nfp_net_ethdev_ops_mount(hw, eth_dev); rte_eth_dev_probing_finish(eth_dev); diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index e24fec861d..cb8a37bce7 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -66,7 +66,7 @@ nfp_netvf_start(struct rte_eth_dev *dev) new_ctrl = nfp_check_offloads(dev); /* Writing configuration parameters in the device */ - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + net_hw = dev->data->dev_private; hw = &net_hw->super; nfp_net_params_setup(net_hw); @@ -258,7 +258,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) return -ENODEV; } - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); + net_hw = eth_dev->data->dev_private; net_hw->dev_info = dev_info; hw = &net_hw->super; @@ -393,7 +393,7 @@ static int nfp_vf_pci_probe(struct rte_pci_device *pci_dev) { return rte_eth_dev_pci_generic_probe(pci_dev, - sizeof(struct nfp_net_adapter), nfp_netvf_init); + sizeof(struct nfp_net_hw), nfp_netvf_init); } static int diff --git a/drivers/net/nfp/nfp_ipsec.c b/drivers/net/nfp/nfp_ipsec.c index 7e26977dc1..9a0ae89af3 100644 --- a/drivers/net/nfp/nfp_ipsec.c +++ b/drivers/net/nfp/nfp_ipsec.c @@ -579,7 +579,7 @@ nfp_aead_map(struct rte_eth_dev *eth_dev, const uint32_t *key; struct nfp_net_hw *net_hw; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); + net_hw = eth_dev->data->dev_private; device_id = net_hw->device_id; offset = 0; @@ -667,7 +667,7 @@ nfp_cipher_map(struct rte_eth_dev *eth_dev, const uint32_t *key; struct nfp_net_hw *net_hw; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); + net_hw = eth_dev->data->dev_private; device_id = net_hw->device_id; switch (cipher->algo) { @@ -808,7 +808,7 @@ nfp_auth_map(struct rte_eth_dev *eth_dev, return -EINVAL; } - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); + net_hw = eth_dev->data->dev_private; device_id = net_hw->device_id; digest_length = digest_length << 3; @@ -1082,7 +1082,7 @@ nfp_crypto_create_session(void *device, sa_idx = -1; eth_dev = device; priv_session = SECURITY_GET_SESS_PRIV(session); - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); + net_hw = eth_dev->data->dev_private; if (net_hw->ipsec_data->sa_free_cnt == 0) { PMD_DRV_LOG(ERR, "No space in SA table, spi: %d", conf->ipsec.spi); @@ -1163,7 +1163,7 @@ nfp_security_set_pkt_metadata(void *device, sqn = params; eth_dev = device; priv_session = SECURITY_GET_SESS_PRIV(session); - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); + net_hw = eth_dev->data->dev_private; if (priv_session->ipsec.direction == RTE_SECURITY_IPSEC_SA_DIR_EGRESS) { struct nfp_tx_ipsec_desc_msg *desc_md; @@ -1236,7 +1236,7 @@ nfp_security_session_get_stats(void *device, memset(&msg, 0, sizeof(msg)); msg.cmd = NFP_IPSEC_CFG_MSG_GET_SA_STATS; msg.sa_idx = priv_session->sa_index; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); + net_hw = eth_dev->data->dev_private; ret = nfp_ipsec_cfg_cmd_issue(net_hw, &msg); if (ret < 0) { @@ -1288,7 +1288,7 @@ nfp_crypto_remove_sa(struct rte_eth_dev *eth_dev, struct nfp_ipsec_msg cfg; sa_index = priv_session->sa_index; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); + net_hw = eth_dev->data->dev_private; cfg.cmd = NFP_IPSEC_CFG_MSG_INV_SA; cfg.sa_idx = sa_index; @@ -1380,7 +1380,7 @@ nfp_ipsec_init(struct rte_eth_dev *dev) struct nfp_net_hw *net_hw; struct nfp_net_ipsec_data *data; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + net_hw = dev->data->dev_private; cap_extend = net_hw->super.cap_ext; if ((cap_extend & NFP_NET_CFG_CTRL_IPSEC) == 0) { @@ -1427,7 +1427,7 @@ nfp_ipsec_uninit(struct rte_eth_dev *dev) struct nfp_net_hw *net_hw; struct nfp_ipsec_session *priv_session; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + net_hw = dev->data->dev_private; cap_extend = net_hw->super.cap_ext; if ((cap_extend & NFP_NET_CFG_CTRL_IPSEC) == 0) { diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index ac97e3bed5..10f6298f74 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -252,7 +252,7 @@ nfp_net_configure(struct rte_eth_dev *dev) struct rte_eth_rxmode *rxmode; struct rte_eth_txmode *txmode; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; dev_conf = &dev->data->dev_conf; rxmode = &dev_conf->rxmode; txmode = &dev_conf->txmode; @@ -329,7 +329,7 @@ nfp_net_enable_queues(struct rte_eth_dev *dev) { struct nfp_net_hw *hw; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; nfp_enable_queues(&hw->super, dev->data->nb_rx_queues, dev->data->nb_tx_queues); @@ -340,7 +340,7 @@ nfp_net_disable_queues(struct rte_eth_dev *dev) { struct nfp_net_hw *net_hw; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + net_hw = dev->data->dev_private; nfp_disable_queues(&net_hw->super); } @@ -367,7 +367,7 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev, struct nfp_hw *hw; struct nfp_net_hw *net_hw; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + net_hw = dev->data->dev_private; hw = &net_hw->super; if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 && (hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0) { @@ -407,7 +407,7 @@ nfp_configure_rx_interrupt(struct rte_eth_dev *dev, return -ENOMEM; } - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; if (rte_intr_type_get(intr_handle) == RTE_INTR_HANDLE_UIO) { PMD_DRV_LOG(INFO, "VF: enabling RX interrupt with UIO"); @@ -443,7 +443,7 @@ nfp_check_offloads(struct rte_eth_dev *dev) struct nfp_net_hw *hw; struct rte_eth_conf *dev_conf; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; cap = hw->super.cap; dev_conf = &dev->data->dev_conf; @@ -516,7 +516,7 @@ nfp_net_promisc_enable(struct rte_eth_dev *dev) repr = dev->data->dev_private; net_hw = repr->app_fw_flower->pf_hw; } else { - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + net_hw = dev->data->dev_private; } hw = &net_hw->super; @@ -551,7 +551,7 @@ nfp_net_promisc_disable(struct rte_eth_dev *dev) struct nfp_hw *hw; struct nfp_net_hw *net_hw; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + net_hw = dev->data->dev_private; hw = &net_hw->super; if ((hw->ctrl & NFP_NET_CFG_CTRL_PROMISC) == 0) { @@ -588,7 +588,7 @@ nfp_net_link_update(struct rte_eth_dev *dev, struct rte_eth_link link; struct nfp_eth_table *nfp_eth_table; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; memset(&link, 0, sizeof(struct rte_eth_link)); @@ -654,7 +654,7 @@ nfp_net_stats_get(struct rte_eth_dev *dev, if (stats == NULL) return -EINVAL; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; memset(&nfp_dev_stats, 0, sizeof(nfp_dev_stats)); @@ -732,7 +732,7 @@ nfp_net_stats_reset(struct rte_eth_dev *dev) uint16_t i; struct nfp_net_hw *hw; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; /* Reading per RX ring stats */ for (i = 0; i < dev->data->nb_rx_queues; i++) { @@ -794,7 +794,7 @@ nfp_net_xstats_size(const struct rte_eth_dev *dev) const uint32_t size = RTE_DIM(nfp_net_xstats); /* If the device is a VF, then there will be no MAC stats */ - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; if (hw->mac_stats == NULL) { for (count = 0; count < size; count++) { if (nfp_net_xstats[count].group == NFP_XSTAT_GROUP_MAC) @@ -828,7 +828,7 @@ nfp_net_xstats_value(const struct rte_eth_dev *dev, struct nfp_net_hw *hw; struct nfp_xstat xstat; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; xstat = nfp_net_xstats[index]; if (xstat.group == NFP_XSTAT_GROUP_MAC) @@ -967,7 +967,7 @@ nfp_net_xstats_reset(struct rte_eth_dev *dev) uint32_t read_size; struct nfp_net_hw *hw; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; read_size = nfp_net_xstats_size(dev); for (id = 0; id < read_size; id++) { @@ -1015,7 +1015,7 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) uint16_t max_tx_desc; struct nfp_net_hw *hw; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; nfp_net_rx_desc_limits(hw, &min_rx_desc, &max_rx_desc); nfp_net_tx_desc_limits(hw, &min_tx_desc, &max_tx_desc); @@ -1220,7 +1220,7 @@ nfp_net_supported_ptypes_get(struct rte_eth_dev *dev) if (dev->rx_pkt_burst != nfp_net_recv_pkts) return NULL; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + net_hw = dev->data->dev_private; if ((net_hw->super.cap_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0) return NULL; @@ -1242,7 +1242,7 @@ nfp_rx_queue_intr_enable(struct rte_eth_dev *dev, /* Make sure all updates are written before un-masking */ rte_wmb(); - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; nn_cfg_writeb(&hw->super, NFP_NET_CFG_ICR(base + queue_id), NFP_NET_CFG_ICR_UNMASKED); return 0; @@ -1263,7 +1263,7 @@ nfp_rx_queue_intr_disable(struct rte_eth_dev *dev, /* Make sure all updates are written before un-masking */ rte_wmb(); - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; nn_cfg_writeb(&hw->super, NFP_NET_CFG_ICR(base + queue_id), NFP_NET_CFG_ICR_RXTX); return 0; @@ -1301,7 +1301,7 @@ nfp_net_irq_unmask(struct rte_eth_dev *dev) struct nfp_net_hw *hw; struct rte_pci_device *pci_dev; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; pci_dev = RTE_ETH_DEV_TO_PCI(dev); /* Make sure all updates are written before un-masking */ @@ -1376,7 +1376,7 @@ nfp_net_dev_mtu_set(struct rte_eth_dev *dev, { struct nfp_net_hw *hw; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; /* MTU setting is forbidden if port is started */ if (dev->data->dev_started) { @@ -1412,9 +1412,8 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev, struct nfp_net_hw *net_hw; uint32_t rxvlan_ctrl = 0; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + net_hw = dev->data->dev_private; hw = &net_hw->super; - rx_offload = dev->data->dev_conf.rxmode.offloads; new_ctrl = hw->ctrl; @@ -1463,7 +1462,7 @@ nfp_net_rss_reta_write(struct rte_eth_dev *dev, struct nfp_hw *hw; struct nfp_net_hw *net_hw; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + net_hw = dev->data->dev_private; hw = &net_hw->super; if (reta_size != NFP_NET_CFG_RSS_ITBL_SZ) { @@ -1519,7 +1518,7 @@ nfp_net_reta_update(struct rte_eth_dev *dev, struct nfp_hw *hw; struct nfp_net_hw *net_hw; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + net_hw = dev->data->dev_private; hw = &net_hw->super; if ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0) @@ -1552,7 +1551,7 @@ nfp_net_reta_query(struct rte_eth_dev *dev, struct nfp_hw *hw; struct nfp_net_hw *net_hw; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + net_hw = dev->data->dev_private; hw = &net_hw->super; if ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0) @@ -1602,7 +1601,7 @@ nfp_net_rss_hash_write(struct rte_eth_dev *dev, struct nfp_net_hw *net_hw; uint32_t cfg_rss_ctrl = 0; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + net_hw = dev->data->dev_private; hw = &net_hw->super; /* Writing the key byte by byte */ @@ -1658,7 +1657,7 @@ nfp_net_rss_hash_update(struct rte_eth_dev *dev, struct nfp_hw *hw; struct nfp_net_hw *net_hw; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + net_hw = dev->data->dev_private; hw = &net_hw->super; rss_hf = rss_conf->rss_hf; @@ -1699,7 +1698,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, uint32_t cfg_rss_ctrl; struct nfp_net_hw *net_hw; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + net_hw = dev->data->dev_private; hw = &net_hw->super; if ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0) @@ -1987,7 +1986,7 @@ nfp_net_firmware_version_get(struct rte_eth_dev *dev, if (fw_size < FW_VER_LEN) return FW_VER_LEN; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; snprintf(vnic_version, FW_VER_LEN, "%d.%d.%d.%d", hw->ver.extend, hw->ver.class, diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index 6607175460..a23b5be968 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -238,9 +238,6 @@ int nfp_net_firmware_version_get(struct rte_eth_dev *dev, char *fw_version, size int nfp_repr_firmware_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size); bool nfp_net_is_valid_nfd_version(struct nfp_net_fw_ver version); -#define NFP_NET_DEV_PRIVATE_TO_HW(adapter)\ - (&((struct nfp_net_adapter *)adapter)->hw) - #define NFP_NET_DEV_PRIVATE_TO_PF(dev_priv)\ (((struct nfp_net_hw *)dev_priv)->pf_dev) diff --git a/drivers/net/nfp/nfp_net_ctrl.c b/drivers/net/nfp/nfp_net_ctrl.c index 5135a1ad27..ea14b98924 100644 --- a/drivers/net/nfp/nfp_net_ctrl.c +++ b/drivers/net/nfp/nfp_net_ctrl.c @@ -31,7 +31,7 @@ nfp_net_tlv_caps_parse(struct rte_eth_dev *dev) struct nfp_net_hw *net_hw; struct nfp_net_tlv_caps *caps; - net_hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + net_hw = dev->data->dev_private; caps = &net_hw->tlv_caps; nfp_net_tlv_caps_reset(caps); diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 644be2700e..38ce83aa46 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -840,7 +840,7 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev, struct nfp_net_rxq *rxq; const struct rte_memzone *tz; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; nfp_net_rx_desc_limits(hw, &min_rx_desc, &max_rx_desc); @@ -1067,7 +1067,7 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, { struct nfp_net_hw *hw; - hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); + hw = dev->data->dev_private; if (hw->ver.extend == NFP_NET_CFG_VERSION_DP_NFD3) return nfp_net_nfd3_tx_queue_setup(dev, queue_idx, From patchwork Sat Oct 28 06:53:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133560 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 4A84243220; Sat, 28 Oct 2023 08:54:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 069A140A6C; Sat, 28 Oct 2023 08:53:57 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2111.outbound.protection.outlook.com [40.107.101.111]) by mails.dpdk.org (Postfix) with ESMTP id 151E140A80 for ; Sat, 28 Oct 2023 08:53:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vwg/yQ4CgVyW8ufzrOAFmi9D2OSRW6+tSZifrSVGuoHCsSDYPLMORiwZjp2Lpj99D72S7YzVLp3fD7ooC9WlTAKku68eeAMjoDESk56vwUQ6vF+sih8eGdUhJ5bpHus+gQmhn278FbYY+j2ewbvBKmL2zjRQjCHQuWMLxkYZZeKEdRxf6F2wm0uOodNKrKBUzReOfgOV0tbQh7p+XIQ0shkooKkEFI+Gb7Ds6HT5JRafIz0CoFJMvLcvVU27HlmNqJm0Imnlha7DRLQ3wmUA/TRl4wUHU/5NnWEpBAvx2KCanQcOcKVQqYjkft4b8ZVs+SJaKvhC151OKvzrfCMiog== 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=KJpjF7bfYGXtbib0Z+5st78XzovLgPHBjHhvlpPssak=; b=C0eR0OQn8ZORpVKKgU9nafX0R9hqHDPCMI0E0bU4Rn70Jf1uUD23MV5XkNhwCkO29OdAJv3oFmsk1VVfwzEeIvwWsgZo6P0v4jjI7m1/6L8gac30dhZg17jUs+V+dTquqWIXMg72OO9f1MZyBIyv/Myr5zr/AlQj/KYmBOyHhnoQ9isUnddzvu2x/WgWu61zee6MNOQLE1OHHOc8fr+MNUmCvRd3QYxjQB3i9cbjx+PTFrgI7lAK9CZ+gkL5sREVj87bdHvYzynNLAmAXxKQRGG80C7Idsewr2mdRxYe4CpfX11JYMIXJ8VNnum/aq+DCzZALxhiXeC1YRm8bp29Fg== 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=KJpjF7bfYGXtbib0Z+5st78XzovLgPHBjHhvlpPssak=; b=D2AaeM+lE6IUE+yfck0hhOH2LhIzst1N9RyZdcXyz5CQaQIbnYFVcDZCpBzu6rEQXTmj5YxrkMkEp/QEiIMIKTc0K1GyuTBn6agI6wmSrOjiyAU/vXRCDYW7A3oRBNUioqeRrxJsWPT/gSjSjdHzhwv+MBQje+w37fhp+3CegzM= 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 SA1PR13MB6055.namprd13.prod.outlook.com (2603:10b6:806:338::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19; Sat, 28 Oct 2023 06:53:52 +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; Sat, 28 Oct 2023 06:53:52 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH v2 05/11] net/nfp: remove the redundancy macro Date: Sat, 28 Oct 2023 14:53:09 +0800 Message-Id: <20231028065315.1937188-6-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028065315.1937188-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> <20231028065315.1937188-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SA0PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:d3::25) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB6055:EE_ X-MS-Office365-Filtering-Correlation-Id: 2217b066-3636-4955-242e-08dbd782a535 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SDIslHMF9SXvAEgN3Gsh0A7xG2xArq1aWvYLb0q8A2CxqcbvYS3822WqTY/hqXNK8skwzSXHNHqPBH1M3Bey3coLW1vsiq2tsQo5VCVwlqHMNsaTNfujQ22SeY9ZN7hGcUTD43CmB1s82m6bKqIxPityKNUQhwlhUNPB0GiLaV5f85Ot0ASZ9YFEvzOI/vEgi2kbP8A6cdz5HCGiOzULXEZyItIoJIeey5U9q5dLuv+hidxN5UJl833MA5pk1LD5r670FwOKlMzG1rT7edniArI7F7VqhA4DG3iFbdImBXFuH9uf2EL9RaGQ7zz6hTMgonKKozlqDmlHYZ09ezfAn9eaOueMhzY18WhYTUBt1+mNOIBacDBJU4P1F0ecl0GIMB/Ld3DjyweskintihljX5P5BI/AI11YD4DksRz31/lBd8vAkzGaeBbFhmg6bZSLn/lrrU5Cgr9wdNQKcjlXrlMxyFZCwZz/o7Sv13u2u84rLQenKP33Q89z1HXXcukPmsTxCeYBJ43zAw6QhgWpyRWXtbZKfL5F1hTCsH5X3Azxl0XA5FTmuVar8Q7qwBDnwIesOJEhWUYpOmZqvwCBykvMT0Zumo8JVcVrdPNPtb8hdt3PNNi5dQGUMz71/UO+BevHSR6sG2YyuO/5OX/V1Hf25ouEFrYcCue4xK3IWYY= 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)(136003)(396003)(366004)(39830400003)(376002)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(6486002)(8676002)(8936002)(478600001)(6666004)(54906003)(66476007)(66946007)(66556008)(86362001)(4326008)(41300700001)(5660300002)(6916009)(2906002)(44832011)(316002)(6506007)(52116002)(38100700002)(36756003)(2616005)(1076003)(107886003)(6512007)(26005)(38350700005)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Qixz6Ndp+PD+PNP9ReAHGd03QV6WO3vJTvztzLHnYsLYJ2xKsMKelzVSZ5KQmFV7YXMlSSQpdC30MX3zKS/nSt1K5nAJh7W6FthiPeZTMSHXGTH2/FTMf1RCIfvkumCcuiaAy9dRjDq1zn7LbizTN6Drnte0yl15kgI2RFgd8lAUY/GY1PXD8lyPv1KRp1vxbMvBiMEy1LB3NcZdUbjn0cd+k9BwWorfOyHSIE2/ijAGbLBBSLGBWvxS8XV1S8gOWvLeayTBGKu748zjL0/kultrytytQXEFhq/Q5znYVCXWiy51KuT138+tGzWtO86uFXzLRSIP+KyUjhr5wmGC3RrV47O7IU1UpzHKnGr0U3ep5QbSzSXOEcxL2/KeovvtBTfMHalbKOhiRD4OFMFZlrUGGvf6HpzDNJ+sKNrsY/MZoex0gQmnpZAQbvohUhxSYc/QJ5zi5Em1Ks/qQZrrjjfDkKKaN2vuaqq58S9i4UxIgnC+aQjo9vdqqDQ8AwTsQLutB7aSexPbMk5oMVPNEJQSPOQ/hJogY+ZlxYcMGMZJ58UXgt1HLUb9hF3N8KpUYGL0jKNzUkzYSSUD8t89AxYqg/o57c45vog78k71ziW0DoFzcq/ofiP9uXfUSH7X5qNzGJ/RWe/wdWYaBdjcELrmRXz4wMg5ghGRUibsK992ws6j56pgGpuzWsAge3csc6Ym0KXTjZKZYYndtJJOCnBxeS07AEBhI7YDDTJsGHcHbb+3dxkFlo4YZnWZg8pxPoviNDJKXCiMShiz6Bnil+phyCk7qPt2TK20TvR1ih8l9rxGLhmi5UtL0fK1J47RUdWwAwYgo5Ul65J5FbEA7wiHw76F1otGUdWNejrO7uw5mxkwdsQfQkq1v3k0TvKBqUx7sNreCBZh5JEgd7OA78XR47B9NkM7T59bkwab4dB/koPaICVHqTCbw1pwGje/VB8jjJPU1sq2lpMM6EP0xKwe3jNMPSZf9z1OrQeaQKVP3lnXF0XRWv0Mq8IVKU/rgTlM7zOPsNJn0UCiC6aJWRvG2gInCPKrQcLISj9GEiUkS8WcXBS2+I32eVqSHYHPb/7Qj8X2VNj8MAgHH/mZImP+PiDMHHOjn+IkEOtiuK0NG9wHIZGeHQ1Zs5Tl+/4IzgEpxwvTOdFY3OP5Hvc+57yYkfrdSiADXo4Fxk8jgmEYZ8mKQNsgwF0fdQGBCbqozcb7uKMiuItnQOYq5XWwsBrqPmgXhGRo2z4Qn7VjUXh9S8EQcxeYxqJ3pPkAHz9LggzLUkg/BWlk7SfVC3aqoVvKFSzfft+2nK4a3vxVwxfGjNEwxMxAUJqU0NexeXMeEOmoESQ5srqGit4aDImAN4GK+pSHtuEtKRqufiCTHEaAWUHh1DyJJU13tRPTd5n056VptLvBKKzlzPABAqRr4tmwPem6yDY4dEf0CzGS4fSK1l5R4Lfd5kAw+++7PQBn0UubnaeaXN+hk4fX2jdcmCSQDLJpgMFgTFHgO4xbH7nI+w5Mpo5AZ0tMZDc37AcdUMGkqvUV3oYI11iG8i1R7C3yVPvYLCq0Btth3rEwC1SS7aJgRce2CAlnlR9Px8YuNZQfIk2f9wj4SgkKsH6hYQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2217b066-3636-4955-242e-08dbd782a535 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2023 06:53:52.3461 (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: 4p6GEmCP15YjT1KuXBP3Z3LbqXiKRltDWOaieSkBH2P2vhx4vOrEY72NKGq/t+wfL/mGpO4vVoaHHuWtN5pJHa5dwA5jGVJ2q/otWEwqnE4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB6055 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 Macro 'NFP_HASH_OFFSET' and 'NFP_HASH_TYPE_OFFSET' are unused, so remove them. Macro 'NFP_MAX_PHYPORTS' and 'MAX_FLOWER_PHYPORTS' are redundancy, so just keep the first one. Macro 'NFP_NET_CFG_SPARE_ADDR', 'NFP_NET_CFG_RX_OFFSET_ADDR' and 'NFP_NET_CFG_RX_OFFSET' are redundancy, we just keep the final one. Remove the unneeded macro 'NFP_NET_DEV_PRIVATE_TO_PF', and adjust the related logic, to make it easier to read. Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/common/nfp/nfp_common_ctrl.h | 17 ----------------- drivers/net/nfp/flower/nfp_flower.h | 3 +-- drivers/net/nfp/nfp_ethdev.c | 12 ++++-------- drivers/net/nfp/nfp_net_common.c | 2 +- drivers/net/nfp/nfp_net_common.h | 3 --- drivers/net/nfp/nfp_rxtx.h | 3 --- 6 files changed, 6 insertions(+), 34 deletions(-) diff --git a/drivers/common/nfp/nfp_common_ctrl.h b/drivers/common/nfp/nfp_common_ctrl.h index f92ce50fc0..7033c8ea00 100644 --- a/drivers/common/nfp/nfp_common_ctrl.h +++ b/drivers/common/nfp/nfp_common_ctrl.h @@ -196,11 +196,6 @@ struct nfp_net_fw_ver { #define NFP_NET_CFG_START_TXQ 0x0048 #define NFP_NET_CFG_START_RXQ 0x004c -/* - * NFP-3200 workaround (0x0050 - 0x0058) - * @NFP_NET_CFG_SPARE_ADDR: DMA address for ME code to use (e.g. YDS-155 fix) - */ -#define NFP_NET_CFG_SPARE_ADDR 0x0050 /* * NFP6000/NFP4000 - Prepend configuration */ @@ -210,18 +205,6 @@ struct nfp_net_fw_ver { /* Start anchor of the TLV area */ #define NFP_NET_CFG_TLV_BASE 0x0058 -/** - * Reuse spare address to contain the offset from the start of - * the host buffer where the first byte of the received frame - * will land. Any metadata will come prior to that offset. If the - * value in this field is 0, it means that the metadata will - * always land starting at the first byte of the host buffer and - * packet data will immediately follow the metadata. As always, - * the RX descriptor indicates the presence or absence of metadata - * along with the length thereof. - */ -#define NFP_NET_CFG_RX_OFFSET_ADDR 0x0050 - #define NFP_NET_CFG_VXLAN_PORT 0x0060 #define NFP_NET_CFG_VXLAN_SZ 0x0008 diff --git a/drivers/net/nfp/flower/nfp_flower.h b/drivers/net/nfp/flower/nfp_flower.h index 7d442e3cb2..a989c4a8b8 100644 --- a/drivers/net/nfp/flower/nfp_flower.h +++ b/drivers/net/nfp/flower/nfp_flower.h @@ -31,7 +31,6 @@ */ #define FLOWER_PKT_DATA_OFFSET (NFP_NET_META_HEADER_SIZE + NFP_NET_META_FIELD_SIZE) -#define MAX_FLOWER_PHYPORTS 8 #define MAX_FLOWER_VFS 64 /* Forward declaration */ @@ -78,7 +77,7 @@ struct nfp_app_fw_flower { uint64_t ctrl_vnic_tx_count; /** Array of phyport representors */ - struct nfp_flower_representor *phy_reprs[MAX_FLOWER_PHYPORTS]; + struct nfp_flower_representor *phy_reprs[NFP_MAX_PHYPORTS]; /** Array of VF representors */ struct nfp_flower_representor *vf_reprs[MAX_FLOWER_VFS]; diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 8e69fa67b2..7c5b780e82 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -56,7 +56,7 @@ nfp_net_start(struct rte_eth_dev *dev) struct rte_intr_handle *intr_handle = pci_dev->intr_handle; net_hw = dev->data->dev_private; - pf_dev = NFP_NET_DEV_PRIVATE_TO_PF(dev->data->dev_private); + pf_dev = net_hw->pf_dev; app_fw_nic = NFP_PRIV_TO_APP_FW_NIC(pf_dev->app_fw_priv); hw = &net_hw->super; @@ -261,8 +261,8 @@ nfp_net_close(struct rte_eth_dev *dev) if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; - pf_dev = NFP_NET_DEV_PRIVATE_TO_PF(dev->data->dev_private); hw = dev->data->dev_private; + pf_dev = hw->pf_dev; pci_dev = RTE_ETH_DEV_TO_PCI(dev); app_fw_nic = NFP_PRIV_TO_APP_FW_NIC(pf_dev->app_fw_priv); @@ -482,9 +482,10 @@ nfp_net_init(struct rte_eth_dev *eth_dev) struct nfp_app_fw_nic *app_fw_nic; pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev); + net_hw = eth_dev->data->dev_private; /* Use backpointer here to the PF of this eth_dev */ - pf_dev = NFP_NET_DEV_PRIVATE_TO_PF(eth_dev->data->dev_private); + pf_dev = net_hw->pf_dev; /* Use backpointer to the CoreNIC app struct */ app_fw_nic = NFP_PRIV_TO_APP_FW_NIC(pf_dev->app_fw_priv); @@ -495,11 +496,6 @@ nfp_net_init(struct rte_eth_dev *eth_dev) return -ENODEV; } - /* - * Use PF array of physical ports to get pointer to - * this specific port. - */ - net_hw = app_fw_nic->ports[port]; hw = &net_hw->super; PMD_INIT_LOG(DEBUG, "Working with physical port number: %hu, " diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 10f6298f74..d43a071a42 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -1172,7 +1172,7 @@ nfp_net_common_init(struct rte_pci_device *pci_dev, if (hw->ver.major < 2) hw->rx_offset = NFP_NET_RX_OFFSET; else - hw->rx_offset = nn_cfg_readl(&hw->super, NFP_NET_CFG_RX_OFFSET_ADDR); + hw->rx_offset = nn_cfg_readl(&hw->super, NFP_NET_CFG_RX_OFFSET); hw->super.ctrl = 0; hw->stride_rx = stride; diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index a23b5be968..829e9c5333 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -238,9 +238,6 @@ int nfp_net_firmware_version_get(struct rte_eth_dev *dev, char *fw_version, size int nfp_repr_firmware_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size); bool nfp_net_is_valid_nfd_version(struct nfp_net_fw_ver version); -#define NFP_NET_DEV_PRIVATE_TO_PF(dev_priv)\ - (((struct nfp_net_hw *)dev_priv)->pf_dev) - #define NFP_PRIV_TO_APP_FW_NIC(app_fw_priv)\ ((struct nfp_app_fw_nic *)app_fw_priv) diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h index 956cc7a0d2..ff1019b690 100644 --- a/drivers/net/nfp/nfp_rxtx.h +++ b/drivers/net/nfp/nfp_rxtx.h @@ -10,9 +10,6 @@ #define NFP_DESC_META_LEN(d) ((d)->rxd.meta_len_dd & PCIE_DESC_RX_META_LEN_MASK) -#define NFP_HASH_OFFSET ((uint8_t *)mbuf->buf_addr + mbuf->data_off - 4) -#define NFP_HASH_TYPE_OFFSET ((uint8_t *)mbuf->buf_addr + mbuf->data_off - 8) - #define RTE_MBUF_DMA_ADDR_DEFAULT(mb) \ ((uint64_t)((mb)->buf_iova + RTE_PKTMBUF_HEADROOM)) From patchwork Sat Oct 28 06:53:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133561 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 2F92943220; Sat, 28 Oct 2023 08:54:26 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 10F49410FA; Sat, 28 Oct 2023 08:53:59 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2132.outbound.protection.outlook.com [40.107.101.132]) by mails.dpdk.org (Postfix) with ESMTP id 3B2664064A for ; Sat, 28 Oct 2023 08:53:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MsBg50kwWi3G3aFs5X8PDEkm7oHFTvRu+9rrf01xNW7qKnZPPJNFn9jFzIlK3OCgymySbDYl09I7cvzU57apEi7RlENHgGn5L1uUfFsHzxGdH4sfdXGKmHuBQOmrUoyB4vi6Wi7tqJgv9MtxdxxdDlQk0EL0zjzBISIpXILVKJccKQnib53BWnLRrOD3g9QPHyEBME5JTQCimfW2kRYlWBCmIU/NP16hJQuT+i3wBOXjkSD28GULmxmuWxfusuXxx5xpcuPAINQBqrqSetaaHaqzuqeK2AA6uG1i1yjOi2+slhad5mHM2xO17GtypeVtAAPIjGXOQHeYx+tPkBJL7w== 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=NkfMDfRrTLE3qt/C6yfAZREhgUecWJRL16YRoImUBX0=; b=KYfAtOdse9CyuSvuSNcVPpMcyW6YdoNI+5cXUBGMKKLA/TLtbS7IeUeaAG32ohpDaWUfOZwblB1o4LcUDTIaF1o157yHpsRzEeLEpOINMNNYg9zkTLQhSym5Uxm+DoBWjc0oEb3SRIl9WkG8Wx0t0JnwHviUy1HecgabiAWHHXVL+31sRKhu2KlhciecCimzDOQi97fZxbdczwgP+gUeWQ4k2eRgRceC/egdMXBl3TWlqiOivkIpp6462u6on2TmnZIqT3DICS2gq5wRto1BYHnvWpFdkteAEKm4yBzU/fFpjjjjixYyMeE93i7q/bGvgDijtHdO15El43D0uO5SOw== 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=NkfMDfRrTLE3qt/C6yfAZREhgUecWJRL16YRoImUBX0=; b=YJYKhq+FYvf9Uu+RoZ1y2SmJFCTX7tA725RmGz3dH4cBtOGcDI3DmOwiuH416lA2PYOal3J0ydtzhViQKG7UJqCcDl4O5xF20bDCMuLWorRlFkjPWh2MIN4tKIKWwtyGS+jtesDh8EwidX6JPWzn3L4zK6+44ZtDfaBExnJaYQc= 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 SA1PR13MB6055.namprd13.prod.outlook.com (2603:10b6:806:338::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19; Sat, 28 Oct 2023 06:53:54 +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; Sat, 28 Oct 2023 06:53:54 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH v2 06/11] net/nfp: remove redundancy logic of init control BAR Date: Sat, 28 Oct 2023 14:53:10 +0800 Message-Id: <20231028065315.1937188-7-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028065315.1937188-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> <20231028065315.1937188-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SA0PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:d3::25) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB6055:EE_ X-MS-Office365-Filtering-Correlation-Id: 00d592fa-b820-4881-b2b4-08dbd782a687 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tRi5PyORdR2DtbtDdn2QPEHi7HKn6a8XNQxw2bjnjR4mNsxcWZYntSNb5dfHY+k2yFRaxytvvTlDWaEZZFPXilWSlMwt/D8HPCQy8hqqVBSU/tDpNp0D0FrKt5+S0dLi3PSh2ohYBdIKAjcO+5UurhU8gQjbsdjlRNt5CBWZKc2KDXxefT78i4mnCFVy7Tcx5V2TfbF2N2rF96m0cPyogBx7gJkJeIncb4k5jOQort2xVfmt5g2cWz0tE5UH1VA+fDuJC9yFxAuKXg2Ik6fSPNvkw2qr2Z45PUO2R5rkABLCxHTXduJ4JWXthHBPYNVDkvdGfcbC5Ys0Iiqxq+cjsvu/aPxn2mmTcRoxdPJ9ufbyI/zzjfCqoFrOkAdd3VT8SSn3K3upVRZkZb5q2pKGJ+Ka5PyOEnXDXa82mdmvGU1tXncGhqncb/8Dt32u5iqXom5jHnW8jSfFGrm3O5WV445U5DNQbc0p4CCVLrjpNv9MYYuGXd0NGKxaiQJTjYmfNftk0tzf0+QTx7rzSZaqV7QDHUJEMvp4x4toWD7R4wQnmhyHZZuE69Fq9WLibkE2NAN5gpvsQatQqkbi9Daur+xpXJnX5niFHHUjPoeWc6SH7/4ka5eZ1d6RajLEwhtR9IzZVys0s6SAmzOjg8V9XSLsNdYOCiPXgVr38SxFHJg= 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)(136003)(396003)(366004)(39830400003)(376002)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(6486002)(8676002)(8936002)(478600001)(6666004)(54906003)(66476007)(66946007)(66556008)(86362001)(4326008)(41300700001)(5660300002)(6916009)(2906002)(44832011)(316002)(6506007)(52116002)(38100700002)(36756003)(2616005)(1076003)(107886003)(6512007)(26005)(38350700005)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pFWafQunqY+W35xi8sOJ4C6T3NcMn6mPX08pKugbtd65l2v6kBFsZsK+MsOS6LQ5pbEExBowj7jwMrRgAGXOxbFJd5irSXDp62G0s2oTd3L5CzmvyfYCTgL5Qpl+raZFU964pA5rfT1QkXbzDx0EK3VFlYkcTA/rFofKZ8H6rXTn7HVuJ+h8E/MvUgr8LkUh0Ft1Dwy7JMyVO7O+uP45rOnShGlRAoUnepvgX2XemqSf5Jtz4/gcVPu9PdP+1djJ/hNNvumIoJcvK1Jcw37jfeyrkNM4J3haYzX2jYMWhfU6Ut6ckQ8ochAVFOQMWnRgh+O3eh8On3gkuQLGTmV/EQBv7zJkFPs40y0gvS9qj/IT1HyTdBMODUAew5E/Bm96MiPJpqvVeRJM/+AgcJTDDafqh99loPI7JilsqEVYlxgXKWH5jhPGKOeDgbtWRJeAPfaHDfnTxL+/QDhZykIOHkFPEB4CL1jDX+zFg0QHSdyp3pG+G5MKdPMhlo3x7wS9dQp1gIPbVEwQ3rS3MWuDU7xHH1TktqZ9IN0Z0XLdndwZnjCkrSF6w78fxJ8DJsEzRnBAqjsdNNGCPe9u4IURVwGp+Lec0v3tCheyZTDmkAmnKwXgg2cugz9kFBaZRZP2ifDAK+ev+0yhtq9H4Zc2uExM4FXXk+eprJQBxGpj7vwRxXK3178DcQnpO01FKajW9V8gNilUkmREJ1uO1hisZAQoSoPxm1K9PRbJ1wria7a1k061FIeFwAG9v26xMWt9agoW92FL1ysF68C4NPnWAmuWjS3eepyPfwol6ZNoDKV1slv0/z/exFtSdYkFDfQ0V5WgLT+51u6upknFeMLxAcbDepdku3hoV/imkAMRgJlur/j1rbWUDC9n7aAeoTevsMVo0f/Nahz7Xl7acCYhT2VdARBFjeQ28VYT3S/Yn+0kULjTK1wjVVaEGjzRZJVnA0T2+yk8Q3uKP4WKBNVQItd3wfXNF6gy/iUumvwTUXRYJG8QdyO6FVauiptSU1i3yM5a3Ul0MWxNJDCNsNV3KCkuoU9npRHQ/E7emO7vW+8iwGPg7K/VeRie3TMHe9Bw1niUdDcbRvXIRFDCdJYY8cs3s1wg28t2DcqfHk3gW9cBDXy/Iwb5XE0UMfZwLa8AnLChrHee0YlTkPbz2YzIDuXEs2varUG0SPrF3EGyFa1TllPCok0bmRKcfEZWWAbTXAqmomQHvddMLy2HmYAclfE8/5/4cVWUN4Xjadni2aCC2iooSGUgMDU20PBbc1P8jbfov+7XeOGP0jKr77H3cnYTSlvABYxTX8bIHuGsXDOZv+6Q+0C0wDr2/NPfjmV9gJ3aCpKzd/go0SR047xHY07+pj9/yOaISUXxJylF06ckukWI3uj1bL3+lKHqtgjOXwbYC29rnfUJtzV4JM2VUTWadYZLRVnw+Vkb57bM36Xam7rygNyzSjPIj7z97lmu4usds+Mo5LytnN3yEDlk4lVtXTzQrdD07u2BqhsexLfKglLW8Y2GucO0HqSNX/QU/uKDLWV5kt7cEggsGS/Rgmdvtn9xIYP2m+UO/wih6IqIYyP+Ps91VJQPWdzPtSCPTfmyeghduhfSyuPM1xKsRw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 00d592fa-b820-4881-b2b4-08dbd782a687 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2023 06:53:54.5997 (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: 8qUHa4v8wCZOU1WBt/3n9WgKbY5qBGxqYXOBfHNyLk3hxRo4H86Zm6SRAR03XYoWFeuyYtXNAwHdPLLNFylSqNceZ3ATtOxRA0wE9PQ8KjE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB6055 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 There are two initialize statements of control BAR in 'nfp_net_init()' and the first one is unneeded, and what it really use is the check of NULL value of the 'mem_resource'. So we move the check of 'mem_resource' to the start of probe logic. Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 7c5b780e82..8057452799 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -503,12 +503,6 @@ 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"); - return -ENODEV; - } - if (port == 0) { uint32_t min_size; @@ -890,6 +884,11 @@ nfp_pf_init(struct rte_pci_device *pci_dev) if (pci_dev == NULL) return -ENODEV; + if (pci_dev->mem_resource[0].addr == NULL) { + PMD_INIT_LOG(ERR, "The address of BAR0 is NULL."); + return -ENODEV; + } + dev_info = nfp_dev_info_get(pci_dev->id.device_id); if (dev_info == NULL) { PMD_INIT_LOG(ERR, "Not supported device ID"); @@ -1089,6 +1088,11 @@ nfp_pf_secondary_init(struct rte_pci_device *pci_dev) if (pci_dev == NULL) return -ENODEV; + if (pci_dev->mem_resource[0].addr == NULL) { + PMD_INIT_LOG(ERR, "The address of BAR0 is NULL."); + return -ENODEV; + } + dev_info = nfp_dev_info_get(pci_dev->id.device_id); if (dev_info == NULL) { PMD_INIT_LOG(ERR, "Not supported device ID"); From patchwork Sat Oct 28 06:53:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133562 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 CBEDC43220; Sat, 28 Oct 2023 08:54:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1AC3441143; Sat, 28 Oct 2023 08:54:01 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2108.outbound.protection.outlook.com [40.107.101.108]) by mails.dpdk.org (Postfix) with ESMTP id C58F340E68 for ; Sat, 28 Oct 2023 08:53:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hOfW+PbyO6uv9WhymIbvtFcRlYIjfs0es0TGfpR9YUAslidhQWaZKFYAYcs8K9x5lcaElp7aba3N/YU3zw3N7dtUr5/Alnpv0CwUGeUsW8dBMAfkvRuXJnVABUZgKsvs7DVA7kMyer5JH1RPKL7yvRzV5sXnKpD7yo/h8mCAy8qhevP/ppLd6AYd6X0nGY5nHXNY5oD+D41136yGLuVAXtIGrgoJoy7l2/vt8lxjIqnqIJw4oUxMDmpQiYJYvbZdj71KumoGeOCl5/z/q/vGNX3VB4sGd7G+TkXG13B/fwPHlEu5s78+aBEfCx/RkyYjivOPkxZN3lYQudaj01zWMA== 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=+3iF9rDG0ZZhLKn3Y1PmyGcn6LbcrzyvzQGCE7kEyb4=; b=RscUYXjAYoSl+hAw6ne3BvO3egyo3ivIVIvEHETOl24A7n5tHG1gWIkpkuB2iv325KB5EixZB1yG0Vg2H6qD2mQNdLMdHA+FqGQr4oUcxOcImLRs89dXu67mmOZQ3NtfNMk7RK03VFBf+1RzTKy9KTjj2QvYHiqYAFL8XQ0mvMPrWAHD4NmA35SJViT7pmPuHUAPQ52mLHo8aUgb5Vrakm9+fnIxNyzUKIspLnKvc1jy8MN6uEkjLeGEsEiIGK14F/wJcxArkrspJLAEs6UxSczrj4WAlg4YL9eU2e6OGBH6JQk4pXS7aG3l3I8bDLPjrPKOnkhS/MNoOaZaMWjhEQ== 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=+3iF9rDG0ZZhLKn3Y1PmyGcn6LbcrzyvzQGCE7kEyb4=; b=wZ6CR33T02IDDEsK8sBSOvUH5NaveyxIHsKHt1WWfvKksds0GIUfvFmozkrwwl8wCZpo2D5Dk6ZkPnZsaBIVQ6KtG7UMZ8dCA+6AyY/y3rNgUnmFW8P7D21d7JY0tx8+8g2MEQ682Mfh7XkkwOPlycTHTGXqTao++6KDEdUrTtA= 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 SA1PR13MB6055.namprd13.prod.outlook.com (2603:10b6:806:338::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19; Sat, 28 Oct 2023 06:53: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; Sat, 28 Oct 2023 06:53:57 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH v2 07/11] net/nfp: use the DPDK defined function Date: Sat, 28 Oct 2023 14:53:11 +0800 Message-Id: <20231028065315.1937188-8-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028065315.1937188-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> <20231028065315.1937188-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SA0PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:d3::25) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB6055:EE_ X-MS-Office365-Filtering-Correlation-Id: 50b467de-f909-4ef5-28ce-08dbd782a805 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hlbKc9kO6lnwsNHUIsSvBR6+NsNfXnL0uRKCmKgGoY9/XnHccunv/1BCTYqU22v5ZBEfGikkSrUZhmf0cCniqWUZMEAVtRTFzfB2QsprudawN6b3zNxrS+yofYeKVgXfK+ocI9m6s2aeeAvUh2eWv7D+naKRm6bTF5dtrdZCiaGX+QYDNJq9lF2aitSI03/yEEGE2Owt0JmS8Mh0tUhXk+wveC3txaCrpDLy+yz64gpxERcxT4ibqIFUQDDSl6ve+XhN6lcEC1ZSwXeVTv74C5diNDMG0xV5WqpUfOiG+xsX/eXaGiwwUIF0G3CXkWXAG0VquTDTH+KX0jZYt9G62IsvDEQ0KFIOhAlLMsKxAeQZWYUrqPBRnYOONOwyAhSR2cG2tENCfVDImNi2Ce1+6LRLBmbSneeErJ3cOx6cQ4upLEFPcEayNpMa3Cy1cD5ZP9F1sorEY4v7Cyu/vzzFf0vuncMoJUQVZwTHx4O7Ksrxv7BvPhsQxuLjVHY4HQ3j49Xw4midfZRw4qpoQ8W1NRBvhNnWDNk7FCsDpn/lLelYtIcJf4IQOTnCiuUjRwJxj42Dfubtb4GrniHkPzCsYpMISohcuZVW75EUU8O1Nat+TmjJtmnzTWZAIP0cHqUy16URUpGu8FgD8xOt+hXBSi17VGN7x50Dr2oqpmRgYRM= 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)(136003)(396003)(366004)(39830400003)(376002)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(6486002)(8676002)(8936002)(478600001)(6666004)(54906003)(66476007)(66946007)(66556008)(86362001)(4326008)(41300700001)(5660300002)(6916009)(2906002)(44832011)(316002)(6506007)(52116002)(38100700002)(36756003)(2616005)(1076003)(107886003)(6512007)(26005)(38350700005)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /dk2tBfy6pgmY20bxPCdzil7fcnWswYa0tXSwMIu7UphhYm5evSlqfyvQCu1TwjuwELm7lrRLlj9Re/hyujVmMEWAR95EmGReAlTUXA1zVxylGBB3F8wBqcnMkNW3pUAPOS7g8dppGcax0DF2WYKYL5XBxj674ubvvc6YFB1ycID0Q866uGcnymK32aUR+KzvTdBh+RLCQWslwGXWp/nTsQaB9gbu02AZ4cRhzD31r19DtCRBcook5FUkBFw/PTkIef8rR7KBRIfZ+3LS49gL+QruSsPjWVhcLM/nLn0/3yOK1lsJchGrYgQvIs98e/sFX/1zZTsosevNnOZGaaQnUB/yeef31DMPoIIAG8HdDLMT79uKiAZ8kxQJbnNw4v86mBdoBLlLMFeMUKktvBjwbquY/d1OWNM3GVtCO7+nkPbi3CfpO3yf/ZqpkRUveQmUM3bweI1DYHKYTGCbb3mfjK59ZLZ7wwNeLet73sVPilcR+UUVxQ558rN8QEadA8MRnySCRygBT/qP3eTRpaIqCtxStQcuKx9pjnJ/Rz7yKMxNtdWzgr4oQYTAui5V9ZDhLCJwqfrf9FjmHLr4HqcXJSOcTBTi4GLBBX6Md2SB88l0o0zkcZmm3lJ2YnOSS9HftT5e99jUH05hrWNc8y49aifg7AWrpXa9eE4p13IAX++ZTmZuqI3qboaui0BavFcdP/0rLAHuCfY63kcMmXMmSEnrXhY63kj9iRipP4QIhX7PBMKaBOaK9GNEGhGjw6iElJsBC+ps2tzi9nvYMXLhAi8Wc94ukPMfDr4hTiC9+bGMgxCOKvVF8rsaRv/yrGXm7oykqkoPdD1NCVh/xdXZt9c4rMFYzQLtSmazzFotgxLCgaAnDnOMgGlwzxdx3gMJGP4/C3TyWRX7tsQY/fX0AcviU4IX5kwp6sy5l8HAwoia5tlrUFTrYLBQoUvaDNQFgTMjtX5g5W6Y1dpSeDKD+fa2u76MsMPQhYejPCbdLzyk+0t43IXwqU81lzprXsfNd0UZuYj01eEU9Mkig9GOZM6EgZjgEV+K/8vmQVOaNO8n7FM/wQlQZEAhMWH3Mjbp5j4N/WgylQxWJKhQ5iAP9hvrlvSdIKycRYHlqi1K77mbAMu/ycckoS1GdVwzgw6a8M5fSNU2YIVO3PO0/zBRrK1YoxPlexNKHZygOhIDO544F3iw8Rx68t/MoXA5erp+HKJIP/7Tzqar9rFOFnry0YXKGuCfwJYuGYQl7LrWYdGCoZxOER4qytLs3DqZJ66kB5aey/DGK2LVRxHrEoZV5zuJLbNmi60uKOVBV4cLb+k+4ClHeRiLV0C8QfjjeZ+PxI4GV5cOVlA6o3z7r4PM3H9MSEUWt2QdFP1duSsJuTw0TV4lpSaYyg5SnpsQEJmAHLDFj4V/1gQdYb0vLz0YOmXAXwioKgUG2sZ0KZ9HlHSMn16321QGInyzuwnA9v62VvePKucwuaINm6y5xOux/VsU734Ss1ddxbGcPXGF7Ymh37jNZtGf2dmWy89KS9D1QTpBkPgss5kcIHBP14h2v8jzE9fCGusxYcWJqSehMxfH7LeB8+nyuE/MBuuy3FnBv73t0bAgegzXTg9+2GJ1w== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50b467de-f909-4ef5-28ce-08dbd782a805 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2023 06:53:57.1309 (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: 3ptTnhdJK0k/PLjp8SC4fLrc2EhO/LDoU0qO/bPnQTBPdF2zeN0Xa/zZDC9HIzlW19iR582kELavwfOY2xU2EVUVD2CQ34dtPMNCiIOR19k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB6055 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 Use the DPDK defined function to replace the user defined macro, to make the logic more standard. Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower_ctrl.c | 2 +- drivers/net/nfp/nfp_rxtx.c | 4 ++-- drivers/net/nfp/nfp_rxtx.h | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c index d19b60bc69..c25487c277 100644 --- a/drivers/net/nfp/flower/nfp_flower_ctrl.c +++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c @@ -109,7 +109,7 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue, /* Now resetting and updating the descriptor */ rxds->vals[0] = 0; rxds->vals[1] = 0; - dma_addr = rte_cpu_to_le_64(RTE_MBUF_DMA_ADDR_DEFAULT(new_mb)); + dma_addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(new_mb)); rxds->fld.dd = 0; rxds->fld.dma_addr_hi = (dma_addr >> 32) & 0xffff; rxds->fld.dma_addr_lo = dma_addr & 0xffffffff; diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 38ce83aa46..be1ac32c73 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -184,7 +184,7 @@ nfp_net_rx_fill_freelist(struct nfp_net_rxq *rxq) return -ENOMEM; } - dma_addr = rte_cpu_to_le_64(RTE_MBUF_DMA_ADDR_DEFAULT(mbuf)); + dma_addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbuf)); rxd = &rxq->rxds[i]; rxd->fld.dd = 0; @@ -752,7 +752,7 @@ nfp_net_recv_pkts(void *rx_queue, /* Now resetting and updating the descriptor */ rxds->vals[0] = 0; rxds->vals[1] = 0; - dma_addr = rte_cpu_to_le_64(RTE_MBUF_DMA_ADDR_DEFAULT(new_mb)); + dma_addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(new_mb)); rxds->fld.dd = 0; rxds->fld.dma_addr_hi = (dma_addr >> 32) & 0xffff; rxds->fld.dma_addr_lo = dma_addr & 0xffffffff; diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h index ff1019b690..5695a31636 100644 --- a/drivers/net/nfp/nfp_rxtx.h +++ b/drivers/net/nfp/nfp_rxtx.h @@ -10,9 +10,6 @@ #define NFP_DESC_META_LEN(d) ((d)->rxd.meta_len_dd & PCIE_DESC_RX_META_LEN_MASK) -#define RTE_MBUF_DMA_ADDR_DEFAULT(mb) \ - ((uint64_t)((mb)->buf_iova + RTE_PKTMBUF_HEADROOM)) - /* Maximum number of NFP packet metadata fields. */ #define NFP_META_MAX_FIELDS 8 From patchwork Sat Oct 28 06:53:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133563 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 3ADC343220; Sat, 28 Oct 2023 08:54:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7AF0742830; Sat, 28 Oct 2023 08:54:02 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2135.outbound.protection.outlook.com [40.107.101.135]) by mails.dpdk.org (Postfix) with ESMTP id 7264742670 for ; Sat, 28 Oct 2023 08:54:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hratTZvXhT2kyUU/EdbRXG7V1+vGKJlw4YMbd6to7B/dEbhtjxVmgUuY1Hh06q0YbMCqdV0EmUHCbG6FGa0LBzH/I9PArabGnCPQQ5KNAyH8mkGgwAXqbmBHUgu3Pe7gdQ+dFCH7oCY0Z+WddR5aZQph/ZxSLZnhrSrGvCK3ymD7HR2Q2tmAjdht1rr3JpzNBOeyGIEkFHxAk9kUovxx9awzm+R58AncavXH56hsMKz93qQ1clZAASTU81+U1j5VdSdXjaKJQkv1joteSJ/WxDAT2oi3RqeLQKZl5ppQz8Chl+tutj3XrBDa2vuV37og8NRCp0QiXQ+/wUtdKl8Pxw== 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=MaDUtzHTfBFp0MBjwsBPq/h/UGD5Qd25WxFD6v1XsS0=; b=BZATwhj4nZwnUZ+o9qns+iAFksgtTEJ3i6LY2pofTDDfQXrtvkWQCihJb2rUA132ivcB4hZLk9YzArdY49gsniILXSWi7P4uIaowpP6mqR9SvY4hOC2dLszPmfDrQS/p50pa9w4zNV19HUYh4MlNTYHsZ6s8fMH/9I9vEp1+O5pm47UL5xcQhff/vHXI+RRM0QzoNE7PQ4ngvbQ04QD+woi/3y9Y/kQbk4sYyketzFtzhYIKTbsnvj3zRcmlUhNFj886CJmWHO82wLhvXhWuJM0LdB2+CobH1oRU3Y9TBu3xH/AhHzTMU5mp55Ri/LiRfbBd6dNbmdQszfhvd6lcsA== 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=MaDUtzHTfBFp0MBjwsBPq/h/UGD5Qd25WxFD6v1XsS0=; b=TfS07aMEqDBsyFex0MfJehT6hROOwSaiL9jzp2FvEoZeRszKLQlj7SVKHcQ8PbhvbvUuXt4RDqvQhBsY/ThXmLnlaSf1vu91WQHvc7dhqK8Snw5uhXECOvTmkIGMthLcHif9xVKt2PjU9rkGGgOWobTAtO88LQrYRa0Ko7zQovY= 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 SA1PR13MB6055.namprd13.prod.outlook.com (2603:10b6:806:338::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19; Sat, 28 Oct 2023 06:53:59 +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; Sat, 28 Oct 2023 06:53:59 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH v2 08/11] net/nfp: replace hard coded value Date: Sat, 28 Oct 2023 14:53:12 +0800 Message-Id: <20231028065315.1937188-9-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028065315.1937188-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> <20231028065315.1937188-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SA0PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:d3::25) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB6055:EE_ X-MS-Office365-Filtering-Correlation-Id: 647241e5-f8a7-4571-1964-08dbd782a95a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ra/Bo3gTutUjJPMXuykeunwfodp3zal8ixZ+l06iBNogxUh0/RXYTiR0ZFWAx6ZomSa9i0yhlv6TmeY4uxeHtaquRlZFmaoGgIFmlMXV/Ay/b7uFl5du6VyyKJVLzBEtIqYgzf7sQJIBD2BJqVmU0SGbLTq4orgBHARqpKh01CuUP5HYbEnob/DDz+fhaZRgNHXiiQmH189kJOeCIEkQtduxmPfWOmIWTHP7Z4kDAgHST/AX4uJONub7XWQJMimT6BtwgpcHUlDLrYuzH8/4FLZmxuRbaoHJmENVKGe2HQqARHhwUqq2bhzaIH7i6TqaFKA6vsK2cbcs2+v3vbyAQc4omAUzH8W3dWNFGc6362psMC5TgZvRbi+4flKsBp2kBfsJwQCycKwHfkivjEcNAR6coR6bjO//l0KlkwS7GWb+Ac+QMVOXidm2JOCKiKC5aJ5ilnDQjn0Ehw9h6eObqlVed2edC+HrkpyI4BdI/+GC2jRpL+Ks00j9MPWDCG+hEtiOmMNl4Lr9CtzIf/UlhzE+ol72jxVtppr9UUHiLJux3HyHiqez8hg1wogBgx4E2jAJ0Xet9dlA36O+qFNEt1O+XOVorEvMhaArzDw4OGvLalxJv6VVnbPTI0tQKX/rDQhbTEwG9VcWd1QsL2qMF8y9FEgwnnyw0ho2eDTzQ9A= 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)(136003)(396003)(366004)(39830400003)(376002)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(4744005)(6486002)(8676002)(8936002)(478600001)(6666004)(54906003)(66476007)(66946007)(66556008)(86362001)(4326008)(41300700001)(5660300002)(6916009)(2906002)(44832011)(316002)(6506007)(52116002)(38100700002)(36756003)(2616005)(1076003)(107886003)(6512007)(26005)(38350700005)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Z6pqkaznGfLM9yWdeTFM8cWyYcHCoz0Ensv1jVE4gVOMejmGcPzYRm5YpjmF/xwEpbtcOmcQDjE3362d9a37dg9kvJW8zweAnIZuCYhd7HFABG9K8Oxn4d5HJMn1EtnkauLs9fWW4Gplkr9J8ap98I3wJAnuv8R9jQU6nMoolkq7iGDEzC48LWHfG7ULGtZKUQCwfOTOj0CJmrjgJB7l5uE4yY7LWsLjOFye+/98r8yqBIarAsaemxLTIoonuiy7xUG1N3XZ5moEi7bnoknWCsJ13ckWlwAhpy0qjn7HeDNJsRFiygX2BJbn/GlPQdy1vHHOy1cFHuqEmbwv2AI1pDGgQZgo6qZyTlqnqDzqL1lojN9J6azO7JmTiAyWBgK8JFsS3CbqtRe7DzcJoP1rpggPdHAFvFTqjRwwqwjJD563A41s4ufS9swU6TrZqQsYfFqN+u5hmE2YN/bX8EMwnA6Jt+k+H0+1CodY7dW0dFCEFJEdcKiN3r6EELC6etLHCXZUZNL6ZF0bOxRFUIPTcWuj8StOxXlOH/ihDphntJWq+5Ca8YN9VmB4byVfLruyA6i3tHy6xCnjglD8ybXKCule4ePqVIqCoM7JlcPBruHW+dRFpFWs5ddiG57QZGxfgEAtpdb79y6T6tfRH+0D+VuLG3kMTyfKW4bBVyjqOtCkPLaYuFFux2aVP455gDW6xN2RKeWjtTGxLN0W6UNjBdutTp+n2DdJkHbpOFwDeLTYgh5rIfIKLYMoMgi8t77qriyjTcnxHUR+VRx7r6uwjC25QLfEPYV5l9IuN3A50fNVCeFPk8iDH+cX/wepeAA2q03r7xsxOwNPHXS796UtZF6wqE08mCDbhrOyxb+uiVKQv+RtvZJ8JHtJWHuA/rH/SP+ROufqZANP/hDncibcitya5RBU6B3uC3bT2pPXl5P6qHi+U6jTxMtzBGfzZTSWF1qiOCjiYV272jobfSgiiM7qDEtgb2qaNxnD1Za6ook/Y11SxcWJF/bnqGIwAJYY80E7T4c7wcr8ke5N9qwWO32HawwE1cHMg5YC49skb2yvig7S8kWOGvwDOljcj0W0kaktIQocC8nOHKmkeKbC73AtgoZMkwrVGht3dCFSUsP3cWI6zyeynMUKPGxxN+KoGF0QwgD97aS8dsTa/zhLySYc3vcZyTznQsIZWkCmNOoc91Diug4IDOMVTNHoGIgWoPFWHWB/YttPtrOQz6HaGAH+KZJxMcPylLbu83BdPYPmCrn0tGHS90l1A8UzSxWl9QsO3XVCUse6nSba+Hjrkoz55OO2aiAsKsoHzrslLicwcZhUKofaYPgy+Fgk9q/sM+LFMMJ//b0/D7afgoCTXciZS9rD0+hSXuqzIw5XdVXIMvbVB9ey3oYv4/NqFITG8JsbAxtvM6EXi+R6Q4W+lrrim9fFE8J3kdh1iKEsnCrx21XwzYHSMoI1JFx13HeHHkdQyykuy5apQATQnNJEicvVAOg7rcI3jJ0GpuO/zgxfV/G2TX6WShF4J3z0im3xNJZT7+u9qiaGCo0IDS3T8U6HgjaABy6+x612WGxcs9ii/QQMtVu7rSWzbBya3sjbAlxG5Cy1kWGl/WNS6zFJXQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 647241e5-f8a7-4571-1964-08dbd782a95a X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2023 06:53:59.6157 (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: HmL3ru8TAOOfeQgkalZW59mvt4E9hjzf2ZC1BCfZawPzrTo+Sg+VTX/8PBXsggWUvf7h620y/5EwBwo0IBUtWCKdZnlHRvS8llp3jHlV4hg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB6055 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 Replace the hard coded value with meaningful macro to make it more readable. Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower_cmsg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.c b/drivers/net/nfp/flower/nfp_flower_cmsg.c index 4013b32fd0..8effe9474d 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.c +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.c @@ -13,7 +13,8 @@ static char* nfp_flower_cmsg_get_data(struct rte_mbuf *m) { - return rte_pktmbuf_mtod_offset(m, char *, 4 + 4 + NFP_FLOWER_CMSG_HLEN); + return rte_pktmbuf_mtod_offset(m, char *, NFP_NET_META_HEADER_SIZE + + NFP_NET_META_FIELD_SIZE + NFP_FLOWER_CMSG_HLEN); } static void * From patchwork Sat Oct 28 06:53:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133564 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 D432643220; Sat, 28 Oct 2023 08:54:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8404C42670; Sat, 28 Oct 2023 08:54:04 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2101.outbound.protection.outlook.com [40.107.101.101]) by mails.dpdk.org (Postfix) with ESMTP id 7761842D72 for ; Sat, 28 Oct 2023 08:54:03 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VkWL4DGQvqD75PpmLnQhz6RewM3d6yIeZfvcorPpuGC9z3T1TqF61VRZaIP4SlbF69uQbqmv0TDvNDYWeIqPjFjBEt8KVuXpl1o/ugqpeJD2INKyATJkJoq9Eu/cugEf9s1vOazZFg7+cXjXSj4P0vSQzl1CEYQLVK0U4MhY+T+ASLZRJFyPBYDrBQhhrbn+I2991uYtS/dOmpGB90jXhx94wDWc5uCAc81bR5kwOy8tiIPFrbHf/9fmyi2t7rVob84Oy0Mp9hrw8pJVPiMGoCb+LBYJNoPV96dXr6qv3mRC1SPWk7kqX6nRS5OXePczaIFRv6M6FHtYvILLWDsOSA== 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=PofJ0EvCuvUiUZ29v9ygiabDgSc1yjv4ARqSZBYsLs8=; b=GOJR5TB9cxw9jWpkLZvBhEi2U7oho1X0uo2vtBTTbiuMRJfLHsJSqXUs5lNSNQZCJpldD09kQ2qwaRa4qvK7Yhzmfc5K7dWrAj9RCrciFq+APu7FXD47E4j1tIIi6U+C/wlFS3AvLbioVQ4qjFCU/3RCwEHg4QNMAetRS/3pIJsu1OCPXry0vEVqPmyOmvPqqkJn3IK5H/9pEox1im9IgI93NGhYEUKKIj4Vfee4vEJhgXgXbTbCgK3vS6fV+ahR/tOL/vTzu2dq91kpFlBDbm2FZgTRqu+fLAjYjqtnoivlwji+DvSdv6wVDh0gjViwTpjike1B+zwwP3Z230052A== 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=PofJ0EvCuvUiUZ29v9ygiabDgSc1yjv4ARqSZBYsLs8=; b=PfcdGBQTF6NmvJLlYA2szEmLG7tglgDM1pmT/B0rasgPijNq0HZCjKH9GB0rOWoJNmK4Nqg+B1Hl8OYkLAyQLyZtJBOkfWme9DD3R4sOELShCXe/AOPH02NnKpPZVFt0mRzQG4sLN5ejeKoG0d9Wh9Dunl4j4o5tPKo9pujxMjo= 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 SA1PR13MB6055.namprd13.prod.outlook.com (2603:10b6:806:338::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19; Sat, 28 Oct 2023 06:54:01 +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; Sat, 28 Oct 2023 06:54:01 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH v2 09/11] net/nfp: unify the PMD name with macro Date: Sat, 28 Oct 2023 14:53:13 +0800 Message-Id: <20231028065315.1937188-10-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028065315.1937188-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> <20231028065315.1937188-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SA0PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:d3::25) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB6055:EE_ X-MS-Office365-Filtering-Correlation-Id: 69117fc3-f8cc-4b94-9212-08dbd782aad7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v5ID2GEnUolAupRxnp5OgXkGCaP5aqXoQgA60s8rpk2Wkw2o8YUJS/ClGBLrir3s5Iiu6BqIomU82XNYgHBAi+01T7rCbDo6iYt6pPfC5fzcLglNBvY0Y9lDmL5SBztpANmzTLtizi0IgBlWMx0munZV18FQ896M9kM+GIE7NX2bEWoL4cZa3czWqqub7lvKAS1Fee55tMMoh6iPyRDVYDMkxdwuHllgYw1bxuF2j9B/581zTvibYiQ5pypLwzqwwbyucEn5Vbntwwsq2EmFijETM3kzlKM5Tcgaf691E2mu2Pjlc6v3NCMVZ+O5/aO1GFoRyOGxetIzVGhTeAj3eeznw/TTLlVNGhj8SF/ZXm795WdZHsxAAOgfBdWYxKclOopmnPRIPAe3T+AA8uGXHqxFQRDq2VoM8Amx17Z9WrUtfXiMsDaTP54fzxYnHC6p2WgLaPVLAsGsNDuYeVuJVT4LrI7DbpGaNNEB1Ohax1mXYaxpGkoHw4XaDfyg791EwP6n8iXzQzoHrrXZzYrKN8u1KFXYemOTLbMbl9mYOexHwSZ6kYz+KFOPi9xRQTRotI61vja39aG++r3P2a5QMKqaiDo8tvqjZPTstzRUrBL0EZIaWRG/x6GRDWIJjiUTXc37HnDbq6dkOb/W7uKopK6hsdfz9UKj9/vpuvYeMOU= 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)(136003)(396003)(366004)(39830400003)(376002)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(6486002)(8676002)(8936002)(478600001)(6666004)(54906003)(66476007)(66946007)(66556008)(86362001)(4326008)(41300700001)(5660300002)(6916009)(2906002)(44832011)(316002)(6506007)(52116002)(38100700002)(36756003)(2616005)(1076003)(107886003)(6512007)(26005)(38350700005)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Qxtw+vyY/EhjCglxcbUo0O0xc4gj1EXUMTIn3NiKCtWYKTzgkSWhEA9bkRSpFaBo12eIIVwKet3qPmMh7BCFR0bcLyW6lXLvP//TGSXMIPW3F/okBuJWehZKISKOlePoUkHL1gdXrSoTd3CCAt3rHkpFDJ/otwKIKdCSi772VLrvtFBYUm+w6mYC6hh7IwBlyJPqEJFoEbjVaDqNK2r1VYVpGtTC9bM7ZOxvJZ25FJlwCDjEwBJQw0yjKeaC6EFnM75ASrMSDk29KHtZ4UFWqRXIz2ZabenBEFJ8BrzIs/6szvbVR0hhEUMIXlYN57dUGxMYn3WElHD/G0TPHPG020Wp8m7qABkAxPQAaX8WcbUES8VKAsfSpdGKNvLW2VNl4p9A+uiSN+qMocBuvYu0ab1lNZ74VPTwqGwnlZomhn9FFUlhS5m4jSjy1Lslw9wp2cOycXiQQ6SA5/qYtHRkMKq1SWfPO+S0OC1I6j1cibVnOHcmyQWJpicRthCWT8qjpfgLgBNi/ixJFLu4nxUCijtN4XfuHKV1bATT41O0cdH0aTo9OJPj6oWekSiH2vzdYUmioIVxDvIsfL0BYIM2L11RlxC3z9PH24gPjfLBv+V7bhyM/hFaDUJoAlBIePMxiX58DFGRV8mqLNiS9C3i3nWcUrsaH/tl/1BNmwiDmJ2s2T9LHStA4wrCD4wZC8h6WC/HmzvHDkFPJL5MSiH9He4siRmtEGMnsZIoq6xA6nSJOWMpxPYTz/EgD1lDUosb2aVBITV2uKUrpvM4qGS+EjcwQ8Z+x0433KyJpqGXGTZwNRDbqO3HK3VXA5dJNx+RbcOi0qaQPyYzyrm2zqZvVYvS0CEYdzwQmNa+DSB5tN7X6lROAAj9M6f/KAFKr2qmhKVzwmezutA2zY19l7p4KfaImj7R6IpKaPxSHotGFDY7QgTDrg0mhH4mtf5hN0Yh/abCZBDuABEHbYaZJsMeSlv794zOYgkRvWn/hkXmMZWXiRLvJJMTrtMx6zvaHKp1cjsOKNRTkHsEjfObYoI4DCZJvIa9gglRCdVfiNBjS9BSR7+VjkgoZZ5mel8Wi9kraxAVmxLOCWcWxcyvIc+9eZzyj8H+fVK61JSf/AOpuuwMYkt6GSUUAS6tjCQijVtvk1ibaCb3NWwLmqcWTMfDjFYw1TH0PK1gUcQLHLRcRDo9ejE2vtQ+fHpFU6XUGxLXoPFNt4nPCAd7aUhFyT06yJTdQ12TLCmvxh7YRYUAa9SSe0Tu8PgCzlM1Qbc+3bFOr8dPWLgGFnSSIoO4Dz6Iy7lSMGn9ShZgy4X0RhSlO/rcnsmjedAaBNt96YCqnQg30YIsbusLny2wYyblQuW1dKyRmICWD2FvDI+VHRnFE49EstP4/tdTQDJVlolYAw5Fi47cnmD8+ZrqRsrlgmcmutrrL+9ES0P2C61YBUoVc+wOnSQw9tRuKTNAbM2GopoNfh8g+O/TuftJ3CQZxNUhV5vkG9CBOaIXNIYS7S2tQj9XwahVtqf/1SGeYL3ECcfRezZx/yovE2DjBhSeoE5fDDNjp83tlflZznQLDi+nAXRx/uXJXO8JBFChA54Fxpc6uLtqTo4vDFvDbtHDrq5jcA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69117fc3-f8cc-4b94-9212-08dbd782aad7 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2023 06:54:01.8283 (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: lRwYoLgumbtEbjZ1TmykyLvidDO6NRDfLhbi4wnesV+M1zxiDllr313LTzjuaiJdenbehj1e7lTiVAkKfaYlBYspOKq7MzsMb4xHAqyAymc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB6055 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 Unify the PMD name with a string macro, make it more extendable. Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 8 +++++--- drivers/net/nfp/nfp_ethdev_vf.c | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 8057452799..c4a36027b9 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -21,6 +21,8 @@ #include "nfp_ipsec.h" #include "nfp_logs.h" +#define NFP_PF_DRIVER_NAME net_nfp_pf + static void nfp_net_pf_read_mac(struct nfp_app_fw_nic *app_fw_nic, uint16_t port) @@ -1233,6 +1235,6 @@ static struct rte_pci_driver rte_nfp_net_pf_pmd = { .remove = eth_nfp_pci_remove, }; -RTE_PMD_REGISTER_PCI(net_nfp_pf, rte_nfp_net_pf_pmd); -RTE_PMD_REGISTER_PCI_TABLE(net_nfp_pf, pci_id_nfp_pf_net_map); -RTE_PMD_REGISTER_KMOD_DEP(net_nfp_pf, "* igb_uio | uio_pci_generic | vfio"); +RTE_PMD_REGISTER_PCI(NFP_PF_DRIVER_NAME, rte_nfp_net_pf_pmd); +RTE_PMD_REGISTER_PCI_TABLE(NFP_PF_DRIVER_NAME, pci_id_nfp_pf_net_map); +RTE_PMD_REGISTER_KMOD_DEP(NFP_PF_DRIVER_NAME, "* igb_uio | uio_pci_generic | vfio"); diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index cb8a37bce7..d0834ccb3e 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -15,6 +15,8 @@ #include "nfp_logs.h" #include "nfp_net_common.h" +#define NFP_VF_DRIVER_NAME net_nfp_vf + static int nfp_netvf_start(struct rte_eth_dev *dev) { @@ -416,5 +418,5 @@ RTE_INIT(rte_nfp_vf_pmd_init) nfp_class_driver_register(&rte_nfp_net_vf_pmd); } -RTE_PMD_REGISTER_PCI_TABLE(net_nfp_vf, pci_id_nfp_vf_net_map); -RTE_PMD_REGISTER_KMOD_DEP(net_nfp_vf, "* igb_uio | uio_pci_generic | vfio"); +RTE_PMD_REGISTER_PCI_TABLE(NFP_VF_DRIVER_NAME, pci_id_nfp_vf_net_map); +RTE_PMD_REGISTER_KMOD_DEP(NFP_VF_DRIVER_NAME, "* igb_uio | uio_pci_generic | vfio"); From patchwork Sat Oct 28 06:53:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133565 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 8502943220; Sat, 28 Oct 2023 08:54:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BA96442D87; Sat, 28 Oct 2023 08:54:07 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2102.outbound.protection.outlook.com [40.107.101.102]) by mails.dpdk.org (Postfix) with ESMTP id E41B642D6B for ; Sat, 28 Oct 2023 08:54:05 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KNxDf9CF+pFOWuL1zdlTKku/GLP1hHjb1zCEGV4vK8XZu+GZ9iofbLygMWN/iuHQMtXQFy31QMcV8QGwCd6x9Iijmm2uhXNEEeI4wQmq40jtlv5nI8DTgMg/2uYsK47GB+whwMZccguYDIP9mVdlIFUUEhD7H4yFmUZtXPmFFRrerbCw3aP+u6ThH8pqR0uQt6NrSZwt9rB0KSrg0iaD6ydym1dfwEI2OGrTlnNEiyQfEO/R1rqApGTcDqVcywq9JikvY97KVtqylNiiSZFIzHUv3Y34AVOg5zKtoeZvf7izAH8R47yO3c2gLXX5m0t27DEyJOCJPkL1uTd3eGFsNA== 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=2e51H7JoQoEzlMRoT5HsIny0WqMvE6GB9BdW0jP3Ns0=; b=bDfEMbfuMBE6h63k14UlrDLYDKie24ByN+h4D2DrfvnckQrG6+fFCPpL7hYyfn/gesbWq2p3b5Xb984hxjWJWc/lQAAaJaztItnjKWB5UsdD9jaCMdfJaqLsbjdMOsw3MW73UNpSNx11+IxR66jLf7znsQYnJjlQAzIWFTYWvhPxnrdqU3uuu6eH1GfYRQFQLGNWUxQ/B1lY7ms17qEbEd7fJRKKOFg9H7I52W8NQrWFOKrl7aXc3Apff7ls2kQ4O3mTzC/9cm1ILcDj+BZACj0v4YewcqxMEeZ7UNoyk1Zi6QPfHzlMXmm8JzuE0D3APZouLviXidNiCn1Wkzo2yA== 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=2e51H7JoQoEzlMRoT5HsIny0WqMvE6GB9BdW0jP3Ns0=; b=mHugcdFvYr6WS3kMNLiH8BFs8gidrM6atyfaqgSu8QKhPq6W+VedVMrun4iijZVl/FYaWplfTiY4994YJYePGFtIH6IVLxsLriiNa4xEJoSICyymxGYVmpONVs11KKjxKUXcNnLpo9sutJfDlvuV2L94lbi6zwqVS6oTTIpBWAk= 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 SA1PR13MB6055.namprd13.prod.outlook.com (2603:10b6:806:338::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19; Sat, 28 Oct 2023 06:54:04 +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; Sat, 28 Oct 2023 06:54:04 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH v2 10/11] net/nfp: extract a helper function Date: Sat, 28 Oct 2023 14:53:14 +0800 Message-Id: <20231028065315.1937188-11-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028065315.1937188-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> <20231028065315.1937188-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SA0PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:d3::25) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB6055:EE_ X-MS-Office365-Filtering-Correlation-Id: 45b64c5b-0ffd-486a-96ae-08dbd782ac20 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3SWlv5nYJsJr8u9p7H+WN0Ij8ZFlkcOzzhhgQfnnCGn2fZigLYIAKHXsQRroSGWn3WUxsOqeQMTXFxgaTNlnXVlxzyyDQ93fQ0QLuy08AGFdAc24dRCAQGh49ReZ3N4lWAe9EGmLEYvhFIKYTPjusQMhHs+H7KLUJ5LzRvkjZlK4+glaLUwVAPdh7RW6TwkpAW3L11fxxTPYLcNAQxL+JLd741nGs0AAJONE2kXRFxKBAB6r7i83u5uvuAcIZXfqAs8U6cA/E2ty1fzUd9Otlur/1l4zAG7g2XVCjLGaCrCjyjXyPMu1/W3WyVCXg0P8XtdBE1VNhYjlGOYGfQdFsQElrd324F/e5e/Um5NpbIi6g4s1s3GwF0s2r74OPTyZlPznxdWK2QRw6X7LFqPF4MCdZChLxAEFb+H12f/yHbRhj9fgKs/eFCxr5r0Zal5PG5/BImdUXf064Wucmrxn1Gmkr0QZCTIKcEdqEzucJJvIQuV9ep+iBPhS7NwabH72OcYJzoznRI5wHTbLTrcxvTrEbcv0NibpdUXQfdlypbbazoXUisz3Gk0Pz8UYI7pH1wT5GiT8H+eaj1WyxbJP8AXYRC936CYTTDnOpDDrdsPvtNSOCNdgiGpP8qarH1A8bdszBCwtCWtMIRfk6+R9FzwhRyC0vlyze2R9g8Kt1kQ= 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)(136003)(396003)(366004)(39830400003)(376002)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(6486002)(8676002)(30864003)(8936002)(478600001)(6666004)(54906003)(66476007)(66946007)(66556008)(86362001)(4326008)(41300700001)(5660300002)(6916009)(2906002)(44832011)(316002)(6506007)(52116002)(38100700002)(36756003)(2616005)(1076003)(107886003)(6512007)(26005)(38350700005)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ty9VVfEqfXQRWhZtSj5EOOZknGIwlF+2NNcaf4njFZEhSWOimtR6ku1XEBYiN+bZ4G0kloucLQDf0sN5GJwM1PkAT5S2Bycl/mricVNvE6Abi25xxkW6ApF2suDKL5xUL7X03icX3qYJS91SQp04VVuBCYmjr3tW3R+ZpdcrCnt4D60EpZT+aZcSsKK+dGMs/NSeqLTXKUnB8rbTsZJz09UwjjqBSDsbHXyY6RKw8GTBH+6Fknyr+AnwJHS71YOfHXWOSQU68xjl03qshMmQ0XDlB904TpR4T+GIxELBLcDToq/b5e65EUMQr7lpWYE++wHWV2vkPKX8c9IzLzFRpSAO425zGFHlv61YCZyfjCZS1tDzDon9QoqR1AkRfqnfbGmgMbNHm1s5wbHzeoj88EQ/4YXADAfx1GELbpWFEf/6BExZm4tVDR+hrgue14QvMwGe1Fga3dIXij/nZ8Omny7Gc5rGKqRt2QvPpuI2FvAMNolIwnDBKh/MZ2pRFoD6fqRHa7OYZuLNdfBYigORTJtjhblj5q8pR2/0P5UvdbopGwgz93c44hlKEsRuAKPd1mNTKMVdSFFi8xHyIKl3pZNTUXvpZNBspQsomSN/SMAwGU28i0lT7MiY+ALAJR9RxNYdzi0AnJjSACWSJQrf9apjYB26hg56Wq4KrXPcSdys7UboJ+iioviC2e8W8KQdHP5K6W3XGB35fXJFgEhkIlG4Xq51rckgJm3gozO0Sro6Geg0iyG7Uyd/ZdkieEHaqGqmMutJKZ4KJqG7gVMzTps+ZzwUOFaEIjyV1cvR8Ltt6QV2GUyOkuWzhNrXvzbx+8aL2uEdrGtaxXDIoEcrei1HrspNZu0no1V1yITtLFkuPoMTltvJ6lLdx7xCuLitjEqUbo5/5nbwOz5frm/RAWdqvmhuQjkU2vDGQ8ZtuPhRZ+rX+hvIhQliu8DgcOSI+byuoL7XbvvwJ8bIF8Ex5uO4bKzRxFue2tD5vU+hhehtgzmTRKICL2lKn5BQgaX/Dpno1lHz2c1jYayUVr/1v2lfMtUB9P5oPj5FIZkmV3JL9D8IByLT53lVUb7WWaKDogxzDeEAFbTwWiDeWPhTAfoFuIPsFApnDOy1n+RILODRzCI4WAYDRkYsiRUQVBnLDfps8yIGot4a/LIsvkQ52STertTvI+Bhtd6jWBTynJyxh/Dk6TiErTajVx33IX+tUKH0L+4SIwopVNJFK8qg7dTw2fR/C4sFr9TQkbghvrv4EPPNtpo8TQkbfjMD5KzoBrWTSj5WzD7oJBCme/2U+ostIRJ9t5jdXLJOS4RhKlQeebsbgp6uMK0rHW2ux8ISfnfBmFHZwLRGTG4/PkuNavKrCJSN3+2Olzt+6sHDES3APW6+k99shHfI88AUUd0IgUvrQI0yWtPA4dseWU6cF4eFVc7J+PPTms8QcT2g+M+Vmm1KQ5cnP6cldeyePV0TmzKQWij/B6rv1HoR0ymwZiqo2jMR8WbilfK65r8AxWBseiW4ReYoX/lKP6WpJ/A0U8OsZOOVlwTNp1VUpEkkUOyHiTsFx5qCYCe0K/S5RR446abT8BWjxNcYJ4+TSinKYk1mHcFlCYwUtVIZld2p+g== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45b64c5b-0ffd-486a-96ae-08dbd782ac20 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2023 06:54:04.0356 (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: 8eMYNgnzhQ/d0tC5XSU4049f9lhUS+i+MF0lvbKmojx6AySuwjJZxj0Xwb1Yo62y/yEHz1e+TcEqW7hcJvN6w6zNErRqx+qDbAfB8lrcoNo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB6055 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 a helper function to get the pointer of 'struct nfp_net_hw' for both normal port and representor pot, this will make the operation function can be used for both type port. Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower.c | 64 ++----------------------- drivers/net/nfp/nfp_net_common.c | 74 ++++++++++++++++------------- drivers/net/nfp/nfp_net_common.h | 1 + 3 files changed, 47 insertions(+), 92 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 246dd2d454..0727e7fd9f 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -21,62 +21,6 @@ #define CTRL_VNIC_NB_DESC 512 -static void -nfp_pf_repr_enable_queues(struct rte_eth_dev *dev) -{ - uint16_t i; - struct nfp_hw *hw; - uint64_t enabled_queues = 0; - struct nfp_flower_representor *repr; - - repr = dev->data->dev_private; - hw = &repr->app_fw_flower->pf_hw->super; - - /* Enabling the required TX queues in the device */ - for (i = 0; i < dev->data->nb_tx_queues; i++) - enabled_queues |= (1 << i); - - nn_cfg_writeq(hw, NFP_NET_CFG_TXRS_ENABLE, enabled_queues); - - enabled_queues = 0; - - /* Enabling the required RX queues in the device */ - for (i = 0; i < dev->data->nb_rx_queues; i++) - enabled_queues |= (1 << i); - - nn_cfg_writeq(hw, NFP_NET_CFG_RXRS_ENABLE, enabled_queues); -} - -static void -nfp_pf_repr_disable_queues(struct rte_eth_dev *dev) -{ - uint32_t update; - uint32_t new_ctrl; - struct nfp_hw *hw; - struct nfp_net_hw *net_hw; - struct nfp_flower_representor *repr; - - repr = dev->data->dev_private; - net_hw = repr->app_fw_flower->pf_hw; - hw = &net_hw->super; - - nn_cfg_writeq(hw, NFP_NET_CFG_TXRS_ENABLE, 0); - nn_cfg_writeq(hw, NFP_NET_CFG_RXRS_ENABLE, 0); - - new_ctrl = hw->ctrl & ~NFP_NET_CFG_CTRL_ENABLE; - update = NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING | - NFP_NET_CFG_UPDATE_MSIX; - - if (hw->cap & NFP_NET_CFG_CTRL_RINGCFG) - new_ctrl &= ~NFP_NET_CFG_CTRL_RINGCFG; - - /* If an error when reconfig we avoid to change hw state */ - if (nfp_reconfig(hw, new_ctrl, update) < 0) - return; - - hw->ctrl = new_ctrl; -} - int nfp_flower_pf_start(struct rte_eth_dev *dev) { @@ -93,10 +37,10 @@ nfp_flower_pf_start(struct rte_eth_dev *dev) hw = &net_hw->super; /* Disabling queues just in case... */ - nfp_pf_repr_disable_queues(dev); + nfp_net_disable_queues(dev); /* Enabling the required queues in the device */ - nfp_pf_repr_enable_queues(dev); + nfp_net_enable_queues(dev); new_ctrl = nfp_check_offloads(dev); @@ -157,7 +101,7 @@ nfp_flower_pf_stop(struct rte_eth_dev *dev) repr = dev->data->dev_private; hw = repr->app_fw_flower->pf_hw; - nfp_pf_repr_disable_queues(dev); + nfp_net_disable_queues(dev); /* Clear queues */ for (i = 0; i < dev->data->nb_tx_queues; i++) { @@ -207,7 +151,7 @@ nfp_flower_pf_close(struct rte_eth_dev *dev) * We assume that the DPDK application is stopping all the * threads/queues before calling the device close function. */ - nfp_pf_repr_disable_queues(dev); + nfp_net_disable_queues(dev); /* Clear queues */ for (i = 0; i < dev->data->nb_tx_queues; i++) { diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index d43a071a42..1be0d7d060 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -233,6 +233,22 @@ nfp_net_mbox_reconfig(struct nfp_net_hw *net_hw, return nn_cfg_readl(&net_hw->super, mbox + NFP_NET_CFG_MBOX_SIMPLE_RET); } +struct nfp_net_hw * +nfp_net_get_hw(const struct rte_eth_dev *dev) +{ + struct nfp_net_hw *hw; + + if ((dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) != 0) { + struct nfp_flower_representor *repr; + repr = dev->data->dev_private; + hw = repr->app_fw_flower->pf_hw; + } else { + hw = dev->data->dev_private; + } + + return hw; +} + /* * Configure an Ethernet device. * @@ -252,7 +268,7 @@ nfp_net_configure(struct rte_eth_dev *dev) struct rte_eth_rxmode *rxmode; struct rte_eth_txmode *txmode; - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); dev_conf = &dev->data->dev_conf; rxmode = &dev_conf->rxmode; txmode = &dev_conf->txmode; @@ -329,7 +345,7 @@ nfp_net_enable_queues(struct rte_eth_dev *dev) { struct nfp_net_hw *hw; - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); nfp_enable_queues(&hw->super, dev->data->nb_rx_queues, dev->data->nb_tx_queues); @@ -340,7 +356,7 @@ nfp_net_disable_queues(struct rte_eth_dev *dev) { struct nfp_net_hw *net_hw; - net_hw = dev->data->dev_private; + net_hw = nfp_net_get_hw(dev); nfp_disable_queues(&net_hw->super); } @@ -367,7 +383,7 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev, struct nfp_hw *hw; struct nfp_net_hw *net_hw; - net_hw = dev->data->dev_private; + net_hw = nfp_net_get_hw(dev); hw = &net_hw->super; if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 && (hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0) { @@ -407,7 +423,7 @@ nfp_configure_rx_interrupt(struct rte_eth_dev *dev, return -ENOMEM; } - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); if (rte_intr_type_get(intr_handle) == RTE_INTR_HANDLE_UIO) { PMD_DRV_LOG(INFO, "VF: enabling RX interrupt with UIO"); @@ -443,7 +459,7 @@ nfp_check_offloads(struct rte_eth_dev *dev) struct nfp_net_hw *hw; struct rte_eth_conf *dev_conf; - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); cap = hw->super.cap; dev_conf = &dev->data->dev_conf; @@ -510,14 +526,8 @@ nfp_net_promisc_enable(struct rte_eth_dev *dev) uint32_t new_ctrl; struct nfp_hw *hw; struct nfp_net_hw *net_hw; - struct nfp_flower_representor *repr; - if ((dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) != 0) { - repr = dev->data->dev_private; - net_hw = repr->app_fw_flower->pf_hw; - } else { - net_hw = dev->data->dev_private; - } + net_hw = nfp_net_get_hw(dev); hw = &net_hw->super; if ((hw->cap & NFP_NET_CFG_CTRL_PROMISC) == 0) { @@ -551,7 +561,7 @@ nfp_net_promisc_disable(struct rte_eth_dev *dev) struct nfp_hw *hw; struct nfp_net_hw *net_hw; - net_hw = dev->data->dev_private; + net_hw = nfp_net_get_hw(dev); hw = &net_hw->super; if ((hw->ctrl & NFP_NET_CFG_CTRL_PROMISC) == 0) { @@ -588,7 +598,7 @@ nfp_net_link_update(struct rte_eth_dev *dev, struct rte_eth_link link; struct nfp_eth_table *nfp_eth_table; - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); memset(&link, 0, sizeof(struct rte_eth_link)); @@ -654,7 +664,7 @@ nfp_net_stats_get(struct rte_eth_dev *dev, if (stats == NULL) return -EINVAL; - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); memset(&nfp_dev_stats, 0, sizeof(nfp_dev_stats)); @@ -732,7 +742,7 @@ nfp_net_stats_reset(struct rte_eth_dev *dev) uint16_t i; struct nfp_net_hw *hw; - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); /* Reading per RX ring stats */ for (i = 0; i < dev->data->nb_rx_queues; i++) { @@ -794,7 +804,7 @@ nfp_net_xstats_size(const struct rte_eth_dev *dev) const uint32_t size = RTE_DIM(nfp_net_xstats); /* If the device is a VF, then there will be no MAC stats */ - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); if (hw->mac_stats == NULL) { for (count = 0; count < size; count++) { if (nfp_net_xstats[count].group == NFP_XSTAT_GROUP_MAC) @@ -828,7 +838,7 @@ nfp_net_xstats_value(const struct rte_eth_dev *dev, struct nfp_net_hw *hw; struct nfp_xstat xstat; - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); xstat = nfp_net_xstats[index]; if (xstat.group == NFP_XSTAT_GROUP_MAC) @@ -967,7 +977,7 @@ nfp_net_xstats_reset(struct rte_eth_dev *dev) uint32_t read_size; struct nfp_net_hw *hw; - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); read_size = nfp_net_xstats_size(dev); for (id = 0; id < read_size; id++) { @@ -1015,7 +1025,7 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) uint16_t max_tx_desc; struct nfp_net_hw *hw; - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); nfp_net_rx_desc_limits(hw, &min_rx_desc, &max_rx_desc); nfp_net_tx_desc_limits(hw, &min_tx_desc, &max_tx_desc); @@ -1242,7 +1252,7 @@ nfp_rx_queue_intr_enable(struct rte_eth_dev *dev, /* Make sure all updates are written before un-masking */ rte_wmb(); - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); nn_cfg_writeb(&hw->super, NFP_NET_CFG_ICR(base + queue_id), NFP_NET_CFG_ICR_UNMASKED); return 0; @@ -1263,7 +1273,7 @@ nfp_rx_queue_intr_disable(struct rte_eth_dev *dev, /* Make sure all updates are written before un-masking */ rte_wmb(); - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); nn_cfg_writeb(&hw->super, NFP_NET_CFG_ICR(base + queue_id), NFP_NET_CFG_ICR_RXTX); return 0; @@ -1301,7 +1311,7 @@ nfp_net_irq_unmask(struct rte_eth_dev *dev) struct nfp_net_hw *hw; struct rte_pci_device *pci_dev; - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); pci_dev = RTE_ETH_DEV_TO_PCI(dev); /* Make sure all updates are written before un-masking */ @@ -1376,7 +1386,7 @@ nfp_net_dev_mtu_set(struct rte_eth_dev *dev, { struct nfp_net_hw *hw; - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); /* MTU setting is forbidden if port is started */ if (dev->data->dev_started) { @@ -1412,7 +1422,7 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev, struct nfp_net_hw *net_hw; uint32_t rxvlan_ctrl = 0; - net_hw = dev->data->dev_private; + net_hw = nfp_net_get_hw(dev); hw = &net_hw->super; rx_offload = dev->data->dev_conf.rxmode.offloads; new_ctrl = hw->ctrl; @@ -1462,7 +1472,7 @@ nfp_net_rss_reta_write(struct rte_eth_dev *dev, struct nfp_hw *hw; struct nfp_net_hw *net_hw; - net_hw = dev->data->dev_private; + net_hw = nfp_net_get_hw(dev); hw = &net_hw->super; if (reta_size != NFP_NET_CFG_RSS_ITBL_SZ) { @@ -1518,7 +1528,7 @@ nfp_net_reta_update(struct rte_eth_dev *dev, struct nfp_hw *hw; struct nfp_net_hw *net_hw; - net_hw = dev->data->dev_private; + net_hw = nfp_net_get_hw(dev); hw = &net_hw->super; if ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0) @@ -1551,7 +1561,7 @@ nfp_net_reta_query(struct rte_eth_dev *dev, struct nfp_hw *hw; struct nfp_net_hw *net_hw; - net_hw = dev->data->dev_private; + net_hw = nfp_net_get_hw(dev); hw = &net_hw->super; if ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0) @@ -1601,7 +1611,7 @@ nfp_net_rss_hash_write(struct rte_eth_dev *dev, struct nfp_net_hw *net_hw; uint32_t cfg_rss_ctrl = 0; - net_hw = dev->data->dev_private; + net_hw = nfp_net_get_hw(dev); hw = &net_hw->super; /* Writing the key byte by byte */ @@ -1657,7 +1667,7 @@ nfp_net_rss_hash_update(struct rte_eth_dev *dev, struct nfp_hw *hw; struct nfp_net_hw *net_hw; - net_hw = dev->data->dev_private; + net_hw = nfp_net_get_hw(dev); hw = &net_hw->super; rss_hf = rss_conf->rss_hf; @@ -1698,7 +1708,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, uint32_t cfg_rss_ctrl; struct nfp_net_hw *net_hw; - net_hw = dev->data->dev_private; + net_hw = nfp_net_get_hw(dev); hw = &net_hw->super; if ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0) diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index 829e9c5333..e242251bc2 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -237,6 +237,7 @@ void nfp_net_cfg_read_version(struct nfp_net_hw *hw); int nfp_net_firmware_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size); int nfp_repr_firmware_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size); bool nfp_net_is_valid_nfd_version(struct nfp_net_fw_ver version); +struct nfp_net_hw *nfp_net_get_hw(const struct rte_eth_dev *dev); #define NFP_PRIV_TO_APP_FW_NIC(app_fw_priv)\ ((struct nfp_app_fw_nic *)app_fw_priv) From patchwork Sat Oct 28 06:53:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133566 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 661F543220; Sat, 28 Oct 2023 08:54:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3506042DCB; Sat, 28 Oct 2023 08:54:10 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2097.outbound.protection.outlook.com [40.107.223.97]) by mails.dpdk.org (Postfix) with ESMTP id 8F0E9427D7 for ; Sat, 28 Oct 2023 08:54:08 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=edvOVIACUSpqT/E+qsy5GxPUmtSkxzVEnUajbIdTTk2iO7jcwdD2GFKTA6Gx+ZX9NYd5OGIOYWzABQTrG3udkJRiS5JfyQvLcNE7/mTwPgy9vNPrtbXrI++jx1jJxkPXMGjYCuvtVZW5vqawb88RkP4bu94hD+Llab6fS0rbr9u9kfO9VgaSJ5NVPYQjgXmBHinVqJ5AEmaJxz8D/YK/4iy5t4FA762oXPOj/dzPEGP2DT+6s/4M0TsF2TnZukHKNdJvgrbjZ4W3rd/UiE+8qEzINKMsFqMfXSvmxgXggRBnRQoE3WQmA+JrCf4m8ePY+PmveRb30/NBhRcJ8p3dFQ== 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=nWyV7bqPllBDAbKZk1duPwT0Q9UjyD0xUP2b8+AeKUs=; b=k7pO4HPpSVBiGIu1cIQSThOYbx9XI28L+CaV72tkR33O4CEcANjtGptBlH0eu7dmak1sf6r5yOw8pbKmzlUbwVe+jOf4aYKpWhJu7kGaPb1Mh3+BJvPTyZwtB8c2vHsbpKjZFWePlkhtyVI+OCVgyFR+Lo0bxJdFNPGuuscZFhuyi0JbXFwaO/LolZQFNxscyLK3e2c6MKQU8Ukg7HSrzGyK5yq8OY1L8HR2IDisINdYxINwHO/vspqm0D6Av+bSweaTC6W4ok2sVvPmAyYwW+wM3dMhq07Y3Vl8we554U+8W80qjClXKV5eTUUrxgo7jCt5+4dymTyCSgGVCYqzEA== 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=nWyV7bqPllBDAbKZk1duPwT0Q9UjyD0xUP2b8+AeKUs=; b=uYacWZRC4eBebNt2gOPDB7w61vcYt565RXPaePIsmMsi9hQzEoYKGxMm6+1KxSHfrTmoYoij3EQtZYRz80kysGxFvbZazH4KpJOWKFiqcVgibEDavywRNQutEvjj+zXCypTcE+jDohzVIS6sDaLwcGLwXzDLh/fsv6Vh+KeVK9M= 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 SA1PR13MB6055.namprd13.prod.outlook.com (2603:10b6:806:338::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19; Sat, 28 Oct 2023 06:54:06 +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; Sat, 28 Oct 2023 06:54:06 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH v2 11/11] net/nfp: remove the redundancy logic of representor port Date: Sat, 28 Oct 2023 14:53:15 +0800 Message-Id: <20231028065315.1937188-12-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028065315.1937188-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> <20231028065315.1937188-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SA0PR11CA0020.namprd11.prod.outlook.com (2603:10b6:806:d3::25) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB6055:EE_ X-MS-Office365-Filtering-Correlation-Id: b8758521-71ff-4c42-37ef-08dbd782ad86 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tHlq3k7UbCps/nkrDkzYw4n6YYBEjZNyT2zr2ED/L5YodEI13Q3Etp8RAu2pxplrla4kl2DnHYqSMtH8oOh6qlifxUionTR0W1rd3zxLrQIfskYoBRAFWizsq4A63v5l5s1cMk6Ow2Va6HEcR/jhpScVzydGhudLZCX1xJHoMsj7JwC2+zdDNZWyOcS36Walo2qkmhA3J36Lhf01xyEa8AmYGauGTMAEyK6IEBV3NJTFzFQbVhEkZJnTcVN3mJDwYmsObFInE0sxjr6AgfByzMrGxY3Kvh3BYaVoQfucZV2UqdsHSlylB4DPxZkWp+nhl6TXMRc0h58c09LxAmeuJO+Op3BqwsIt83t5jlPNSazasPEibwpOPh86YvsLFckNt9DXmoKFE6C70O69qGYJ0NAZVMg4TkqnSrN4ZTkBGoSw3dwQmbDBYKPJjKiSpsSy07DqyyctBDj5Rd9sU0Clolo5B6irAUPm0VbqT1yGZ59hnxkgzhlfOVDOFR1zywv0vtkkgbun76ggjmTq0o306fPZMvZbs0Cy12zJkKbbEJ1PVebdFDB1j0gfYLxV0tympMjqNR1hyp0NqDOmGZdcwgxOqpUFxcbtpxf1BwS+dTKcS0/ezu/hyz5QKgMf6Jqb8YmZjGQuVRY0pafvoL7We7VBtP5ypEKBuN+6726Mn0Q= 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)(136003)(396003)(366004)(39830400003)(376002)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(6486002)(8676002)(30864003)(8936002)(478600001)(6666004)(54906003)(66476007)(66946007)(66556008)(86362001)(4326008)(41300700001)(5660300002)(6916009)(2906002)(44832011)(316002)(6506007)(52116002)(38100700002)(36756003)(2616005)(1076003)(107886003)(6512007)(26005)(38350700005)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZMdKIYJnz8XzQVz0baFqwVPIqpWViYE0S+AMj7SC73ngIcvvQAsjCqDVYPazS27zH1OKYNKNA1JpuCKJB8Nhg/M3QfldfQ1yvn/3RMz+rBKmiR3ifRI+i9Sz6eu6gGus2ZS06kF1mw7SyhziDgFFnZyiradP/kytUhwHQSQdp3lLuyIcTEBppzDepZdqb7kNI1dVHpf04BRSElM9sSsVbG1W2F8zpIWksOIE2Bq0S9q3BaDirIb0Ytk53qIK42i8WGtWqSigw5OlaynVSVVKYaUgHLkkXBPdbuAMISPoIPzVTR8dSVkpabAXB1MFxjrVwVhH/Wrh9X0qJzZBA58n3mySmeP5R/gN3EUytGb3sj5SWnq0TYcwmMkw+J2VXvvgYNieVFP9DtGjexvgYzl5tIBZn+xsDlSBW9f/+DO0icQD9t+SLOT7WsQB7GeqAKKVuGLoQ/TIR0uooOdrat3JWvkhzzNNmEv3ks8QZBAFcHwMYPgqrYRHtlD+0xUtWs3kx9454sd6FkOLcYHnOrQgi4SDGhtm5wpAsMqwmKZh3za6DuiRcCauiJ1/4G2ok73nSKt7609OR+hqkxYJYhnWMWEtyWoxUu0A3bpwxyOLS1np3zDDKH8syStzBdrCp6sVsbKZcmpZU6I/N+Ofp5kdgPp/c8SL70errvKUdTqKbBPhZJ7InMxdLao1lh+JJw8aHBPsuAdrR4JQhxBbLY/R3NVexlTYl3GA8SAgojnNtW/Dk6gTFY17TB7Dfr9B1BDq25MnhsDQGyPRzhK6JxN8joe0ZwNjLE+EfxlqPum0QfrOTLDwxaUw8F5z4NrzwZeTjJe2cpAZhoMQBpt4jYMDaDuRooTxaHTBF6zgXqblLfwYbHzeCxfZeKBkCa8ssDQkz1Ca+iXFF0yP38us4coNn58qJ+s/kug+UZamuE6MC9QzdYauYhQ9vOGA+PnVuAMG/zfagb6qLn6Y0zJPpU5X2V4p9N45rpAZf+SSvv3m4f+9ruIzWkOqJ3yf86lN18JUcQOT6peIaar9WKvREwr2uSqy/OZYsRaeK04mMIDIL9VU/79G8UdVMgroWLo3hy7uZ1IcxJNzwMi3XMATdmwDh2YW17mYw3ngIczcWwlIeyFFZx3OXjNusCrzvkHQv+KyT6+d3zqJizNM/pm7r785TRHJzV77oXFZDyASSlyIjO2RiD/Ig6FZRY+xp5taMZ4QX/4sj86yp81GhdEd7ZrwpSeklDVbwZLN2zpAoP6vjekKrT/R0wRtdQbgp+3GbKolXB3sWl8R0L4dmgqKljypmrYGaFkMbObH6O2Jc7mS0T2Dl+f9RN4vpeDcU43rmp7kSYL6ZCYqm7olQLqFnaZ7fTuVskr0bxP4HIcU9+ssURDaCyWBuI8RsVbMrjeY0+DIiuURt3ok0LaWulXLkXzu6Z6UN+UiITeJdRM04dAI9+8vj5GQzYyljFSCzfqnxwOJAl+RQLy9tC7uvyhM7zG3Wm32sTURPnk8dxd1iNXlA9fHEgItlxgNcs6uoGu3ymMyUuS8O0nDUI72/rWmd8x26QyVSWkzBPEeHUjh2FYs39K6JoVCharMb/VjljpdqPSHpdrWCUDHu85UQJQDu1IqPw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b8758521-71ff-4c42-37ef-08dbd782ad86 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2023 06:54:06.3198 (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: NwvJGKdcBoFFihKwPhQP+Z61TcamKPLu6ASEE7a38gV0/t4Ttzb67MgRyuQ1otktUCZ9HSJe+LVAoeu+P4qQwC1zH/3XkNdYND0hAxbkaHI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB6055 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 Using the helper function, we can remove some redundancy logic of representor port by reusing the functions in common module. Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower.c | 47 +--- drivers/net/nfp/flower/nfp_flower.h | 1 - .../net/nfp/flower/nfp_flower_representor.c | 253 +----------------- drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 2 +- drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 2 +- drivers/net/nfp/nfp_ethdev.c | 28 +- drivers/net/nfp/nfp_net_common.c | 127 +++++---- drivers/net/nfp/nfp_net_common.h | 6 +- drivers/net/nfp/nfp_rxtx.c | 4 +- 9 files changed, 93 insertions(+), 377 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 0727e7fd9f..f2e6eb6a6f 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -48,11 +48,7 @@ nfp_flower_pf_start(struct rte_eth_dev *dev) nfp_net_params_setup(net_hw); update |= NFP_NET_CFG_UPDATE_RSS; - - if ((hw->cap & NFP_NET_CFG_CTRL_RSS2) != 0) - new_ctrl |= NFP_NET_CFG_CTRL_RSS2; - else - new_ctrl |= NFP_NET_CFG_CTRL_RSS; + new_ctrl |= nfp_net_cfg_ctrl_rss(hw->cap); /* Enable device */ new_ctrl |= NFP_NET_CFG_CTRL_ENABLE; @@ -62,8 +58,6 @@ nfp_flower_pf_start(struct rte_eth_dev *dev) if ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0) new_ctrl |= NFP_NET_CFG_CTRL_RINGCFG; - nn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl); - /* If an error when reconfig we avoid to change hw state */ ret = nfp_reconfig(hw, new_ctrl, update); if (ret != 0) { @@ -88,43 +82,6 @@ nfp_flower_pf_start(struct rte_eth_dev *dev) return 0; } -/* Stop device: disable rx and tx functions to allow for reconfiguring. */ -int -nfp_flower_pf_stop(struct rte_eth_dev *dev) -{ - uint16_t i; - struct nfp_net_hw *hw; - struct nfp_net_txq *this_tx_q; - struct nfp_net_rxq *this_rx_q; - struct nfp_flower_representor *repr; - - repr = dev->data->dev_private; - hw = repr->app_fw_flower->pf_hw; - - nfp_net_disable_queues(dev); - - /* Clear queues */ - for (i = 0; i < dev->data->nb_tx_queues; i++) { - this_tx_q = dev->data->tx_queues[i]; - nfp_net_reset_tx_queue(this_tx_q); - dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; - } - - for (i = 0; i < dev->data->nb_rx_queues; i++) { - this_rx_q = dev->data->rx_queues[i]; - nfp_net_reset_rx_queue(this_rx_q); - dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; - } - - if (rte_eal_process_type() == RTE_PROC_PRIMARY) - /* Configure the physical port down */ - nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0); - else - nfp_eth_set_configured(dev->process_private, hw->nfp_idx, 0); - - return 0; -} - /* Reset and stop device. The device can not be restarted. */ static int nfp_flower_pf_close(struct rte_eth_dev *dev) @@ -188,7 +145,7 @@ static const struct eth_dev_ops nfp_flower_pf_vnic_ops = { .dev_configure = nfp_net_configure, .dev_start = nfp_flower_pf_start, - .dev_stop = nfp_flower_pf_stop, + .dev_stop = nfp_net_stop, .dev_close = nfp_flower_pf_close, }; diff --git a/drivers/net/nfp/flower/nfp_flower.h b/drivers/net/nfp/flower/nfp_flower.h index a989c4a8b8..220b714018 100644 --- a/drivers/net/nfp/flower/nfp_flower.h +++ b/drivers/net/nfp/flower/nfp_flower.h @@ -113,7 +113,6 @@ bool nfp_flower_pf_dispatch_pkts(struct nfp_net_hw *hw, uint16_t nfp_flower_pf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); int nfp_flower_pf_start(struct rte_eth_dev *dev); -int nfp_flower_pf_stop(struct rte_eth_dev *dev); uint32_t nfp_flower_pkt_add_metadata(struct nfp_app_fw_flower *app_fw_flower, struct rte_mbuf *mbuf, uint32_t port_id); diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index b52c6f514a..0f0e63aae0 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -18,232 +18,23 @@ enum nfp_repr_type { NFP_REPR_TYPE_MAX, /*<< Number of representor types */ }; -static int -nfp_pf_repr_rx_queue_setup(struct rte_eth_dev *dev, - uint16_t queue_idx, - uint16_t nb_desc, - unsigned int socket_id, - const struct rte_eth_rxconf *rx_conf, - struct rte_mempool *mp) -{ - struct nfp_net_hw *hw; - struct nfp_net_rxq *rxq; - const struct rte_memzone *tz; - struct nfp_flower_representor *repr; - - repr = dev->data->dev_private; - hw = repr->app_fw_flower->pf_hw; - - /* Allocating rx queue data structure */ - rxq = rte_zmalloc_socket("ethdev RX queue", sizeof(struct nfp_net_rxq), - RTE_CACHE_LINE_SIZE, socket_id); - if (rxq == NULL) - return -ENOMEM; - - dev->data->rx_queues[queue_idx] = rxq; - - /* Hw queues mapping based on firmware configuration */ - rxq->qidx = queue_idx; - rxq->fl_qcidx = queue_idx * hw->stride_rx; - rxq->qcp_fl = hw->rx_bar + NFP_QCP_QUEUE_OFF(rxq->fl_qcidx); - - /* - * Tracking mbuf size for detecting a potential mbuf overflow due to - * RX offset. - */ - rxq->mem_pool = mp; - rxq->mbuf_size = rxq->mem_pool->elt_size; - rxq->mbuf_size -= (sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM); - hw->flbufsz = rxq->mbuf_size; - - rxq->rx_count = nb_desc; - rxq->port_id = dev->data->port_id; - rxq->rx_free_thresh = rx_conf->rx_free_thresh; - - /* - * Allocate RX ring hardware descriptors. A memzone large enough to - * handle the maximum ring size is allocated in order to allow for - * resizing in later calls to the queue setup function. - */ - tz = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_idx, - sizeof(struct nfp_net_rx_desc) * - hw->dev_info->max_qc_size, - NFP_MEMZONE_ALIGN, socket_id); - if (tz == NULL) { - PMD_DRV_LOG(ERR, "Error allocating rx dma"); - nfp_net_rx_queue_release(dev, queue_idx); - dev->data->rx_queues[queue_idx] = NULL; - return -ENOMEM; - } - - /* Saving physical and virtual addresses for the RX ring */ - rxq->dma = (uint64_t)tz->iova; - rxq->rxds = tz->addr; - - /* Mbuf pointers array for referencing mbufs linked to RX descriptors */ - rxq->rxbufs = rte_zmalloc_socket("rxq->rxbufs", - sizeof(*rxq->rxbufs) * nb_desc, - RTE_CACHE_LINE_SIZE, socket_id); - if (rxq->rxbufs == NULL) { - nfp_net_rx_queue_release(dev, queue_idx); - dev->data->rx_queues[queue_idx] = NULL; - return -ENOMEM; - } - - nfp_net_reset_rx_queue(rxq); - rxq->hw = hw; - - /* - * Telling the HW about the physical address of the RX ring and number - * of descriptors in log2 format. - */ - nn_cfg_writeq(&hw->super, NFP_NET_CFG_RXR_ADDR(queue_idx), rxq->dma); - nn_cfg_writeb(&hw->super, NFP_NET_CFG_RXR_SZ(queue_idx), rte_log2_u32(nb_desc)); - - return 0; -} - -static int -nfp_pf_repr_tx_queue_setup(struct rte_eth_dev *dev, - uint16_t queue_idx, - uint16_t nb_desc, - unsigned int socket_id, - const struct rte_eth_txconf *tx_conf) -{ - struct nfp_net_hw *hw; - struct nfp_net_txq *txq; - uint16_t tx_free_thresh; - const struct rte_memzone *tz; - struct nfp_flower_representor *repr; - - repr = dev->data->dev_private; - hw = repr->app_fw_flower->pf_hw; - - tx_free_thresh = (tx_conf->tx_free_thresh) ? tx_conf->tx_free_thresh : - DEFAULT_TX_FREE_THRESH; - if (tx_free_thresh > nb_desc) - return -EINVAL; - - /* Allocating tx queue data structure */ - txq = rte_zmalloc_socket("ethdev TX queue", sizeof(struct nfp_net_txq), - RTE_CACHE_LINE_SIZE, socket_id); - if (txq == NULL) { - PMD_DRV_LOG(ERR, "Error allocating tx dma"); - return -ENOMEM; - } - - dev->data->tx_queues[queue_idx] = txq; - - /* - * Allocate TX ring hardware descriptors. A memzone large enough to - * handle the maximum ring size is allocated in order to allow for - * resizing in later calls to the queue setup function. - */ - tz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx, - sizeof(struct nfp_net_nfd3_tx_desc) * - hw->dev_info->max_qc_size, - NFP_MEMZONE_ALIGN, socket_id); - if (tz == NULL) { - PMD_DRV_LOG(ERR, "Error allocating tx dma"); - nfp_net_tx_queue_release(dev, queue_idx); - dev->data->tx_queues[queue_idx] = NULL; - return -ENOMEM; - } - - txq->tx_count = nb_desc; - txq->tx_free_thresh = tx_free_thresh; - - /* Queue mapping based on firmware configuration */ - txq->qidx = queue_idx; - txq->tx_qcidx = queue_idx * hw->stride_tx; - txq->qcp_q = hw->tx_bar + NFP_QCP_QUEUE_OFF(txq->tx_qcidx); - - txq->port_id = dev->data->port_id; - - /* Saving physical and virtual addresses for the TX ring */ - txq->dma = (uint64_t)tz->iova; - txq->txds = tz->addr; - - /* Mbuf pointers array for referencing mbufs linked to TX descriptors */ - txq->txbufs = rte_zmalloc_socket("txq->txbufs", - sizeof(*txq->txbufs) * nb_desc, - RTE_CACHE_LINE_SIZE, socket_id); - if (txq->txbufs == NULL) { - nfp_net_tx_queue_release(dev, queue_idx); - dev->data->tx_queues[queue_idx] = NULL; - return -ENOMEM; - } - - nfp_net_reset_tx_queue(txq); - txq->hw = hw; - - /* - * Telling the HW about the physical address of the TX ring and number - * of descriptors in log2 format. - */ - nn_cfg_writeq(&hw->super, NFP_NET_CFG_TXR_ADDR(queue_idx), txq->dma); - nn_cfg_writeb(&hw->super, NFP_NET_CFG_TXR_SZ(queue_idx), rte_log2_u32(nb_desc)); - - return 0; -} - static int nfp_flower_repr_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) { int ret; - uint32_t i; uint32_t nn_link_status; struct nfp_net_hw *pf_hw; struct rte_eth_link *link; - struct nfp_eth_table *nfp_eth_table; struct nfp_flower_representor *repr; - static const uint32_t ls_to_ethtool[] = { - [NFP_NET_CFG_STS_LINK_RATE_UNSUPPORTED] = RTE_ETH_SPEED_NUM_NONE, - [NFP_NET_CFG_STS_LINK_RATE_UNKNOWN] = RTE_ETH_SPEED_NUM_NONE, - [NFP_NET_CFG_STS_LINK_RATE_1G] = RTE_ETH_SPEED_NUM_1G, - [NFP_NET_CFG_STS_LINK_RATE_10G] = RTE_ETH_SPEED_NUM_10G, - [NFP_NET_CFG_STS_LINK_RATE_25G] = RTE_ETH_SPEED_NUM_25G, - [NFP_NET_CFG_STS_LINK_RATE_40G] = RTE_ETH_SPEED_NUM_40G, - [NFP_NET_CFG_STS_LINK_RATE_50G] = RTE_ETH_SPEED_NUM_50G, - [NFP_NET_CFG_STS_LINK_RATE_100G] = RTE_ETH_SPEED_NUM_100G, - }; - repr = dev->data->dev_private; link = &repr->link; - link->link_speed = RTE_ETH_SPEED_NUM_NONE; - pf_hw = repr->app_fw_flower->pf_hw; - if (link->link_status == RTE_ETH_LINK_UP) { - if (pf_hw->pf_dev != NULL) { - nfp_eth_table = pf_hw->pf_dev->nfp_eth_table; - if (nfp_eth_table != NULL) { - uint32_t speed = nfp_eth_table->ports[pf_hw->idx].speed; - for (i = 0; i < RTE_DIM(ls_to_ethtool); i++) { - if (ls_to_ethtool[i] == speed) { - link->link_speed = speed; - break; - } - } - } - } else { - nn_link_status = nn_cfg_readw(&pf_hw->super, NFP_NET_CFG_STS); - nn_link_status = (nn_link_status >> NFP_NET_CFG_STS_LINK_RATE_SHIFT) & - NFP_NET_CFG_STS_LINK_RATE_MASK; - - if (nn_link_status < RTE_DIM(ls_to_ethtool)) - link->link_speed = ls_to_ethtool[nn_link_status]; - } - } + pf_hw = repr->app_fw_flower->pf_hw; + nn_link_status = nn_cfg_readw(&pf_hw->super, NFP_NET_CFG_STS); - ret = rte_eth_linkstatus_set(dev, link); - if (ret == 0) { - if (link->link_status) - PMD_DRV_LOG(INFO, "NIC Link is Up"); - else - PMD_DRV_LOG(INFO, "NIC Link is Down"); - } + ret = nfp_net_link_update_common(dev, pf_hw, link, nn_link_status); return ret; } @@ -275,30 +66,6 @@ nfp_flower_repr_dev_infos_get(__rte_unused struct rte_eth_dev *dev, return 0; } -static int -nfp_flower_repr_dev_configure(struct rte_eth_dev *dev) -{ - struct nfp_net_hw *pf_hw; - struct rte_eth_conf *dev_conf; - struct rte_eth_rxmode *rxmode; - struct nfp_flower_representor *repr; - - repr = dev->data->dev_private; - pf_hw = repr->app_fw_flower->pf_hw; - - dev_conf = &dev->data->dev_conf; - rxmode = &dev_conf->rxmode; - - /* Checking MTU set */ - if (rxmode->mtu > pf_hw->flbufsz) { - PMD_DRV_LOG(INFO, "MTU (%u) larger then current mbufsize (%u) not supported", - rxmode->mtu, pf_hw->flbufsz); - return -ERANGE; - } - - return 0; -} - static int nfp_flower_repr_dev_start(struct rte_eth_dev *dev) { @@ -528,11 +295,11 @@ static const struct eth_dev_ops nfp_flower_pf_repr_dev_ops = { .dev_infos_get = nfp_flower_repr_dev_infos_get, .dev_start = nfp_flower_pf_start, - .dev_configure = nfp_flower_repr_dev_configure, - .dev_stop = nfp_flower_pf_stop, + .dev_configure = nfp_net_configure, + .dev_stop = nfp_net_stop, - .rx_queue_setup = nfp_pf_repr_rx_queue_setup, - .tx_queue_setup = nfp_pf_repr_tx_queue_setup, + .rx_queue_setup = nfp_net_rx_queue_setup, + .tx_queue_setup = nfp_net_tx_queue_setup, .link_update = nfp_flower_repr_link_update, @@ -543,14 +310,14 @@ static const struct eth_dev_ops nfp_flower_pf_repr_dev_ops = { .promiscuous_disable = nfp_net_promisc_disable, .mac_addr_set = nfp_flower_repr_mac_addr_set, - .fw_version_get = nfp_repr_firmware_version_get, + .fw_version_get = nfp_net_firmware_version_get, }; static const struct eth_dev_ops nfp_flower_repr_dev_ops = { .dev_infos_get = nfp_flower_repr_dev_infos_get, .dev_start = nfp_flower_repr_dev_start, - .dev_configure = nfp_flower_repr_dev_configure, + .dev_configure = nfp_net_configure, .dev_stop = nfp_flower_repr_dev_stop, .rx_queue_setup = nfp_flower_repr_rx_queue_setup, @@ -565,7 +332,7 @@ static const struct eth_dev_ops nfp_flower_repr_dev_ops = { .promiscuous_disable = nfp_net_promisc_disable, .mac_addr_set = nfp_flower_repr_mac_addr_set, - .fw_version_get = nfp_repr_firmware_version_get, + .fw_version_get = nfp_net_firmware_version_get, .flow_ops_get = nfp_net_flow_ops_get, .mtr_ops_get = nfp_net_mtr_ops_get, diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c index 3f9909c6e0..ff9b10f046 100644 --- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c +++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c @@ -377,7 +377,7 @@ nfp_net_nfd3_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_free_thresh; const struct rte_memzone *tz; - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); nfp_net_tx_desc_limits(hw, &min_tx_desc, &max_tx_desc); diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index fe87ea3e25..1f330b7bb6 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -454,7 +454,7 @@ nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev, struct nfp_net_txq *txq; const struct rte_memzone *tz; - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); nfp_net_tx_desc_limits(hw, &min_tx_desc, &max_tx_desc); diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index c4a36027b9..69050e03f5 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -51,7 +51,6 @@ nfp_net_start(struct rte_eth_dev *dev) uint32_t ctrl_extend = 0; struct nfp_net_hw *net_hw; struct nfp_pf_dev *pf_dev; - struct rte_eth_conf *dev_conf; struct rte_eth_rxmode *rxmode; struct nfp_app_fw_nic *app_fw_nic; struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); @@ -113,9 +112,7 @@ nfp_net_start(struct rte_eth_dev *dev) /* Writing configuration parameters in the device */ nfp_net_params_setup(net_hw); - dev_conf = &dev->data->dev_conf; - rxmode = &dev_conf->rxmode; - + rxmode = &dev->data->dev_conf.rxmode; if ((rxmode->mq_mode & RTE_ETH_MQ_RX_RSS) != 0) { nfp_net_rss_config_default(dev); update |= NFP_NET_CFG_UPDATE_RSS; @@ -197,29 +194,6 @@ nfp_net_start(struct rte_eth_dev *dev) return ret; } -/* Stop device: disable rx and tx functions to allow for reconfiguring. */ -static int -nfp_net_stop(struct rte_eth_dev *dev) -{ - struct nfp_net_hw *hw; - - hw = dev->data->dev_private; - - nfp_net_disable_queues(dev); - - /* Clear queues */ - nfp_net_stop_tx_queue(dev); - nfp_net_stop_rx_queue(dev); - - if (rte_eal_process_type() == RTE_PROC_PRIMARY) - /* Configure the physical port down */ - nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0); - else - nfp_eth_set_configured(dev->process_private, hw->nfp_idx, 0); - - return 0; -} - /* Set the link up. */ static int nfp_net_set_link_up(struct rte_eth_dev *dev) diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 1be0d7d060..76b1de0e49 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -581,43 +581,27 @@ nfp_net_promisc_disable(struct rte_eth_dev *dev) return 0; } -/* - * Return 0 means link status changed, -1 means not changed - * - * Wait to complete is needed as it can take up to 9 seconds to get the Link - * status. - */ int -nfp_net_link_update(struct rte_eth_dev *dev, - __rte_unused int wait_to_complete) +nfp_net_link_update_common(struct rte_eth_dev *dev, + struct nfp_net_hw *hw, + struct rte_eth_link *link, + uint32_t link_status) { int ret; uint32_t i; - struct nfp_net_hw *hw; uint32_t nn_link_status; - struct rte_eth_link link; struct nfp_eth_table *nfp_eth_table; - hw = nfp_net_get_hw(dev); - - memset(&link, 0, sizeof(struct rte_eth_link)); + link->link_speed = RTE_ETH_SPEED_NUM_NONE; - /* Read link status */ - nn_link_status = nn_cfg_readw(&hw->super, NFP_NET_CFG_STS); - if ((nn_link_status & NFP_NET_CFG_STS_LINK) != 0) - link.link_status = RTE_ETH_LINK_UP; - - link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX; - link.link_speed = RTE_ETH_SPEED_NUM_NONE; - - if (link.link_status == RTE_ETH_LINK_UP) { + if (link->link_status == RTE_ETH_LINK_UP) { if (hw->pf_dev != NULL) { nfp_eth_table = hw->pf_dev->nfp_eth_table; if (nfp_eth_table != NULL) { uint32_t speed = nfp_eth_table->ports[hw->idx].speed; for (i = 0; i < RTE_DIM(nfp_net_link_speed_nfp2rte); i++) { if (nfp_net_link_speed_nfp2rte[i] == speed) { - link.link_speed = speed; + link->link_speed = speed; break; } } @@ -627,21 +611,52 @@ nfp_net_link_update(struct rte_eth_dev *dev, * Shift and mask nn_link_status so that it is effectively the value * at offset NFP_NET_CFG_STS_NSP_LINK_RATE. */ - nn_link_status = (nn_link_status >> NFP_NET_CFG_STS_LINK_RATE_SHIFT) & + nn_link_status = (link_status >> NFP_NET_CFG_STS_LINK_RATE_SHIFT) & NFP_NET_CFG_STS_LINK_RATE_MASK; if (nn_link_status < RTE_DIM(nfp_net_link_speed_nfp2rte)) - link.link_speed = nfp_net_link_speed_nfp2rte[nn_link_status]; + link->link_speed = nfp_net_link_speed_nfp2rte[nn_link_status]; } } - ret = rte_eth_linkstatus_set(dev, &link); + ret = rte_eth_linkstatus_set(dev, link); if (ret == 0) { - if (link.link_status != 0) + if (link->link_status != 0) PMD_DRV_LOG(INFO, "NIC Link is Up"); else PMD_DRV_LOG(INFO, "NIC Link is Down"); } + return ret; +} + +/* + * Return 0 means link status changed, -1 means not changed + * + * Wait to complete is needed as it can take up to 9 seconds to get the Link + * status. + */ +int +nfp_net_link_update(struct rte_eth_dev *dev, + __rte_unused int wait_to_complete) +{ + int ret; + struct nfp_net_hw *hw; + uint32_t nn_link_status; + struct rte_eth_link link; + + hw = nfp_net_get_hw(dev); + + memset(&link, 0, sizeof(struct rte_eth_link)); + + /* Read link status */ + nn_link_status = nn_cfg_readw(&hw->super, NFP_NET_CFG_STS); + if ((nn_link_status & NFP_NET_CFG_STS_LINK) != 0) + link.link_status = RTE_ETH_LINK_UP; + + link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX; + + ret = nfp_net_link_update_common(dev, hw, &link, nn_link_status); + /* * Notify the port to update the speed value in the CTRL BAR from NSP. * Not applicable for VFs as the associated PF is still attached to the @@ -1996,11 +2011,15 @@ nfp_net_firmware_version_get(struct rte_eth_dev *dev, if (fw_size < FW_VER_LEN) return FW_VER_LEN; - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); - snprintf(vnic_version, FW_VER_LEN, "%d.%d.%d.%d", + if ((dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) != 0) { + snprintf(vnic_version, FW_VER_LEN, "%d.%d.%d.%d", hw->ver.extend, hw->ver.class, hw->ver.major, hw->ver.minor); + } else { + snprintf(vnic_version, FW_VER_LEN, "*"); + } nfp_net_get_nsp_info(hw, nsp_version); nfp_net_get_mip_name(hw, mip_name); @@ -2012,33 +2031,6 @@ nfp_net_firmware_version_get(struct rte_eth_dev *dev, return 0; } -int -nfp_repr_firmware_version_get(struct rte_eth_dev *dev, - char *fw_version, - size_t fw_size) -{ - struct nfp_net_hw *hw; - char mip_name[FW_VER_LEN]; - char app_name[FW_VER_LEN]; - char nsp_version[FW_VER_LEN]; - struct nfp_flower_representor *repr; - - if (fw_size < FW_VER_LEN) - return FW_VER_LEN; - - repr = dev->data->dev_private; - hw = repr->app_fw_flower->pf_hw; - - nfp_net_get_nsp_info(hw, nsp_version); - nfp_net_get_mip_name(hw, mip_name); - nfp_net_get_app_name(hw, app_name); - - snprintf(fw_version, FW_VER_LEN, "* %s %s %s", - nsp_version, mip_name, app_name); - - return 0; -} - bool nfp_net_is_valid_nfd_version(struct nfp_net_fw_ver version) { @@ -2059,3 +2051,26 @@ nfp_net_is_valid_nfd_version(struct nfp_net_fw_ver version) return false; } + +/* Disable rx and tx functions to allow for reconfiguring. */ +int +nfp_net_stop(struct rte_eth_dev *dev) +{ + struct nfp_net_hw *hw; + + hw = nfp_net_get_hw(dev); + + nfp_net_disable_queues(dev); + + /* Clear queues */ + nfp_net_stop_tx_queue(dev); + nfp_net_stop_rx_queue(dev); + + if (rte_eal_process_type() == RTE_PROC_PRIMARY) + /* Configure the physical port down */ + nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0); + else + nfp_eth_set_configured(dev->process_private, hw->nfp_idx, 0); + + return 0; +} diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index e242251bc2..af8f8d15ae 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -178,6 +178,10 @@ int nfp_configure_rx_interrupt(struct rte_eth_dev *dev, uint32_t nfp_check_offloads(struct rte_eth_dev *dev); int nfp_net_promisc_enable(struct rte_eth_dev *dev); int nfp_net_promisc_disable(struct rte_eth_dev *dev); +int nfp_net_link_update_common(struct rte_eth_dev *dev, + struct nfp_net_hw *hw, + struct rte_eth_link *link, + uint32_t link_status); int nfp_net_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete); int nfp_net_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats); @@ -235,9 +239,9 @@ int nfp_net_check_dma_mask(struct nfp_net_hw *hw, char *name); void nfp_net_init_metadata_format(struct nfp_net_hw *hw); void nfp_net_cfg_read_version(struct nfp_net_hw *hw); int nfp_net_firmware_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size); -int nfp_repr_firmware_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size); bool nfp_net_is_valid_nfd_version(struct nfp_net_fw_ver version); struct nfp_net_hw *nfp_net_get_hw(const struct rte_eth_dev *dev); +int nfp_net_stop(struct rte_eth_dev *dev); #define NFP_PRIV_TO_APP_FW_NIC(app_fw_priv)\ ((struct nfp_app_fw_nic *)app_fw_priv) diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index be1ac32c73..b2a9ba6875 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -840,7 +840,7 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev, struct nfp_net_rxq *rxq; const struct rte_memzone *tz; - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); nfp_net_rx_desc_limits(hw, &min_rx_desc, &max_rx_desc); @@ -1067,7 +1067,7 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, { struct nfp_net_hw *hw; - hw = dev->data->dev_private; + hw = nfp_net_get_hw(dev); if (hw->ver.extend == NFP_NET_CFG_VERSION_DP_NFD3) return nfp_net_nfd3_tx_queue_setup(dev, queue_idx,