From patchwork Sat Oct 28 06:15:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133540 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 53E1943220; Sat, 28 Oct 2023 08:16:39 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B5621402D2; Sat, 28 Oct 2023 08:16:33 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2098.outbound.protection.outlook.com [40.107.220.98]) by mails.dpdk.org (Postfix) with ESMTP id 2F3C840291 for ; Sat, 28 Oct 2023 08:16:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RQz+bqCuz8sjL9LWjehmgcOGoecNim/IJxtwBu654uOzQRpZfLNjlEdetR6zB+ujKiKWrR6cd7LwsuuyeyVC2QxjYEbiIh2VLNUyChOpcTs1v1UVnHqQxcDgC+hp2I2cEpXqaGJ5qnvzX5HsqbwjuozvorsNMAB/LyNa7mBP/0bTBZ3QFLLAOLIGnPb0SYS3JvFnuyDZKNMwRv2L/kMqb4RaaArZPbjllK3me4B/D7RdBZigy1gN01pd2JzbNlxFswZTG3B2TC4okzEvtQxVMPdrazn9xzQBrQl52WBbTV3LWi1wxrg9IKlMCMYtf+K9seICLmJTgASMdmMMcez4/Q== 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=X6sGhaqQp22CwXc9OSGYlMKmLfsNldGUQsJo4k9LwaetHvXoWhxyYMDJyGTerCEl4vhxbeI0vQUbMjseP77NXazF0zkP30Hw+dGMrq6gvZvldVV7JxtYTChptXXlAk9MdT05gYd7f+zR3MXrAHHxFBgXf/jVcsagLUBWiqW3LBesPETZQgEzDIQYrXh2j4asGBKoavGBOK41yYKH/IdwBxtsAgQ/eHey2SbPJIR4Dlm2Pxbupj5W6XtZbJyIuORm5ABdECKUDjVZnhSwQlMBySg/rIMuBDjQ+Q3+wu1GEr5MdsaB+SYZCIe/BXv2VtIrB8kb4wEMGzAlXDsNGhCU8w== 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=q54QSjorfwrWjJp+uiNrbE4g8UK0QlMs4t6HzeWMK7J7MONEZH/AHoAIXoEup6OXyZhhbsVa0vInDp6MENRr9hnmMXskYxw8N7lNsvDIGRNgJDdqt48WJ6fmsoKl84YU9xnVm+7iNJaIdzKQ2V+39vp2bjlr+ezC9XgQnRSHyfE= 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 PH7PR13MB5551.namprd13.prod.outlook.com (2603:10b6:510:139::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.29; Sat, 28 Oct 2023 06:16:28 +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:16:28 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH 01/11] net/nfp: use the suitable helper macro Date: Sat, 28 Oct 2023 14:15:48 +0800 Message-Id: <20231028061558.1842855-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028061558.1842855-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0246.namprd03.prod.outlook.com (2603:10b6:a03:3a0::11) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB5551:EE_ X-MS-Office365-Filtering-Correlation-Id: 4649a92f-e398-4c60-cbef-08dbd77d6b86 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: adwsjO+yUE1zTRzafP/qpmU6MiwM7/hF614cbh6T41JhjGLKsiOGGallnR3KW9M/N85zoID0KN6Tpz+IX4xb5GdzkJD1RGIHtV7SGf6bW57usKK/u1KtZJGyGembi5/gOP1MfPGod6K0UsKFUefW8s4aN8KAc2HiBsDohLMm1JTqEuL/q83pIA0StAqO/7tBtAwT4lnKkg5XTP0ZgeMS5wQaDKS9dPUZ6ZN8ZbsKxiNjDudhVkOAr2CUrcJGLtNexgpLaGxF2mnLCv/dfe4YWyT4IwpUKLwM+VhKmPitfMMgfql7ktT4LYpQ4jXfqJnLzFZwidGjs//GK8UzaXAECj87RWxJ1ZkyFmh0eyQ+fyWdfNYGlww2nPHiDCVyPlGoBSIDNVYjU5MyUrhQgacEbIvjKWdKZpoKtoBEpKFDPV1Q9vyNmwo/Yj55d1DPLjch34ANRtaOfwz/Kg7YH/v4qnWhEN0M2BbWauJ/NdNBY3YPZt70C3b5jf93YZ8QITbNQ27fkbWCwlYr+CMMd40sCMy2sU2aIlSpShWfDgoW1KSjEUNPUt5lBN8Q/2Z8+7l/vMtxrKe90QQ6JV63f46VQE8Nw9+e2+e8pAA8OxQo8SylvKDVMTNpXEZkbeEFGYrtsKmeQ7A6O4wzAR5zI8iO8I8n0LW2TYKqDER/YFWbhHo= 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)(376002)(39830400003)(346002)(136003)(366004)(396003)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(6512007)(54906003)(107886003)(6506007)(26005)(6666004)(52116002)(83380400001)(2906002)(44832011)(5660300002)(4326008)(8676002)(2616005)(6486002)(41300700001)(478600001)(8936002)(66476007)(38100700002)(6916009)(316002)(66946007)(86362001)(66556008)(36756003)(1076003)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7SA7UpXYzKGb4d7ElQkV4hNxV/mv/QttpvPdFdlJwz2RQ4O/MbFY1O1CuSCXQAL38vFpNiz3QO9Zp/vQQDxLnrz0PeXjDAABMeS+LgTCEMVxf2P1Jiq5cSXd+MdDRNZNZ0VA7R+3VPYw72LtrEnUlH+0faN6m/At8cJpUjaB+jHCxpCOmFEwAzPAU47IP8noH5a5dz0DaTcge9WNzbjQTWS7E/5jx9Tvh7/Fxu80d1N/NqIRv5h+yx0klm2vgl5jHSPvatXbVM2lfpQfki/YqYJUFhEFRzgDqX27SNi4trdcHbrF/U5NGVDWdci4XvIrE2I5SdoyJztTtCnbKBwupO10rqPgMTy3XywecmekIE/Zv5Xw/IGuisUguidmS1Tff2LFEWZCzt24s1tXmcuH+G6rGnSjeasLj77RqvfPJt7n/Vl/hM3PBIc8I7F57o+c6Sd+IIlZVEbWrzEuYYEgvJMXLywUXk77Ru+bv3riUm4HIfEs9RrExzWrzPn7zh2/WZiUbCDhKsih+TxJ1Da1HScnEO9Srbq6wpIE1wRwxFf8dxIDD1enKl1ev0zf6zLiDKNkDoA+t6MBKmAAedIfqDKfIGKntayBF/SGth0AlvyiQdo97kAagVMa7hsVu480YXuSkSbQwFxI2sfF1a0b3ajFOHmF/KQnrq2cZIuzjVlSY13jAv1ePqh44btF2I6yYQYWCcxZhwqaJsUIDjXpu7xKqqc3SmYe0Tf9yFJeg1rfF6GdZ1gXAt58c4Oj56aLAjFdUeEg8qgTW3dK6nsJ21m72USju2UaHojjyusf8B422oICGS5kx7i6uExi99/L2Lkdh64yvLWwuFitCL6hvHVL0EV8BX2I2SQq6z4oJbVlKGAGgqIEQfuEnd5apIcJGIPFETOYF/9WhZX6HPoJ9NwG+QtC7k8ZkmZlThYQeLCS2qI+YXiepgl0VsbAdlZv+Eyv7idPaYxWuFf096+0/LyvuaNk6QAuvEw45J/Inj9L7yQu4iJJvYxx2O2wMmPdsuDPnLhAHz5RQatn3Qr5f7momlu1XE+r3iziURt6Gksk2k09NLEE0H5jmP54D1I/U8TQvKAWi+NHBdAAvDvUna3BQPZ0Mg9Cpg1YT2YBbEVRIbMhlyLMaSHmFzq2ml76j4yqtlggWxKN1hRMpDDKs82ICy7I/SCG8Oz/oJ7rZ2l2Owk83bt/lLChvquNso7ctc1Bug8rypm9qG9bM+iSmnOmiRELzH9HmUIadnGgOUA07WeikZ1cfSMCxtSWcNjGAQsrOdpGTHZSeA+UDjdm6lPO4BeILzl36rjLEQICNph/R6kAIKA/oUPm6jsw3Nc/JVmLJEi/0yQS/+dTVnIBkCp7sGVByQbRiHqi+N9YXoJTUyRMhZthSFcyHzmxmOCz9bbZi6TAfzwqWH27Jxsbr6FeCTc6gZVJUcxB8liT0xtWexHEI6uzxQO8HvAX7mCXgPd1lW9pWArZmSG0C8wT9chZPTWw+Ko/xhJIu9CT8zrUvNCPf+O1kt1ImTyJvR6s6yudXhti4xA/QsTj5eMb1+NNiguAjrO68ac3+uBbVizO1Z+0NY7MiljMCtRhz98dYFm/Z7JBOsNROJx8/lIeng== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4649a92f-e398-4c60-cbef-08dbd77d6b86 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:16:28.1441 (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: dBv7rgu56iOIiXFNgspOLoCpWxxxNW9ZUMAWQNhcMHzebJ0sqiBZFHwXj5r89AUFXAmy6K09Xk5U/ZbVg/Kl2idhOITl7TTfg73DMrQSAH4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB5551 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:15:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133541 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 915E643220; Sat, 28 Oct 2023 08:16:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 55E42402EF; Sat, 28 Oct 2023 08:16:36 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2098.outbound.protection.outlook.com [40.107.220.98]) by mails.dpdk.org (Postfix) with ESMTP id 90EC240272 for ; Sat, 28 Oct 2023 08:16:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A5Vqr61AYLTIzIWKqlQbU7Yechs0WvNfT3ULQeAVYEEQUTBZIwDTKDDbFICs5i1VHGsVEdIdwnpzcHD+LZygLWP2YUk+n6iKZIVUHjTCFf4p2RpHQ4ZhiQRUnFvAlVwZGzmaDfbv4MKeVRdnF1IKM119FPrBUGvZKuFHlyr1G7ZxJMzly1eMtKSdHu4ESGrj8geWOo/F2vv5L0CuvkNKhSW+rxTqhEfVcA+BPY26EH90kOP0j837SKyKy0ojyOFyvg52HubrQRhg0V948jOv0eMF/0EPkPFAiTq0/PtKxRNDjEvr8kj6VPow3GRgVU80ZniKVIZ4u3Wfg0FuupLzMg== 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=GuFYlI39fjkodA7WpPz2ZZR4gLW/sQr08RIAXtRchtwZJPKNajtkbcsubzRRgGTGUOnboSA/ZkQ/dkGf2KlVXTiYujk0/K6tZUkBMEXd1lcA9bVDT5Ee4D1/g3jb+adfqv9nnUByDL1qvcaK+UvxDPJbtNWJdMnr6tBBpB3/FZ+shLS2F6PXvz7vJbS3pw++U/wwIqLnkmBJ0kSmdXZ79PvZ1coHEx8OlsKRBcOQm1c5zIR+FE6Lh1+2WqiEgTLG/A8jAqIHGTaHBxVLmTIK+7BPa7dK4kk39noWoI8X7DlxNoW//d0HHAYcgZuOXNzCW76JU7ktUb4K6I4vGLur9g== 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=nGBwShMbby2Xy8niNbCncv9iMpgNqlrBL6cE2q2D8XVTdVusH8eS0iMBvUap2eyfVf8REe/UfXjdohCVxCtCOyBUXcocpF6UgP9I9HjHsySb3Vb063WLsFYsxtDytczZ11KNLYWWkOJFe684+cfRZC1OL/juxGIMtHLdLkL13vA= 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 PH7PR13MB5551.namprd13.prod.outlook.com (2603:10b6:510:139::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.29; Sat, 28 Oct 2023 06:16:29 +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:16:29 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH 02/11] net/nfp: remove the unneeded call of underlying API Date: Sat, 28 Oct 2023 14:15:49 +0800 Message-Id: <20231028061558.1842855-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028061558.1842855-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0246.namprd03.prod.outlook.com (2603:10b6:a03:3a0::11) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB5551:EE_ X-MS-Office365-Filtering-Correlation-Id: 70ce24c1-adc2-4518-32a8-08dbd77d6c94 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /aP1OznToIo2m3WcPnC80eFUVls0N78U3+WdfJIvLKlDiA2MVHMx9tpZIE9COM9ymq6n3WpxX3aOeqYRV2mrl+qf2FIslk/DspXkE88mQGUFp2Z8oRWVmkVlQcmub+mR3fhAO/TfShQaen5s4HLbbS/bKwCPyDP8Gjs1/0QB3IHXsp2EmC0c90QOKrvz1Z6Rc6r4moJXQtkgpkY91+f2TcQepfaoBdpCDwDDB3ypynZpN+vNK/2AzUvNk9P83gQDt18SdZ8T5QSEYvIjk1QtPTRa8GkZsq4BSdmaK0OWms+fJn6IL/3fpp9L7NKuVfTSLvj6QEEIQU4Tdv7SOsaN8F7evu7XgoMsf43jALrJPlyj86BCFz1lMOK1+cezbnfpxiJ8Hr4pq35mlRN/bC5wFPlzWmQtRiG9gASpeciJgMeLLVdL2Rmv94GkODa8nyHlr+FpiDR/B0c7GLhzHV1RHi0fIUTqjJhjt9jqmfmXGybj1FjeUWte0jdFkzlvQfWHemSmN6hsmadLaOlEpDhIcujuXu3j1dyvb5tfmEXkigLSxUve+KdU5FegJClz5ANvgnuzYGE8AnZzt5yJHMlQfsQVMcJw0/iujvI+anAJdbQ6k2NdrrGEgLriIgmXl8PR7lh9OH7ryTn1H/fpaZ6TnoamYLbjUXBCAWEhtS2hLQ0= 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)(376002)(39830400003)(346002)(136003)(366004)(396003)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(6512007)(54906003)(107886003)(6506007)(26005)(6666004)(52116002)(83380400001)(2906002)(44832011)(5660300002)(4326008)(8676002)(2616005)(6486002)(41300700001)(478600001)(8936002)(66476007)(38100700002)(6916009)(316002)(66946007)(86362001)(66556008)(36756003)(1076003)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9h9AWGE/qV02+QsUhxOJTZUviKLd/MTY3PGZQqtK2c80SLqlE06gnTHa0fbIiaEbFrFDFmGFU/NC4bOT+q3MWNhGOISGNVDHNI1ihwzINaNuPGXfNYN5W/MfMo08P/V4wR/CF0I7M52567N9pkbI1tonJDJt3z/FXvH8yqU+pIIcoPOi+cTs4tkpTq1N7yEHIK6jxqFKJCZhu+dhewfjaa5SvR6nX24n05d9wA+85pjXUd+EVAKGCjoZ/4j0gBM9bqB6prTdP1ZwjLBnoCZHCFlyYbALlgXvSrZNRcWb6WoXBoVtdudVXTbuvmF3KeTevQcjDirD65nAHX0W3xxFmO0I0c6fSEIK5h0s9j8nqPDrysqJaPfLxlqcyyXMFg9a/SyizZNdq/E6Ra7eQJmvDDJhPkIJRFoIXRIfrPC3jhClHstdO0R5mtXiK6ygilPjcUkc+2gjSvSb95sCgFduc03Wdva1oVTJ2pkKaHpQT6ysvh2crivhM0Zja0M6FsgaHl+DpW5uT80SIwxfLzLlcZAiKMzEXsGjq0bUdDN4jfGWlOoG08cI9K7FQXI/xFChVFmpcG+1OAPqtYDBQcbZYx/aWZTQgzwZasyVISVAmxFscpTCoEbaVq1ZoS8u0tEmKx1phQmD/7oQSt0Nenn/o26d0h+TJ+NheEUshz1IfRG3zxDgno73D46hFjizSyvOuFv9KALs8E7IpSigUanRvHo3NLsEqeQmKB9BBPzhKjCb6Mw4qRxUD+9vgYbELmaA9jRfdYEy3CwDUXFO4IWIhPz9PrUw3LkfJc9lAzGtzWT72z9UKnxfqa9c7H2wk2Svmch/s8bU4cZA/ASZfegat8cDpvm1SG1/4h+j5zQQNO7O4HKrp4+YWun7OZyAKFVJAaO3s6LQmxHiYcK7mtvTsY7fzerAVAijvvCO2mtSPoxCJdN4zg6HhxL8U7cb++U988OFhd/UOyiMOG4ZL+ALxjHhKNMrGJVeTExzSsxaeFRS1tUMMa2BkUPLXUeeUogW2TIPn8VZFYtyB+ff4nevvrTKqsx4H2T4pKAMs54oz8bXfq77wd+AQNvaHxg45KzLxWIEwYYaIXlLuKyz7YykpapPelz1HrcxWxZvwMISGUJOeVOMCeQPFjvSYtj6wQdX5cUzraRogHydMKMDtDdjJWDS9UFbkgHkKmA0i9ishizNGGQ8gXI3YKA9Cw1vb3/P7TDluwEgPeZpIygKrHyjT8RLOKqSzTtJT+3uSVzAWUSXbLw/by8wyXfqP4Zuf04wRzyHvYYw1zIjTCMkIEcc5yMsZxnAc8ABJGc3aQUMxOzyLcClY7t5aCIZS5/RRfUPhb6vx4NB6HGb5K1mvznsljXLx0tyugY4POkCloKj/BQ85VLs6pLIOSeW1LlatE0TBZ46NUWkuyxlkT0ehQFS1m4JBlbepam1i6BnXoAo8VFA8tdMzJa6qVll1iQ+6QxrcsR5tdVzbeReeea/nEOs2YmpQepEj3brhTAqsax7LAVhmblSTe6/S61OL9HY76oI4H1SfvsGL756GEJkFcQC9xKcl41TwvfUc/1XuHplKJIhtBsKvvw3tJwNbGELVv+AnbdVqDWSDZwqP103yo+OKg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 70ce24c1-adc2-4518-32a8-08dbd77d6c94 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:16:29.8479 (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: Nw4FC+l/Dp3UNNqO6Qf+Jeb1uJ0eum7uw3RrTsix8u8AjNE8FEWJMgukS+Ngl7cbd7xsqDLicNBrwOl174GazxT4bVqCz6jeHWsheOciqxU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB5551 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:15:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133542 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 6AAB943220; Sat, 28 Oct 2023 08:16:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B7C4402F1; Sat, 28 Oct 2023 08:16:37 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2124.outbound.protection.outlook.com [40.107.220.124]) by mails.dpdk.org (Postfix) with ESMTP id 17CF8402D8 for ; Sat, 28 Oct 2023 08:16:34 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dPaQ1QHQw3dpgGRhG8pRuLZtRtNU1PWnqp3EbogGFXdU8pf9qhqLnlvrqf2Ywvq4zZI5+hdHnxFclDcYtu1xIJriuVd2u2fVNONaiOkr9lrNB6y8l0OWE3lLql073oZrJi0KfpRVHOyX/mqJf31//8GUPrOeFN5JEnzNAOVPBQ1CuN6Sl3fqPyObefrOkLPBocbUIeiFEsYBu9fUViEi9xzyJkM7UQ8f225fWvrkMC8rSToHNILqHof6XHsGgvFU8VIXbObg3QNTl9Kxyi6ccpJQEpapw8mIItYYr+WsGmaqe6L5EATmBOlRE3ns7IHrdOQ24KJweX5v5yi8lKRaxQ== 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=OJoFDYnW8IlAg/Hb+lp07v8mgAdkUHVYxBaR+WRCv7p7k1NmQ7muumkKNRhUk5YgiYDR8ilSIsaqG0IVWgIUp1JDSzobFWO+Up1eaYi0jvMiAdHO3w0mQs+b2zseL842TWIgi3ZjiKdRBj0/LQ/9gIJaMD334AqUrbR1XyIdwuTxkocJCixc6xxzjOP/7HQFCcpxd99BTIulmCiNuHpPQMryO0wTEBJCzgkOq7lDp82jTn/Ux7IA3MpLi4jXlJv0Y1uzZ26N7REzg3lC70ndCfIVn6hXDrygAoa2DD3J0BmtT+zzxl9fx6HMROXp0XiUUS+rkJrRiGXuKSHSgGx62Q== 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=C0aCRfhn816kgsyu+H/nm9nQ2Fl5zMIC+9/wTZZl3TY4vlnvCfKI+b8lJ2FcUO63pst10hGQOAN98BT0oX28T1QczjIlL5rwGG/P6b+bMpgJbapRMq7P+TE5IplNDvUaoP0OpJ4KOQNBXfxgonZgU9LMlSpLZie1iLBTl9Vuaf0= 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 PH7PR13MB5551.namprd13.prod.outlook.com (2603:10b6:510:139::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.29; Sat, 28 Oct 2023 06:16:31 +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:16:31 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH 03/11] net/nfp: remove the unneeded check of process type Date: Sat, 28 Oct 2023 14:15:50 +0800 Message-Id: <20231028061558.1842855-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028061558.1842855-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0246.namprd03.prod.outlook.com (2603:10b6:a03:3a0::11) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB5551:EE_ X-MS-Office365-Filtering-Correlation-Id: 121c3617-b587-4ffe-c43a-08dbd77d6dc7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gSE/vM1MOBlrOaNai9ejHqLveXLmw/EHkS1hJ/GrSv77HhMflJPIUFE74cukx9I9TdV4BsQUZbaQyFUWIduLSWp4cvEBNPtDkmHzu0tS2sjA05s6X5lTVIW0UoeVvp7d9SNWNqlrapYfmHQF2ZCx9mvrH4+GTpCcPeYn30Cs/7NhLFnmrQfBmM5j8NvQc/wmo8WRPAJ0jnZt4XJDx0VbDe+FhJZavMBBLP/eCQwUK4B5KTCMFLml8mGKS9ck0W0JtAYasvOLvGoKOaLT7/flfN+AzZlELEUTbPTRIuPjEwecFMdDTpOnlMzXnj8++rithUAEal/JmUqwFD7YhXqrZb/VBurSJGfRoQbuqbuZIzxAYrs9ifJloRW1LjPIJlOGURlM0U87b1OA8LBZutW9AuPmE6DWzVS/Xqr75RUSIs+4Pv7Wx4kMLRHzpoUg9BeY+b+hQgt0pkl18hD2arhqHZMSa0LjtKVZvCWx3FavHEoop89m+qfssVZa2Ocwm83x6v+OTIuYQcYgtzravHuThfDLu0bmOWqsMqYtO3tAltw6qVcC0bMMQ3FqpDuhi3/sYesQT335VVonLZ6JLjjpWJ2ilXm2XAnkGOwhp9MU/ISZCKp1D5aQqV59ZxG6FdcpS3XZrh/8Oyb3xWbeaiQTzJtdGILS582SKCYkd0rKfKM= 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)(376002)(39830400003)(346002)(136003)(366004)(396003)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(6512007)(54906003)(107886003)(6506007)(26005)(6666004)(52116002)(83380400001)(2906002)(44832011)(5660300002)(4326008)(8676002)(2616005)(6486002)(41300700001)(478600001)(8936002)(66476007)(38100700002)(6916009)(316002)(66946007)(86362001)(66556008)(36756003)(1076003)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CawOHxXwDopqhy1J4HW6tmz+KUCsTZu/U1HwV2YV9tLH6+ctfT2c125qrMj1iYvBWO4EZO055t/8DgFoOaOlknWG/dPTd99ViMM9nI/8mYlzRamfBc2ArIDCD7zUfhpoZfwVDGl59RlDF87WJiNPmYSxCQmDHx+fNkp4mA8+NeTe5Izoxu16cvvzAg91usUcOPiyKNUXY4LM01KHCLHg/0Qsl1KnLNDP3yMQQ70Z9hYj6ss5CDaNhNrJ7EdTUJkv2rdXVC3946o3mClGVGlXe6NxIzZkG0fERwrCFHbBUmPHYG8xyzRD4Nkc7fPuMxGgHEZTbW+HhVRkwPy1TteutwwkLadOzTtgPCY/zIeI0fPcEhzceEJp3XdDI9OL5+o0uouLJfD2vqXAEHTafYsoxZptELhQmG2QK7qu2+j1HvgJWt1ji8key9uQChlOl84F3NG9H+tA0/Hz1wde0yD2KZoTJqaWGCC1xoVoKOshS4fVNLyc2bEIaFD3W2hqNhuNEKyfgWrDTJVYIm4Vhc+U5PUQTHwCTzuWgVoIhBzjLXzKDmNWbQLdSVa9H7VKnLmBrmMUiacJG83dwND7I1iQGTUqjf2vcSrN45vcPU6EtHVweNt5bdFYv5jErPAzNb8uryjARWFerTvpj29AU48SESIja/msmvEL01DvUar5L0aRpnKR26/c119PoRhI+L/LoG4dWBTQ4NaJQKYWCuzRVDFJBlDHDNIZwAwD09T4ll3u2HPxFRCGKDTNDbeeuuaLlwZVjP41o9OhA61ZoPTEXDRxxadyP/hOhRruEZCEmo6Qq5GGUr5bZS0LOohVv2sehyb14cOO5wSVIrZeRjGcGniLABWOV4BkZr45LVycjEQZZJo66MTw4TJ8a+1dIbVfEcEuE6d0U3LLzwfuuPN4fBhUdI0/5mKM9IoZkl1XFRuyzW9dXCJHNWBqMoqZtpLZRVh0gSzBMJjS+kMJbHlXZ4V9/GuKKcURMLBRwPzN1UwYfJrI18dAcjpj+qbZnHCg8JIAjoOqPmpQCwbJ0/TylBklxtIijV+2Buj1ZXtYvZpyfEaoqlbdP3nE4gR5wWW22uvxl9MaMosRnzGeks4U6mjWNwfpRgcHZLlouaTTQ1uCc5Znkdza6tFLMfqMbVQYPmZUhpIopyQET9Wx/g1wutrlJ1roffrGk2lMvxERKIDsoXmxEiz9aivn1HqwM+NNMqtPSV+H2OkGxk1zN/mw/RZXNTCeAvljQQxG93zF66skCkvxXTlsUw0z/iiIC3H++nURfIGYGlaTKnh5+wPsTVPMFcJ93PaWDlUa4wHaBzDDasvjLMfSvmzWUBb2rIIuwDCiQDvdGq8rNTwncdrSi3qvGJ+L1i4DO598HCQG6PA9rmmX9uFPeuCGZefapl73vR2D6973QEeajyGK1J3mzjEIGHEjzAJtd8tqr7OljI3apf6wTqouVyBmUwADYZOzfZdiZr5+4IAdDZ3HZzzgfz1Cde2UjRCeUGano5UYBbOyL8E/R6JnkZRvaUjjLBHK3FqbUWlGrpha9cdU239DyFGjGWNZd1P47LagQoCsJXh+5yfvklvjEPY1q4obImC/615/elNwSVQdZquTOZ+3qg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 121c3617-b587-4ffe-c43a-08dbd77d6dc7 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:16:31.8523 (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: kBAN4XdUOYrBAECj7dNTEydxdt86RMetdYJu3ubg3j5lQUKyWh6AKNsxvSr6pi00mF0yegRtd6s0AdQfHVMQ4YoOIckpXBqktserACN5Fnk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB5551 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:15:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133543 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 4F77943220; Sat, 28 Oct 2023 08:17:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B0FAF4064C; Sat, 28 Oct 2023 08:16:38 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2090.outbound.protection.outlook.com [40.107.220.90]) by mails.dpdk.org (Postfix) with ESMTP id 72104402F1 for ; Sat, 28 Oct 2023 08:16:36 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mFn7kB6NLru8PWuYAbTGDKWEYJoZs0hRUSr1SJwDSbJ0KNkcQV+PrVOLFz0r2/ec2KWkhuryTUJIS/c5tilW7OtZFMXU1lPN1jhovKhqLyZaOeoq58+/UzQ0ywlml+0uMeXBcwCkoEa3tIh0Xnx+lBOKqG8nPyRoyQYch5vKKJfKP3r5T2sO8ke9+Qh0DLsywX/bUOh3vLFesBBej94FylcvGuOeUlRTJj8VhonTfUskXTKWL6PPfMEXw0lzB5Md9QX6lAwxxcyL+gGp4Tt9T9mR24FHC1WfWOsnCQAOeNNpTa3bKHqQB/jTDvhOLm8aKfpZRx80omiu+gN0Qzqp9A== 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=bmiCLlC6a5ilRc/crGtpsqo2qosj5CyVkTJiPAnfy/M=; b=YZcEDD1lVbhahiwz20dQch/Dkvf6rnL15UCMDX9Uz/aR6JuagQ8Vkv1z6Yz7Fgte1nEHkIN/qHwsX+7nfhSS8c0pbR+6qlYoU3WF4YqDeT/1VA7OZCtVbQqxAiRlDFOtwpXgYyzZNp5Qu18aZYKjyU/P37Nq0QQV6yh2I2fAtHtIfrC953+jd1oGBUTGT1GxB6ZM+Ha1u+vcowwZBIW6QZRDlXrgS+BVRKS7xTmsCxBmSj9Tkec7FaGWwDMTk1kBAGzPGU+3fqj//1/ds1dIq1QN2xbjXSwxURwTfZzh0ASCJRthsc0in1wZl4V6LLF1ekYDBpEo74mXKERbg7T3WA== 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=bmiCLlC6a5ilRc/crGtpsqo2qosj5CyVkTJiPAnfy/M=; b=j4WgeSm2d9w7GRLKq819ZeqtH1xIJCIRFUOsSx1IcUKTi/8ORg3JewUnTg36CiR4nIs8rG3/3pU0yHQkBX5DsGamC4ZPObapba+fels4sZklGHK1Xm33l3rhiV/LUHNnjykxt7bmN6wgnrcO4+SErZvIoOde3FY8Bn/Lr+EIk3w= 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 PH7PR13MB5551.namprd13.prod.outlook.com (2603:10b6:510:139::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.29; Sat, 28 Oct 2023 06:16:33 +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:16:33 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH 04/11] net/nfp: remove the unneeded data abstraction Date: Sat, 28 Oct 2023 14:15:51 +0800 Message-Id: <20231028061558.1842855-5-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028061558.1842855-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0246.namprd03.prod.outlook.com (2603:10b6:a03:3a0::11) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB5551:EE_ X-MS-Office365-Filtering-Correlation-Id: 0858cd9e-0850-4b0f-a5cf-08dbd77d6ecb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ADym11w51hARrw2uu95AxeLhVSOfomw1HmBtTK2vwgP8iMySX0SaKwnZHQMo5Ln0tgFhGRpLd6LzlgnkSUVISWTGd7VJTX3M9EUuDfsiKSd4OdU4iD+ZDOnQ+NV1ku2YjR7hi4oEpkov3ClMQ5MEZG6VG78yoSjkg5dh8cLWi/SRsl9tf5HHmbHKTyqObKDOkXyKeo81Jza8gtzpE64ibjycIrHnOia0W+L7Gj5vKR7+H8vj0yKiimfOShazdsfsmgrOyN47//VNRl9+ogRvCi2Yue7KpkCHQuVsz5hcXxdPkSZ0ko1yBxzlQYUuLXDKuDVPU5lcODsiDNp3VNBtOYqqJAhDZbPDMF7nM94V/jb6+1FPBhNDw9Gh1KS5FV+TWrjPvVJe4d7L81TSOh/hCnYW/grztwFEXgraddzv00olY87bGF7SV+VhSNQ48najbH6YvcUPLAKibE4DS8VKAidznSFNqrS9J6H+CY483vUyK8d6TkqaRZQcGr4WTG7Uukn38wVD3BbDbUUjN/KDuTgJEXWwk/UCjkXYGq3dh/eMqEiTvAlECNpWFKg6Bf0raNQ/AbtcuHImnVF7EODhEvVkHtVi+h4y+ax9LFhBu3cAycu73AJX+gtWMKJhuLXATqDOU7mXtoHyefBP66a9dEOQ38FhQxnpzQYptJkGE0E= 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)(376002)(39830400003)(346002)(136003)(366004)(396003)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(6512007)(54906003)(107886003)(6506007)(26005)(6666004)(52116002)(83380400001)(2906002)(44832011)(5660300002)(4326008)(8676002)(2616005)(6486002)(41300700001)(478600001)(30864003)(8936002)(66476007)(38100700002)(6916009)(316002)(66946007)(86362001)(66556008)(36756003)(1076003)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ijtp596mS7+bEYDgRY5hW+BGNR7gzQEGvUNJPwmxRsIQ0U2ueBJn37wVhRbbHz274bIQybd7hk7FVeSNZYq5oac5SWYNQor0cq/DEomWI1DlGq3FaRYYNlCDgmziSQomGqJNDHbo2S9b8RElGKAuRtRtZ7Jf5xMrxvqGsnFoZZt/nEY10L6UXq37us3DoK6YJxU7gJFajVpvYX4sV70YPmljy89DH8by1MZA2GX+0TFRWcDgpkVL0eCm5UArMiYgJBcs/D5DfqvxXtYjgNgam0RoPNRHJuRYr7oCzAch/mNGE7022Hiscs7xJ73QU2jiNpFe9/12myEXcmWfQJ1qiGSQdsaGMFEEl0g0KcNmidPgKTfESkYtCjjtTBIB/NI8DTTSjkGUTOX0/GoSyb586gkbc/ztN2p2JOCIX5cT6WO7TErhNtPbuh1lVY54G1vkoCIQ/EDfntUOv7MvRnTPEN6nuHOWMjunizW+6hmhVi/6/R4OxWn8KI6FMXbHMVc7bbNMFGrZ2AsreH6FlLI68CsGUVoQATtbCNjdQzP40fJNpNTkqkJ9BOPqKsQB6c1H+HW995QGq2HrfJr42Zv279JbYns2vvPg2wkel29PvvN1RFoK+91+QMd28qHhazbnAPMHc1vUMd5k3F/De8rUtYI37yc/ESgqcp8tkVQd3yEvfbjXkndl8zHkOTyN6/aWznOgyuJ4xm/ngTDCK+e7lbDHkv+QLt76n5sKlQsDT//mhoEY5NhI9mNYqzFuuKr/98/jARdDcJLJxnVc+buRHh43Sqk+TWP6MvMHQryzKY/i7mtnTJC+RiLneMwHkeWeTRU8fXRmjVidNF5pSNE/obRK/lyq62IiTZVoR4sSmz46KsXMiW1zxaLhPcEWpxx7Bk4r96G+nxd7KIRcJQoHgAxb8LVMzAHExQA7lCblmCym7hqaZwgXmvlHR9DwYarQsatKJJzkj2kls5CjCAKt26j8RuPz2BC56idiw1PDnv3K6oesnoEN2HV+uhtfG8Ts1QcwpzG8yyGHFOljuHIbJ6XCkHoITKXET9+vsoli3VGwvrz0tjD0uaCZgeipyfziq7m8VIL26mwIrbbs/M05lQP1UEwMIheK5eVD5bW/J3bcj/o5UF5gx8JhFQPRNpMlva0DO21Sno9SYHLOogAi+3jSwymdUYLPXCUeRPyNrnFwMd5J9u5mQZv59q2fEk4IHwE3eNe2lRKqDRLuekCeWNkutWvFtVCFRculeB94eRjfganWsWS511DPCerUO0P1BKrEdJmvKHpntT9lH+xyzyDbg6SjvVTwwq8KTmLpz3Jj9flJLyjY3LTfpZkktw9lmdvwGw2J2t7hgOoOi3VtEK5hSrLjMu4VOUNbAlO/42o8JzwrLYi2hmIJAtfd5/B/Y0/UH/QQ8Hw/134mN4ARJIhFlBjqb4qY1MtUTv9jyACQyw3ThBsugV0T6i9jVxbckmoC4F5LSuL/X7Qhrsf2zqSP9evgByVnqu3+Ihvui/Crvn2CcpGPVgXKDi7+1SLt+dUSLq+B+1R2vZXOQRzSSyG8Wd5YKMxlfnrBpsi4tykzQUzxj8CyCgZTI/gGp2kncG4PdejngLwVTAg0JY9u5Q== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0858cd9e-0850-4b0f-a5cf-08dbd77d6ecb 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:16:33.6014 (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: yRHAfe5rlDc3OA8tXZ1i4N0s2i35sKGHnY4IjAcGaNq46YxWxUF7tZJ3uiG/xYUEOTDm46ZWmiKuz0NrTMyJJN7TczTJlgouSMgNmLtrEtU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB5551 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 | 55 ++++++++++++++--------------- 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, 54 insertions(+), 58 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..1260b9a3b1 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); @@ -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:15:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133545 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 AF04743220; Sat, 28 Oct 2023 08:17:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 473B940A72; Sat, 28 Oct 2023 08:16:41 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2109.outbound.protection.outlook.com [40.107.92.109]) by mails.dpdk.org (Postfix) with ESMTP id 7A68A40272 for ; Sat, 28 Oct 2023 08:16:39 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bUuVX3ryGfYGV2/iyRgfgNTVrCItkfMITWIUsTbJOcH9fbsdnzWwarh85FWHQaCBX3wyCL8iGYetO4smq5T+o4EQLx3ng9HADreUo/UiT/8sQZuVyEOV3QS8lyelnSOtD8mob3LxDROaxbUqMtvxJ35RdMHQp4jSj0FIgyjrgir3kzx0HDIjQH/hc7mHAcMkhePiHj31AEJZLExezVbVbjA+pBbko92mcw+TnEdopYzV6Jfg16QPd04swNUOBHF+3wnxAbR+O+n34q2dYm79dgrcXeMj/GL7dJjBgtMP/DgC3inmIFOlNdExD6Z2q308qLC9RpGeW4mjoT5X6WyeSg== 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=Pn/RUNL7lb4adnuUlJRwjLrMsr8eF8KCBN+kVGo97D8=; b=JzT7sAf0T9rnfcPS3ecsirH01YMUQiRNY0/Lp41I0ydMwvLNyH2t+UGL6xaZeK5qex2a+4lvKkiMQzFt7S3jUTQRXueb3NaDYvHfBdEdMTzmeGX/6mrO52bha3gu2o2fp9ty6Sm5wglWiWxAFXtkNjFyT++e02kH7kA3avzanSOu0nKP7mm/9xi4L5gp7C92JZxDBevUXCdPaPB4TBv5VGDos/LA/tUwmRph6VhU18n5szIeavXyVGKN3656QZXYWVUgi6qWG/oCZQmvqob8Pb44Bc9PyGOkVwDxcd+8OcL/TzA++5RpuzT0vgc5BDwcv7o8C3lV+bkcTC34UdlDLw== 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=Pn/RUNL7lb4adnuUlJRwjLrMsr8eF8KCBN+kVGo97D8=; b=i0AkK2wrltYZTZZIwbR35l/JAWXaEA/aTpFnXxr6mJFTWFmSOYcQ73kl9x7kRLJcndXytPt5eV8K8Od7eiVXdj09WG6IueBHUjv45e700xj+wQ+0xPHZrH6NZVkkOdKJ6+ybCRerUn0GMb3rX2HnC0DkiNW3QszOvtKFxEZ5XKE= 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 PH7PR13MB6268.namprd13.prod.outlook.com (2603:10b6:510:24f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.22; Sat, 28 Oct 2023 06:16:35 +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:16:35 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH 05/11] net/nfp: remove the redundancy macro Date: Sat, 28 Oct 2023 14:15:52 +0800 Message-Id: <20231028061558.1842855-6-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028061558.1842855-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0246.namprd03.prod.outlook.com (2603:10b6:a03:3a0::11) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB6268:EE_ X-MS-Office365-Filtering-Correlation-Id: dd5f20c7-2b87-4cd0-6f1d-08dbd77d6fdb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Bx8gpJ5ohzUmJhoLuUAp+qwa1Dibhvf9VAMTof+nNTjsu7umNbg0QuchXK603hBD7Y/RBk7j2yxSpvNQCNxhFOzv0899Nk+LsN5pVXsMnltzrhlTIs3Fou/LgKMRARQGuDDlztO9xrlEh6MBaxiHK0RzBjd75sV9pL8fceI7E0J+LA15IODgkp4GMGDwZ0o664CxG2mn9XxS/wKqaQiqhtL00GjBm+84QJe760bX3CfzwgAl1WUO+sRPCwSO/h1QglxLI9fQ/d9UZx0Yt3QFbhagPsnOKGRMOuLms8f6vyH1bXIDXgaVjGFMh0DFvg3AGC0w0jBucPma07U/iRPTVnagtN4HL4XpaNc3jFq/cqtI35D3J3jF5KgmuYwOmGuQuH3P3/u+hOfcpldgFnTgow0w4Lqt0z8gFWxCIfkXrpnIA3XS2JlYVUMG8BDHb/WjJcRsx7N0KQwkKGYoILJAg7/ggV9sYcS1fmuY7uSx5xpLcGjGxVVLTYZERphVWut5cN3pBadQSoQWFz0rctOxutEAtdixMeLlBlk8iXRIwclHbIh4dvi6ee/wdio6yztyDc0gCMIhYp7Exo1F5N0LoxBxQS1kPHggJ56L0RBO2EDKKrHv6QMZzHr9xBwTcWyy8BN10Uv52dUdtQwVu+yWvb4Jxgt7Va69tyL1WHKGImQ= 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)(396003)(39830400003)(366004)(346002)(376002)(136003)(230922051799003)(186009)(1800799009)(451199024)(64100799003)(2906002)(38100700002)(83380400001)(1076003)(107886003)(5660300002)(2616005)(86362001)(6512007)(41300700001)(44832011)(36756003)(38350700005)(66476007)(316002)(6916009)(66946007)(54906003)(66556008)(52116002)(6666004)(6506007)(6486002)(8676002)(26005)(478600001)(4326008)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5I5BLqLIIiKEIk4sw5Llbvr7DYCc6WTZyfIVyI5dMXuiTCb7I1so2hqCvlErq+hIzZtKnqs3Sqq++rFc+fMRTXVkD+45bSbapVFm9g4Tr9k5AfMnmLpVVR22LCgLg/QfkzsFG+5AAeWXCoemhgbw6SttiQeOCvmgNOKjm+kU5HT4u87bNNA/I3na4mmekxCOx9NzbqCPstOuxf5lyzZDeWfWIUIwKuH+YcYw+a5M1JgxYRMVvQ/zZmUb0IC2u5JarVlrZlbkUTbRa159ZYYY7f7zY9oD2mKR79S1gInWVfwF1WwUfY03elg/XRDAXUWF1tAsKbja8zp3eqsqcIcYuR0F52u1kj3CaKxFH+RUiIPzbpskAqofLY9EZCXJbTXD5F2cOdk8UMTGEQLgmwoFWtPIGYmNASBdszZk0nnZPDWLxW7muzEvlowClLdOQzG1cYp9K/2ONQOJ74bU5ec1AzpnFI7347riKiOy0XpoIgBY1mIH3rVqhDPNDDhj1p5uji14IB1xgXpxgRNUogX+vT0h59dFhCipE8jEhYxbQllk3bKe4VNtK1HdoAW4zLB/atzZND7cSsEiyvCmn67DiXVbBNtrhlyAxU2MCdYP1gEopSTfvjuJQWX8e6HsFI7wnpHQCDdpEi7YM3UDkrpnO9fJ8b1Mi/gbvFkI5ebZAx/ZRhV72fQpzBC2ZLEeX5E3onOtMMJ5mFakGUXDnsaDuSi8dT++12OahzJa4/Y7FuxuN+vxS7v00JouaHa1rfLt1kq+B2A2cJtjdxqNySVIoeDvPiLDnq0sczBGXUTFusk0CYtq7csZKMEo0EelW3m2gb2Et7Bcjjoyjgo59fhWBwVaS1SYXJ7uGi/pNrL2ynxFhBKKzds7NqZEgrZL34efkb5UYn4YMfdu6sHmOupCip8pekHsOhFhhSbvmR0X9LC9KhDGWDE3v3G5vIk9NTyXLmsXMoh95Ld9Cgs7tL0CFTQc3qjygHztAWcVnEu8gz7McWH5qX6vpsFdbP97y2sZzyreYXjXZ8/IWHJ6XunzOXW81pc+T7fZMlliXzsj2t5UoRShPG+39PuOz/ICT2EQ5vlKbKhQusdF8MbpxcgrE+qbHej3VHUwT6vqlJ4aHagu8gdY+3sDz7PmVwutnVm1msSiSDvNrfIQL6D6jMKg+1aegyAqTEcpqbB8FPhjqU6pG5e5RK1nNs081sVW/3/FZZx2bSmLjGSMsI0F21BBygdBwX+7GQChDYOfu9nGD0H97wlY2+KX1QclvKfZdgOXZElYsBgldW6VMmEENWzvPPX6v+g0DzgMM7YwLU0n3XMddSo4uDZD5exHw6m/Rv0uriS92gDGn/7LRWi6oMIl50u0TbyltPyuN63ZXv/gymcyK40Fo693NoyPQ+hIWmT7POEt6Lz7mlN6fMAE3yZvZ5oyjvPbA885ryDRSdew4rroVEBm3cb+lUCfY6NJ7qpnuLsOGNpKlSb6Cia/Gt/CppH9iKV4t1RJegjVQdqrQwvYzyPttgI3B+a79wXVHJyT/FXOfTGnyG0wrF8b1zdoVz8UZ6MP9mPYqYdB6Zl7ipJ26OHJitsK+LO5E1eLbQwaizzEzosL9QbalmV0wxrSJA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd5f20c7-2b87-4cd0-6f1d-08dbd77d6fdb 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:16:35.3399 (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: 2+jQq2uG0xbCZJyDi6qQOrRkKm1LevKkTtAsPZy9pI6gROTPlk5oz3UZievmu/MiSQy5DuahO+pbUcu2lWMmGkA5e4IRhS5UvHW2H7th554= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB6268 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 1260b9a3b1..e3c3fa9985 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:15:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133544 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 579AF43220; Sat, 28 Oct 2023 08:17:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 31F5F406FF; Sat, 28 Oct 2023 08:16:40 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2109.outbound.protection.outlook.com [40.107.92.109]) by mails.dpdk.org (Postfix) with ESMTP id 357424067B for ; Sat, 28 Oct 2023 08:16:39 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jVhD5Kn51ItyMbD1jbo8d4MLIp+0G39RXtPjy50mtSbp/Veq5jXfu4mrZ5bjrH6QBaB2M4hbEN95hWkV0G9lx21Td3i+wCBfRpqSbsMP9tp8cmRIxH3U551RKaKmWw9G+9Lhd5mAv7FIGHNiGeS/oRZJmir9eygMIxWzOUVGCNIsHkWuVxQwp4zhuFOeE3CnXaDJFOeDq4Ku6Nj/QxbqJH+PsVoqry73BcH895eJJ/YhjxAZSPmNIpkDfCTmQ/pRpraY2mZe4SYy1rY+JGTY3cR0KUljbDeDpyuForvSr2f7jUKwLZERNfWaOYxQ2JU+ZHpXGUkWtpR4vGzO3M3pyA== 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=jK9IUWQaRVgejeGFJli58F1VYFBSXxslS3QJB6bJo7FYuwHpcM45HrY5lOiSykm1FUlfOnde6aDWFpU4oDGplEv7XyDjwgu6K2VFJrt6Z52PTxKGNhf/Cbo5IJspNhVEDkBveBTpfSFwmLrXp7ik6PnA4lYUjqQbN8JnDYBmu5RBEWWVtwxoEX4MLOdyMXXdwJ9mjfoHR8ax+ZeH/3XFiiHNqOmOeZ0pHc5o3PtiiJ57oepjifWFiRYM5JrEJUc+2JApP5XM3XcyiLjnejCKHyApVKllF6fNqdSzE3DRYanE9vLQWO9KFk/lqfxBDSBkfN0G+CSRXcDsYI4gKtOZmA== 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=Nc4L4ygcSvLsXsKTMDmkLKS/wRR6clXB9dSfSkMNuOvcKuw9qFboPNAUzaNcEMuJaOfFT6OZtkc3dJkDvl2ffk82AiAGHrHgx2WojRxelUn1q0FFKu32td5phdEr2xkGNTz8FU8MwgTI85RObmqmmskYnxBjPjhRuliNArzOlDc= 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 PH7PR13MB6268.namprd13.prod.outlook.com (2603:10b6:510:24f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.22; Sat, 28 Oct 2023 06:16:37 +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:16:37 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH 06/11] net/nfp: remove redundancy logic of init control BAR Date: Sat, 28 Oct 2023 14:15:53 +0800 Message-Id: <20231028061558.1842855-7-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028061558.1842855-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0246.namprd03.prod.outlook.com (2603:10b6:a03:3a0::11) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB6268:EE_ X-MS-Office365-Filtering-Correlation-Id: 191c80ae-d647-4dca-ef1b-08dbd77d70dc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CO9EDswBAlQbRgQf++MMbAHI5a7/a14dHsTPKjMPjHcsgrWMxR/DuGJzy+/+w9caWXeUoQEWfOfMJznHD0QyVbBO6TMsksDxl4ashgZnH+dW8IW9ZHnPr4IqTnXa1xv723Jp1aIHBrdZNV/uQWojGahay2FSKGgiqUtU6PruuI5ipCB29vKXZMc/olRlvopI2myktyDkw+L+6tGLebxXsd8y7QH3iOPCVUQjxfmQbcb3+c02fQOmIMDCLrP1xa6qF7m2bUTTVTi6bYoiM/X4c6mkuNqSk7bJoIGyYzoOEuMrogm3d9kVQ/gyXs4XgbljGQxCk4hU5cHTpJArZE/A2m+gFPNAWkyCTSWrxXcCPorpbd23K4DNSmg1xYw5VKbU5kVvSp+NKByLOutV5qaC3DlW3A2k+HKyUy6dNNn53eb++v2YeBGZk3/L89Moz5HU+laAaU747bw5rKED09WMlCzjbMZFnXBTYnhkbWQEqxj3K7ycNTilXFyif3BTmEFXhh/e/he6dpuSbkESCk4regUXhDpu16SN6SNLrhN48bchV5nSGKwJiHPFchGUfQETxxDUf+sulmmABoG6BX1fio6PJzb3+0GXnC6aQsQ2HVhvyvYqDT4Dp4pHm4XH4WIDmh4SyPgBWUiaU2ntrQDoi4b3w8wvhDfIOdzMpi+f8RA= 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)(396003)(39830400003)(366004)(346002)(376002)(136003)(230922051799003)(186009)(1800799009)(451199024)(64100799003)(2906002)(38100700002)(83380400001)(1076003)(107886003)(5660300002)(2616005)(86362001)(6512007)(41300700001)(44832011)(36756003)(38350700005)(66476007)(316002)(6916009)(66946007)(54906003)(66556008)(52116002)(6666004)(6506007)(6486002)(8676002)(26005)(478600001)(4326008)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: z+JdfaSNcAVNgJ/YWx8zRTleYU7zs4tNyYTRyW05OT1oUEztrZzI9Nh2L4GO4oeFhXnbOgu4f7hE+j8a2eDnheEFr97OWbJyTIjQEPi3KgDgZFf7sW8+XM9oX/KTFlRGleIw8dxWMJBskLP71clBx7fL2TByau6+zQBx20bMs9AapIfM6Gku80V8uNQ0uNIQcLdb+MX6oEMm3aWZEV/Im9aQvOd5bQfMCc58Ct45zSKa9oxrHHWN7CU7UrMZ5GOuYb4zWzU4HbfexZbjd9hhOfQW5bxBwlo52VJyEHZMgcQU1zZpZw2HGJ2Tw7HxYaT0iPY/15AL1ZL2fOGbE5u2lknWyuHokekJtsSLS4/Y3A5+KLpXRkNV9orsThu7K4/ts0YAKuN/QLSqrFfR1ORnJvHzHQtgOWGQVWwQr61NkMRuY+zlR36wRko2X8c7VhoOeM8k0ne4N1zZh5aNJiQYkNVJDZMzflJGxiax5P/L0wVkJYTtmaWzmzn8AjLI/+0zp5CRpThcvpvAuc/mXheMtmVMoklYHgCOoGBnW0SBrO2yR8MYTdBwuAUiBQXirICS4VRfh98jNY1jZpJuOo7en7g1G9sWTtuZvHY3Y0wM71DWud0ad95KrycXU4XwfOdzfF6oJZ41bKEhTPUCVPZd5U9ybsDjf70t+ZiPqG2ANMXnQmW/deTt5htXlYsJfU2rZgUP/7IcMAPxwIEtutgb/gcdyuVD2DWRHncsjWjE8bOOhDEBOmWCGCmqpRq2KwuektiuhNYOa6ObigzNHXObl9F2T5DgYZzo7rgwMGZwneDQ+tkKk631O/Z5hJ7vOTCven8ixzIlXuJOVhyU51MeMXv7a2e6f4H6/2EiV+BSjb/YDDlfohwa+352IEbkNuS71N5Bu7b+JXVYnA2wTuukz6mCdHE3mY9RM1azIlLL0snoLnGdgiq3OnZKjWGaYsHYKqUXfk534jBcFIsXLJMA1MzRGE5x23P5swFv9h584q3FUw6KFVOByyiedyEexqcXoTENgX8dHGqnhgOjhy8+iyaFXV/Uj/F2vomK/6+iZ9h7JYdP7YR5TO5Bczc8+dRqRdiuAe2t7wegjAzET52RAXgsYqBxQ0w58Ekeam8S9/LHdTpa3g5W3yaShvUSuD80yzhcHpDHNXkIGVlxhqZYBFIlbHxzskY1jQ7blVy+QY7V7AS+mTFhvWdp+61odHDe9+WEUkPCnXIc3n8+DYWlnROwcXOJ8Cs4hfSfb+rBrUJ0eeYWwM8n2WIBJzmJ9hB9XN/KEstxxb5u2E1HP0O9yY/P0xhqQoYpXEQNfNOiImALDjuSBjyPnb9lM+t04cplJ6b1LKA8EkULDe8mlFr5lpObSY5/mMRxypSm9aOpIx7gKU0BSM0mcu54Lh6iaYDkFjnp/9EV7zSyZcIzo6RyuPLp+ZVecsXuMBKVlCQO3jFYEIlxm7T5Aj7/+MOA+Ak1s9d3H2ffJvXiIqQKBcAgYQMWoeQZc9VIe0f0O7UhHUogdJVEnOI6dA9Yz5bb6kdZKiWn8tOP9ismj7Vxw+KJLhF/oF6t1xXVo5FPfBSj8iv2Z17bdsSw8kbOEjUDiy26MiQm1KC3F0Qe/KDEAEaFPA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 191c80ae-d647-4dca-ef1b-08dbd77d70dc 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:16:37.0662 (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: 7VIUyiHt6FmJlPb7Gi8hH8bHNT3RB2pM0p+j52nuqRqtlfUTiiM4VwD0LZmxU+NqLL3Ff8yYmcGp6lTgZoGjTBqam2wF7hOIRJRIbYBKObo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB6268 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:15:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133546 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 F3C2643220; Sat, 28 Oct 2023 08:17:26 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6FAB140A80; Sat, 28 Oct 2023 08:16:43 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2115.outbound.protection.outlook.com [40.107.92.115]) by mails.dpdk.org (Postfix) with ESMTP id 9E5C540A6C for ; Sat, 28 Oct 2023 08:16:40 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Roh7/koihmxXX+91kmZR38m/pg9ccru4Tm8N3nJHjZZoap0b1r1vaHjiuA5doDvnTvqrf/dS5EB1az2h7P+DcSBTLyoETslP2mQkVyFt6VRGttrh5Mn7WvvnFPBjD3SLipwgGJuFmFQiZ90nEcYaXwlk9JBW9e1TRXl4zX5tMZKSSYL5bjNgEz7N+3F5E2NIK4gmNOVyBW26JWUTuVr+mG8V1+FGtBDht3njSXKNR36IzqdknQlpt50j46uGVa3I/iXvFk+F8m36BU+YoszHtH2xh5nIw2wYtqT3+l/mQZe46scscbXPyALaNwDgZUQWeQgN47te6beZiEDgQaqdkQ== 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=RJRhKXo113vH2qTePPPsxX1gtSqqF1MemB4opIb2XURysHAZsiABv8mS6blP5FLhxio2Txo+pWRi611rOK51ogFIHcusyaO1QLhye/2+rQiK33K28yY6wmIP0M9JjqY3DOWLEdks/7LcK0MoD/G/NztKVkJYQC+DCh4WPlLJQ+JDIaK8peOOueeTVtlVTAqa27iRWmfuVR5jwZ4FKA6pX8bGweBunkm9UIl5abZ505T4ga+xJ2Jc0Az/E0m0zWOYstgMV9lF5f4/a3t3rTnlCgmfoTo3o0583hTCiR2wbrfrehh0oed0d9l49DfICVqX0BIp1mETSZL9fe9B/uTxEg== 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=wC0j5+XVY7V31Vri9vTODdJIaUljeOTz7OsC8cP2wFp8d96XQkU6rRQ/emNgrWz4HkqPGsMQwNImCBhHwGs3K/OmDUZg8N76EeicfWWvZC2MhIGsup8TN3j5OfgaiJtdc+Z6NlQgj0ml3Wjl4KhH9GUpf/cOuijA0p/or78hThI= 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 PH7PR13MB6268.namprd13.prod.outlook.com (2603:10b6:510:24f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.22; Sat, 28 Oct 2023 06:16:39 +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:16:39 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH 07/11] net/nfp: use the DPDK defined function Date: Sat, 28 Oct 2023 14:15:54 +0800 Message-Id: <20231028061558.1842855-8-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028061558.1842855-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0246.namprd03.prod.outlook.com (2603:10b6:a03:3a0::11) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB6268:EE_ X-MS-Office365-Filtering-Correlation-Id: 218849ca-75c2-48c2-52fd-08dbd77d7247 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HNuX/umRJs24VFOxanPpncEUE+W41dQ+2G7NaGyOUGclF6BoP4jiZPn1wm3V6RgZ7YoGSfexWTDRdNrYsJdr4KnDKg2xmQ0z6+gOIhj17RdNOiZxaguD1rFaUJEIhhxu8EE/jd4omUVkUxr8ihCdz4sH3QGhIN/HRh1WkNimwBKz5G+zPkmZWlTVbLwwajL6yLTmOfpxbQjYa6wraX+vCfVMXx16AA9AqJki+WkI11IxId04pekU+t6LpYLYZBe776audN7KV5/fd+aH5hgZVi6YicMWR22sEP0Q4Kd9ce8cdU/8upCzM27tmPby4/iD8cjppYBL4Q8MGYBkuYoivtzBiC6CBe8h0ZVqzRAoUACRjuOUkC0AXrjbrA82fu9tD67EnTGQ62U0Djxy1zf1+fAhd8UlHVn5n6ebL3LT8BgNS9N9QBSVgwIgy//u+2KTCl3Z/H/dWs9srts88Kd/R5dAwSZHoiEfg2tU10wHu8pPsFsGU6d0rsZVX8LcfrMDTjO5Gr6h47JociA7S67+ECYombbj8MincP8b8WLuG2WNg/iqxTIaWVefU21Yc+EDrDAfQL2Nztlku3IpXJvFnuLEND0DouSCkbJY0/Layv8kzCkp/tJfsC9qsfDYb0KAE+i4XdvbkNRe6CHbz9XpWBMzMiyAnIP9RiTupcdnuYA= 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)(396003)(39830400003)(366004)(346002)(376002)(136003)(230922051799003)(186009)(1800799009)(451199024)(64100799003)(2906002)(38100700002)(83380400001)(1076003)(107886003)(5660300002)(2616005)(86362001)(6512007)(41300700001)(44832011)(36756003)(38350700005)(66476007)(316002)(6916009)(66946007)(54906003)(66556008)(52116002)(6666004)(6506007)(6486002)(8676002)(26005)(478600001)(4326008)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: P0Ofe1lDo2BRgJBTZt8GIyPp2/t+dcEn57xmwVint0AKv/FWs07w9DKGX1/w6lUhgTlwUSvN4nE+mb4Y4QW0nbraO46Ial+2Bbmf7tLaZRkkwvLK426FZkvoru/dV7a2wHEqYEvEyFAqZ/DNcG1W6KQXQ0j2Il0Fnj2v1dRpl7Wtav7HfBQG1D2qeXNtLxbV/SjZmUQU1mWctLktdJWAMYo+BYvjX6HGx1ZynnbpYmF8Un04NLA3v6EFl7A7Klmn3RTRwoyHPyx/uSMSVHg8ZpyZr1IVJavJBy9/jL113DIkpL7r+NCT38MdPk9w9HK/VAl00sz2KR7E+QJVbiMfjZJ43mZQ1A8XxA1gxdjfeOhTBRjxHLcQmFfYE7Vc0kp3CI7hCSJ7jQScI44/B2yO+Tjr0RfAlJMsfe8d30EjJC6+lwS96GnVEWMTc1kmelOxfzn32NwHvWPexOqGi5k6jkn53aayQTrt87luCzipcgE9B7xEAX+1XHykxnfvJCw5auqV5thk+HNTxaTETlYJxugYCjG2E0LI+K9AmLLQyfAZLY68VDhf5QIueprx725eVlBuGQOrAM2sXxhh8+5yc9eSHgRSQc/oiYA4aKUpz3U8p/3knd0x7zGiuuo22fBTDY+WzNknMRRS0RgQUlJUV2N+UH/S02oGRu/g9+fRdgcKRTF4mq+ngCcIz6aN1pv13/iODyaIuLJqTmdvWc1vT+X8g2OBoX6O9X3SLDhc6yT/7EIOpoBJ2cjx//unlEcSI8EkmvoV9QRl9vwf4FTIJ1fWWHylGp5gI0sJUENFab+u3dKGT+YCDgEuZUGrbXJJHdDWWO5J52fHKu59sQTQ6F2PGoB0gTsiR4JlNdH75t+DfSuBSSRDxGu82UH7/IFnAHIIZ6bw2471wlMKX1be0CqFCBuKdtOvFUHBANBu6LpgMCUtHFDVN80VtN0MKw8c8bflmsT7DEe7GoPFWevMyZsGoXNhNGAuv+7ya8hmc4JWsGRQNkyHc5qIxEwODV6YlMuHrA4+cOiclrPcK+1156zMvqb854qUp4ek3G4bZAXn4HRFTpptuXNkaJhBLGjLiuFarIGHJPUka4wsjB+QIsknTa7XgrM1/BHIILoWLtYWvL8px6xDcWupQlMMoBlVd0Embj8ielug6E2NVY0cU/Hdw77jojPERwbZ+BAIoHUmJi4bQZIb+dnmK+CGyrrJ/snP5h/q19kaXbv381g+ef0SJXSJBSIizA+kbadDffH7kqRUwFOT2vP7D2UBxOO9SNFICZO14yT79p8/GGg7A4jDUD3HgNBDC6QeNFhPE8ynLGpRMrzmJL683PmuP6yeCznDZW8YAWaVuPxerQ4IXGiOvnIm1qxhfROjx2LdWeOxTFjioqmOlesMiYii7kbZBwwPchqjFLGAK/lPN8+O5wF+9kSZBdM0thkhgUBZVyf0+X05JheNoHUr8RJgDVT6PUTgEHCTBBpQUeivpQvZ5lTwRDaKxFStESZqT8Pr/AslsmwodrdbWBhP61G8TI5x3/4x4C35eniH7bTIqWX1QULQM6l3GtEysM3xbLrVRdd3GP7sdDN6mnmIr1R+7auI5PlqV3J2bg0vO7bLPYuOiQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 218849ca-75c2-48c2-52fd-08dbd77d7247 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:16:39.4024 (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: 7MrDvEHJr98DecXaV07aMo0rjbX9QsraTRj5wDLAsX+yqROWmTxrNKElCvbz/KOq4L0X4OlFe3bo7YihbtFpOFk+K6kDBE3q5ES2Zn7OXIg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB6268 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:15:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133547 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 A9D6843220; Sat, 28 Oct 2023 08:17:33 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8DA5F40DDC; Sat, 28 Oct 2023 08:16:44 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2091.outbound.protection.outlook.com [40.107.92.91]) by mails.dpdk.org (Postfix) with ESMTP id 89C8E4068A for ; Sat, 28 Oct 2023 08:16:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NZ7CrAKOLqIQLlEG5Vmswp98LufYgKt+fqoJCzzMet1pebBwxOe2dtvdnscjtZT0WMAQoX+lG4kLndGKt0+G6FtZWWLjmoszWHkzIkxNCQFKdNbPYEtFQJHBieb2pAwTauB7W2eGXVjxNYptUhEUsJtbYzqd4pml3Unj1M3KXs7GpFODP3ESW4CO0y4Am+SD6E4lyXaZSrGBKXkH9mRm1KnCvHg5izKFU+EwdNStdUbaQvOeeVxvZQkj2CKeIm8GXNl8S/cJc717w2uCd/T4/ftBTYrnAzDjelX9cCni5MFXRhRsTm5YZl1wbBI/pQJfobcgJnMny+sySn7v2peLoA== 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=cJGhBt+Rz5AG+WwmTKx4Xi/cR9nXK4w7tf0Errj3GiyCEZU293NEnxPhcud5k06JzaPzuWW2OZ0Zx2hDKwkQ9Jbl9msxxq8Hvg/VC7EdQl0X2b2Aq1IwtqtE+8AdoBhKg07xHlLLRf5xTalKoo62mK4496pZMXq7CQn6+LoRIgFrV4JDy8u8lWftXH/zfWTpckP+I0gUwzdQ8JjuvXKuG9wKFlqB3Lk4zLGioz9hTPeFkc2G6TiGIIscl9lVuppFejFkVEnkH/QSgZGfzF2Mcpwsl7u+lHFOjHUUhV1C9jD7AS+93+GFFDa87RGzQVCROaisTr0K+l/slWCmuEQh8Q== 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=Y3Ky28TetgmTbwJ+EQwBsEwrxz2TlzGFcfHZdaIlZeElm/JkCs5wmtTi76MtRuTsNo4UJIXErAkmw30DdEI13fHfwO8cJqwfkeKiDFEwXOVU8aW///pAL6o8nG7bZAeibZQLr612694Nage22RTc8WJIRPekUBepMsM6UiA7d2w= 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 PH7PR13MB6268.namprd13.prod.outlook.com (2603:10b6:510:24f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.22; Sat, 28 Oct 2023 06:16:41 +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:16:41 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH 08/11] net/nfp: replace hard coded value Date: Sat, 28 Oct 2023 14:15:55 +0800 Message-Id: <20231028061558.1842855-9-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028061558.1842855-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0246.namprd03.prod.outlook.com (2603:10b6:a03:3a0::11) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB6268:EE_ X-MS-Office365-Filtering-Correlation-Id: 4017954d-61c8-4644-bccf-08dbd77d7354 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w4gdBrq+LEX9JxNqdXR0jaqxAIrOoqTDO4I7Lx28qvYkUY82T2/Gl0ZetCUDh79C3VORPynrqIvIRyFktfc3298So/6zq+ki79eI0o2A4+vHwB1pFwt62i+N/FFpI1XlmsvyoTsnmSLHbczhtmrjUgdTpVl2Qmu76wVieHs5Pb+lGoEFGGzLES5bp46kzT/Z/zJXVA9GmdbErXOT197mFnf6l4Ez04FDJU82NJmT68GmDFXlCUFARg9swYQWhx3ovEjhVVWeTgwTh3Ewn8ve2CuI73xVXOrWQk/Q6pCG91PtO0qfbd950Z/at3+5Hrb5pApYeyn/+xxCubQaDPMZL724yqUVfHSZM1npNlUdCyvEElRQVop4UyNk9uyuYziveql7Y6dr8HxuwSLPUHuaATX2i6LjJTM9CbmPu7ttduBR1ZVqDfO2NPP3xIs8bje6gijLwjuqfGtsG/Z/vnUv8o1skX6dyL0YrCsI2wIHdbHr15sh8Rwy9AYSJAWiRnzX8lXl2C+PqaS5L8UJpeM1ZC3nhtadOpxSjf/NsCy68413UBKFjtLeSNmiyFObrvcBuzd9mFDL7ezIBEQbr/fxFVPCP5YGyLQUdVu24WTJFM5y9onB7s/DsHlaIxW7X5H3Q+psUiRwb0szfGlneOATWty5Nm2E2g41KCyTChHlEWo= 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)(396003)(39830400003)(366004)(346002)(376002)(136003)(230922051799003)(186009)(1800799009)(451199024)(64100799003)(2906002)(38100700002)(4744005)(83380400001)(1076003)(107886003)(5660300002)(2616005)(86362001)(6512007)(41300700001)(44832011)(36756003)(38350700005)(66476007)(316002)(6916009)(66946007)(54906003)(66556008)(52116002)(6666004)(6506007)(6486002)(8676002)(26005)(478600001)(4326008)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 033aJKp80ylbbjPZXtvrKyoCcjhXAZomhqbHEoeaMVOUeZEp5Iy9qLSo4K0sXiyQgYpE4pMqZCSXCD1mz7i8A5fry8dQqzplA2oMR4nmjyZLZBn4DnPZPhTKNOCJ6u67sl+jy66XH4EEDUkd7UjasTmtjWmkcnrfJq+KV/csziDm0muPRTCpiC4Vd/AKSka9g5tjARmNVnplNrtCJwJ8bBL1lA0kEkFuAGLbuboT7G52h8VS5TjJeJNJX6PDYmoQaJaerIrFSB5wXxzXeAqZuKAoE7U7hGWMt0Dsn5pAxt/prPOG7ld0TeqIBvFhuxylUv2n9uCCvzAmNhAv1WM9eLAcVQuFAaqtT9j1t7wjURyS2C0juPeZdMRJWwCzKz9HOPYQJdhxwyhCpflQ9D2VQyxsY1mlcR0RuBcv7/xE0teZdw6gOEGxY/oZjy7BuUa4usPQ5YUdzB7Ono+qcBURzivEGFvzYVTINk/Vp8Fl6M3Hx+jAL2mzYg1h3bN2RdnBsJe5fx3AgGae/9fmw7FY2FqEeTNMygM4T5cVFWa2PklLhG2EMNSLTp4rd3gV3PzBEX+9KfYOuVZW6FMRhsHzHpsMr6wv4hgaK3Dw3+9Um/tf9ewRTXu0eGsSB+uniXzY6n8s8sjgDISa3GVG5bJkkiq/vSeCdmRYXbe3GBaja4K3aD+pbwqidIPvJRUIv9N6CFTKvkQaAORZUvdaFTM93xBOh71kJ9EUp/wa2Wg5hHuoQOdXm1ol0Qr4TndYcr/2fuyfaoSZeGOeFm7Ea651ifMkssYy3MvJ/A0xDtr+JVk97zfL5OOrQv8lwOx5xizRSgwwiX0gbX5el74WPwF0MHiHQjWhP/y9qUmQMLYGPf5HgZWNV9ref1e26YWcM3N8byQEQNxqIFMoFcLHCrWi8H8Mq41QJ6lXs4jPmuLgmBPytzl/z3DXWpoJDR3uJ3Uylxokx7vmxc3e6wx9d1rhQlU9e/yNPWL5wl1mcL71rYAyJT7yoJ66oBl6G/+GTrK5ZX8ZI9B0dgwmVLJxjJISujoTSn2uXlTpUI36Zh2EIBbyCk4VHFPyuHkbYaceG8KnEfm+wu0g485HvAIkzRlzlqLO8dx6woTM5dR5kAdnsNXQ0fMHhGvI32JOb4TndlVjszx+JkB+9h6Lq59q4LUmrHJgaJ1NTH2PXtCBAqcjsawKPhkfaAKAUcziisnsO1v3+C7hBGmWknJpFd79XGDay7dYuUpF58lGa2kNuv/52pXkaFBMHY7GG/NSy9uVLj5de9czswyLYvjCEiasmrlljWIS+/1L2dxrRavPIouGK5ciUPaTprrx/4K2Qgd9X1Xh1JSn4DGREHczRC1amkmYQTt4xk8iM/D1+ycIsQBm30Ig0ey9M/5R7kF7YBZ6DCMA4kq96DFmEOVTsUR3FNNHhWZ438jW+89sC0GJ0m+DH0DezTt3p1g9qKC9r2LnxvU/z5oPvZOrepryH6eiN/zxq9N1fZJ8tXl/N969pXsYjOOOxIpKfSXm3F31TwoRrW6DsZkPUWq8bhOINg/EATCo0BGxC/7tauhfatKn9bn/ZfKffiLjneoz0zh5Ax/zHvylBV88/Zw25yxezTGdhOEgJg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4017954d-61c8-4644-bccf-08dbd77d7354 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:16:41.2298 (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: YwoY39WmOci/8dGMlRAAzar6BEt1fN+5s4FLwog4gp70Q31b7hbzf7W4NiIBON/UwPZqYWyIW+rya55LKrkWcPDsAbG+dvO6EdpGm+ChbK8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB6268 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:15:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133548 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 0D5D643220; Sat, 28 Oct 2023 08:17:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3829140E25; Sat, 28 Oct 2023 08:16:48 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2109.outbound.protection.outlook.com [40.107.92.109]) by mails.dpdk.org (Postfix) with ESMTP id 920D840DF6 for ; Sat, 28 Oct 2023 08:16:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LGskYktEaaRZIGvuzjOU3OkIx8HopJfkJi89Jq7gfV3ck8F7qk1Il8hvMbAtHmgUjBHEfH6rCExfOLb02nSAAE2Z5UznA07a3QmCdIlhXz6dPoAf4+dMsTITWKxZno27a8PBzt1rlQcoEFcTzGpPJ1U4327taeWF3AGdVFQBHCM4Zs+RA6ZonFsWIdFIPc3afxBW4QK9JtQR9RQHYNyW0JzxA8l4UddcK36Cyx1JlItbuHS4p0UQ27lBLAl9yChKj6Y05ZOTb+x9R4I6VDiMG5QC0mjdJhR3xL/8ywgknn8T92QqLmmc55U8jXox15riHUgCPr3vGfWh6zyRgvlmHg== 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=P1hUyI5YAkyEkVKSqxuUCBEMkctL3wXXMut6b7wq4lqHXz+3Btoi5/WoYVCSy6oxrbZ6/+dpB69qww6PfuFiuHol1EobEPPS84PhX4XzuB+XDYt4Ds5WRENEGV4AnwRPgE2C77VPu6XKzw3k9k6uA1HM7MHjbNL2PIbWaL5kpudx0fJpavdDCx6fW0XN+cXyNwTiD5hNKCMLomugcCCdgKIpzSG0B7+H7rdtJXO/bStm6Az0kVR+N4INXHpkGun5PmwLivSOlqTJorvK8drQRVsofOY0DxWubiK4FDF+MiBe255GJbxaFkCPY5L+RzbeTM5KN96tYwa0Sf4KrOOGQw== 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=K+Cs1ycHL6rB3lXTCGCTcjPNReFwYp4bjt6VBbgcBZgWhuuG9eVGRctZE3VF6qUFjtBA0CEpo4+aIEsV43jaKmorRQXPXLEqIJjxfzCNS+3IMW8a0X6C18/0Of0MUnt5vnTGgGGVAHlbBhjanPBqNelFoadrPbv+3WNeKVeOl64= 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 PH7PR13MB6268.namprd13.prod.outlook.com (2603:10b6:510:24f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.22; Sat, 28 Oct 2023 06:16: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:16:43 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH 09/11] net/nfp: unify the PMD name with macro Date: Sat, 28 Oct 2023 14:15:56 +0800 Message-Id: <20231028061558.1842855-10-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028061558.1842855-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0246.namprd03.prod.outlook.com (2603:10b6:a03:3a0::11) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB6268:EE_ X-MS-Office365-Filtering-Correlation-Id: cf952f6a-ba7e-4d2a-9d1a-08dbd77d7496 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NvfR1IX6bw6o1thZVLPmOVUTd2AhI3zYAnqLFLPbiKPBC/MebCOWES82FzUNii/FFi0TKo0Mmxk9jDjdUO2dVIAEWoHu4SDU/lMGKvBrg/iqHI4cSuwtSLS06eC/zzHzbU0V7yIzFDdCkvkAaf8llje6vOEjUP+2aft9nsM9RCLDv2b3+Rx9WZrmDVSElqDcyjTGa5QAcbsIqqwtqKmwZgLVY0EBWQde6LtnXlulOhM9nV3gB0OTvVKQmYyFgMlkYICKV8gSE9wXx71ERpE9P30Pn4QdMZyyVhNT1sjQNsRT4WCEpLyFejVModSOrDJhaerY8FsqnmvMVP4OIbtVP1o3kEylbSz8dBMZ7cVQzqEs3+CbYW6xkijfaLmnJrqB2jU8kzkuZ8aPxTC4JmlBbtVGSFIo+RdkxMucTUyJPzmwBcMWM/Cm+P6ffVBNY/Ea/0HpoVtH6r6cN+Ob7J2vDW+K5vKjQFEaRCiiYqImUoDHqvoLKX3Sca7QOihSkYfOlhtX0R4b4BDy7DTGZ2veVbGATugWwjKoTH8JWXpMUJX81Mt/UmyST3lLY+nNLLqNqmohXl52PL0GdZ81EJ9ONh+/fo+lzMvQyUioGGL5lCdQ1VgRiU1SFwSTWmsroG06294rBrpJv2AZTuZH33RWTaWo+rR/EicERqrDn0yz4Ho= 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)(396003)(39830400003)(366004)(346002)(376002)(136003)(230922051799003)(186009)(1800799009)(451199024)(64100799003)(2906002)(38100700002)(83380400001)(1076003)(107886003)(5660300002)(2616005)(86362001)(6512007)(41300700001)(44832011)(36756003)(38350700005)(66476007)(316002)(6916009)(66946007)(54906003)(66556008)(52116002)(6666004)(6506007)(6486002)(8676002)(26005)(478600001)(4326008)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KepcfKPKySmyl9d1tH3kO2yij3EI2KchnDVpJKws5HEqjxc6Gw1BF4/1v9mJdUhG/4DmEgMBcmgtVwj7sVMTsv3Rqmapfs3lmaFYx2eS2HtWeoq7EpUO4at/MiDYM97Uu2ylenpOzky9rGoPkyiZi0OG7Sbq+BmdSG16oxUNAHeUcHui/Q3fxcoQ9nUSIeWeZb2rn9YAaD0St/iqqlkx1bwNTegxWlbtydL7ZMc4naKhp/532EpWiVkM7Q1gWAWlFiQ4pCutAyFZVvWFUyx5KFMmqHtR8WDAKsNNCGNCUrw2hc/P7M9w+0B4h4MGUIVvJUHYlOqW22dnHudK4AWBrCfjPWYozppmfJWqqR9Fg1FOoSoa0PWUhoqjcYjRyTmT/cou8Ct3laJVy+C0XGyOoDiAQKXZ96AyoX3KzRtQKvJGNjgx1jqGl4xZ33XekL7UB/8jD7Yv0eRFNAb8CR+11ckR9YxS2C7mKofaU/F12lL5kf93i8hG8hWDblaGH4Ieae/Sz/oQuWmNDYorRFpc71hgsgCxtc3TE4nVodNe4gMegWnudisSVv/HFnn4juzuedcgRFR4ZDbIHE8fTB9QQ8/ddc0NIj90tSa27oZOuAP7HJ0MM9t+sHfaKQCen27bhe4gXA11+QXYh9DsNeR6AzEnNZFb4GKDranBYu2eYYbMLp9SxHujpEGFmvnjafzSe82ouiUp3QUaI+x52GkokDTv2B/6c0dgqDbOJ3QVBzMFreaMYsCch4OCRqWLITQ8wJ9Epur9L5yoVnovcJpA7ZYXyojPkTyDle+gK+WLZTOpbxVIYRp2d+rsG353v8iqc1WVVB+O9Wvg/5FW59G6moNhred/7jhoVm6yZoxXMrPNBvwp7mhD5so77Wo2IENrOAo0eKYplkxFlKmMqW+7UTmjAfE5sFVE3OodCjcUdW9Akqf07KbNaPm1qEBDcBSWVkviy5Wn7Ph5HhpYzIDkelVB7kVWAhwveAMRpyBpNUm2hEd9dkOcJP+rkfQNAvGtzUHvNJE9EDXdlfSl+/U3SrwvLVVGJFcLU31dThyNwVp0eIymYfpQ4nJEfX8wzW4jecolQA7Mu/s/mr1EnC/8U/FS/6HIeIMfCdLXbLxw0GfIlNOvNru5kLkaIVsmert2R4LbB5+KsYTHyiI6Pu+vlz7Jw38YjwTO9YbmXeYiHRLH9kKrR9eT68djqqY9P9auYha7m2Aa1yiNSV4YY4XnNt6Mt2Gx65o4ih/iaoYSqu4OxrFZ61UvnacIMaVKWMQxN7h2Vpr6cg1FKIqvsaaWfVIqvWtGMBdO3hPkv8wUybgeNlEzWssvLkDAeoHEUYLZwcWeDtv7LGYI++Pp9wHXh1YC2Vk50mrEw1KdYVHyqe5hsyR1p6CgWqGXYmhaWU8ui7ZWxe+ETReyyJSFyaGtXagBmlRmoDKGATEZxi54A6p0mnZSflp5Ocr5CbxDaqg4spIROgjV5FbH+o4whOUFRYDYGzxbuDJ5m84wAjwdwgYWxO5AauO7nl3/EOnXYLUTb4ItrMEfP445zcLLY0TFQWqO+h/WjyxzCnVPw3twFhDyT8Do6HdQGk9b/5mJ1K5sEX9fKboMWlkxoU253Q6ywA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf952f6a-ba7e-4d2a-9d1a-08dbd77d7496 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:16:43.3141 (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: x6FmbY69lAAeY8/Dyo0tSHzqujX+pB0W7VGRPXPkdZNmLBhbKfUAIpWqSU2oNz5pIHRDMWV95F1S5VnD09OeHDEHVqBQZqa28bpa6ZDtAMc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB6268 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:15:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133549 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 49DB843220; Sat, 28 Oct 2023 08:17:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 86EAF40E2D; Sat, 28 Oct 2023 08:16:50 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2091.outbound.protection.outlook.com [40.107.92.91]) by mails.dpdk.org (Postfix) with ESMTP id 15BDB40A7A for ; Sat, 28 Oct 2023 08:16:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D+ecey2jeW71M02C/oYEtZr5Jn+8Kn2Q6iByd0phXipKo/5gdr5mUBxHZ+dvJnO53XiBMsVZ0TGbabjIOevCvRS04se65HGlEL8aoGE9WfVQwNLbS9CeFaC8wk4QMlnAA8IMY/+p3TELxFTFeriT3how6SJhi9YBCnX/LIuuieJaIRpo+HEmRPFOr+T+ngDXIFNaZj9bzhumUqVXVSIj8U4MWPORtZ4bgs+1FEEFR7IjP/P4o8X6iiDULzKfgiSe/yi89whIYMXoC22LlC7W5mPwAoES+femzCSkeJZAAZ/5mXbAXTZX5tjAD0aBCAYhxHELK9YlagMyztZ3AflTPw== 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=PQigPAiWim0+bmcoIU2urP+6uWNTejjBtHXylQfT7Do=; b=RSJ8IULWhBhy/nYVtAe0KG2Rk+U3+lW1tES2a6E4uTCWOOdNArziUY2ZjpodB8RDdVQUyTgbmCwckKkRJUsrDLi7/3KMPlDLwPfQAqcXN0Xn6Rnv5RtIvc065jNFjeE0B/DqYp8v0EFwyiCf/ADc+8XXEMGL5oWoTH6EbZm6eECyiHyq0puLNb6xR7LhZKPgaXUnAsCLvP5EFtxyVLMw8sL1k/u3NxkKaJfckEUeswh0nQGva+VB+Uz99AIpUphWEOPdvI6TZVmc1WEw/D0HbKnfyy2xe75er/IXewMbdk4dx6PPMiv0umgAyV+ZK4ea1Jbke/zp0Xmqqi5MjFYKxw== 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=PQigPAiWim0+bmcoIU2urP+6uWNTejjBtHXylQfT7Do=; b=aGrV/sVivSGD+U5Kg6OOsmWrOYTVekjTxsBhhApncrEDVAlfqqzRM9qGOkjeYhYM1hFpCAlMkV6MbS2mltfSZC/bXzWlvKW5snqQZoJNohh1tz63XOHSAxX0MLSMwV2+GhlEM8oJZACJYhOOxaJgfxNfN3SOUOZbb0hIku3xJEk= 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 PH7PR13MB6268.namprd13.prod.outlook.com (2603:10b6:510:24f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.22; Sat, 28 Oct 2023 06:16: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:16:45 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH 10/11] net/nfp: extract a helper function Date: Sat, 28 Oct 2023 14:15:57 +0800 Message-Id: <20231028061558.1842855-11-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028061558.1842855-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0246.namprd03.prod.outlook.com (2603:10b6:a03:3a0::11) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB6268:EE_ X-MS-Office365-Filtering-Correlation-Id: 800e64e5-8be9-4a5b-06a2-08dbd77d75a4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: odswahzc4aqqIPRzgEVRJBmwAyoy1fPVC4zH0YmiTjb1WSKaIwpzpeLor08Jd5HcaT5wW0Mi3RXr2zti7UdRAjpl9+Aranw21PK9qxK3b3SBrdG1YUlA6dS70FvmEu33MLv2XWbzJjxb0+KHmcXe1VS4UAqDQ5WBa0EWB7GK4CAmB9kOdT6x5dKtpdwgrNbKz54Kd4w5qUdsKtdy4IrnDjnl/QbFscEkgtEYXQgOGpSjwe3/t+SHsQGC4VbW6SZvHDrZ8gYSOM8fOrU/VHQmXeZZ6o6MZ4sPyov1HpYNvWFyxFodkH/JUut3LH4p4IxArWbibkVt0N7DsnaDVFi55S+8vCh1GA0alG1kzqxd0VVjg+TSdHVt/rbO9A0zP4HKifb9OLZr7RrJlpV1WeU4Kg7s94yhuTFDfaGV8tWaLlQE5NF6mtzbaId7+/38whAmQ6QOFDvMOt9Y98NWIi9npEP+Tm73H4D9cCP6CuIAl1PIS7MKcLGQ1rrCkp8J5FrHDWPVP5yDRnKiz7o4XEvOpEjLCLZ7Gyy5lpZ88D5R3+d9oBpmHETeutAEzNxmON/qeo4GbKZBO3fly3rSC6DwxAPlDPAP7ZxL3Zptq94o+jYpbUiKmO0GaEoxB1khTA5WY4whX5KjBezqs0lJl2t5XU9ZytSxXmuQ2ZrWxGD2qxA= 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)(396003)(39830400003)(366004)(346002)(376002)(136003)(230922051799003)(186009)(1800799009)(451199024)(64100799003)(2906002)(38100700002)(30864003)(83380400001)(1076003)(107886003)(5660300002)(2616005)(86362001)(6512007)(41300700001)(44832011)(36756003)(38350700005)(66476007)(316002)(6916009)(66946007)(54906003)(66556008)(52116002)(6666004)(6506007)(6486002)(8676002)(26005)(478600001)(4326008)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 33MXvIu22r2e4poYokgFl2NKzjBb2kVosO5leTRM2hm9LOLvM0sJjp0v6Gjz3iGXL0BidvBDjiLF1nJVJ9v/i70+qWk3EewV1ikO3f5Mqsdlkmg59v6d24j9y2BVV4506F2GczIyYJUboZhpLdWvHjXox/DLWsinBgY1Rqj/iirOdH/8pHt5sfly+Rpo1Z2f9V5fl4+nI0YQFzEgKrH+JUUFu+UEUQvizCdp9+h+AnakfQt3BOWxItqWOZhrMKPmTu/aXTjrvd+7Vb1zTY6F+V3pRBP+z4vgL8brWIWFJPl0Y0zloQ66kWrIpmVgeF9J+jSkCryTuHdPrHwilk/SmMEQdsHgZRtY77MX1IWylCSKh9uJAjGFDjIMHUD1TCRj+NWxsluHyfFr4KM9eJeDMlE1Iw1OuvNJdOp8uWwxLoi6fCgvHgQCPPvkN0rNUurXRO1y+f6OQ3wx4/ufW5hcH4pHmyKwmZvZyWT4xHCimPGQn2WD2vOokrXMsS9BMBdPYc0QzY2Yc1if7K67sYAXCPrrGZCPIzkCbIZlvVqiwS1zL+1Cl+xUUQ46FoCtWW6Drh29nmv+7FXPDi4YoLVAyKAgMLcb/LJW/Hw4JqsbtjhjPLf+s2wcymXRaEyvfTdnxEU1fqy18fE2ILgyVm4NKTke/BsAMOGkzxg+KPp0gD+bMn4I7UceJBmcBIjE7dgseGUWAQz5NKR4qYJ8fY9ZYpJZct6Scdsw1jEsTr7ALZwnxxLFpXPC7LIYdfqPl8vfVdvgmjgEfhH4hFCR3IGnuXrIDgiP2GbbOolEXdaHCCfZ2FMJ+iLz9M6WW3FPeAGf/Q33jETWCCgiunHHzRLMHX7iC15VckmkfXyKYZ0ON5fL2u9w5mfAnVjKWv32IS7Q9/ujo1Tr2m8XH1X1UR2wYUB7SftB4LLp15m5myhC0xtIy4vMu55hi0w3bjsoDnGeF/UxYZcuBcwNvw6WlF8ICwz5uWe+QJwGvTY0gf4jdHo9oRl0FNZd/ZJndti8zYGoXSWTWZJDiIFiHTEOIdX3jjeVQ/UXD4aJbQ01yDxPFeArOYMzckuIiFU8j0Kz/ZgqoOE7sW8v8gOVQ9aR9cQvMa73vnvKEr3/1c1wCXKYacS8FgEn/yPPEPJQn/27z2MtjDFDR6wf2wvx/DYNrZveNvNmAJHtY5rvfHsQWYjFvPFWFOMk7HD5eo2+OAn9SgFgT7aRHyPOJU/7cC85IgZhKV5Xg01GTWYvNMg1chccWc6b3j4K2jeVRB9/DmXOUgipTXqhVxYnvEnjqDuvKYeq4UGkgBU5wFNZ6YMLRisboGFLI8BYZcJXeJE7cc2/lJSg9IX9cUnhIpHpmTQIuERrjOSbozOXhpkDMAchSdW5VPRU1azUPhRGIlnk9wi/5g2EHIti4Lh4emWnE4yWLXSjPpOzpzU+Kl7p6a+9V0+mSehf/ke8ETKtxVXJWki4OOTDPf4LL4mVCq+A/TbRPoe49iJeTXguOI3yFF1Ni3WUFTahJ0zzG8EfBgqPj7h8VWFB6TOIE+5In3P2Jr/7c+6uynhMfvxDDcJ3xZzbYd46q3CqQPWIc7c8+Rm9pC6g7dT0ObXpbOfoJFeuzeb/ZbnomA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 800e64e5-8be9-4a5b-06a2-08dbd77d75a4 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:16:45.0627 (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: EVxeWVcy83Vx54zCBrwInXa4LMsc0kZ1/O5zSP8CyIWK/8OXeN9MymnO3k9qeSK9NWK4G9FMtAwmvWq494dgWEd0qDffMSWC9XbpZxF3PN0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB6268 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 e3c3fa9985..6abd91965c 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:15:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133550 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 B450843220; Sat, 28 Oct 2023 08:17:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 09A3E41143; Sat, 28 Oct 2023 08:16:53 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2135.outbound.protection.outlook.com [40.107.92.135]) by mails.dpdk.org (Postfix) with ESMTP id 7C2D740E2D for ; Sat, 28 Oct 2023 08:16:49 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G/YOkWdKxpQ/pED72m6thQFcnj3tbCL0HhNcTCxWLzG+jGj5vEJ8zih9LYadO+XwQRymyuOe1KnCNbwGgveFQazVpRAAEm3+ZTEP8XKLjkrNW07VQmEHnX1rCl3zgEWlVNbIaAgUbMBB35JbX5FndnOcrGlWAOlTFV5ApqaQOXWfGY3oruJCln9zRrDTDqCEvtYIJ8FZQ5HcPpfPRNYx/l+JL9pOHCDugAsNx1GkQnkXB074sqCD6c4ckcHJeOa1y8/u+PBZIqyIcGSkTycpy02Sm91K9KCcufcnbhC8xy6txQlEqNYnpcQyBvEsUgfoaIOcyUq8w/08v+v8JkbHPQ== 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=Cvqlu2R+tOwcHb+qvQF9JkT9KaKwZojpLEiw459iCJI=; b=VfNmkEPWAd9MTkd97xCEXSyzYmkJTtKiGiw/GhupM6sZVZK/F3uDvUILeH/NoPyZuUaNoFMYkEmB8mJ9LwDG+avhxCAkNnzQkoMq3FSFHGVEwoUEGf3QNHfPh/CAxEJcKkhgeul4R+gC9ftZbcOj75aC6b0rsWl2zKQ7F1cNXin40ZFL2h3Q+kIid//BfsB+S7ogmOouBJg7XY/CdTmuuOv/Joev2TfoSSi6ddmiXbX9YNz4+2OG885PCZAjHHCbbuUdaoDd0FiTr6lg1XTiv3AIE3Exa9y4XuFfMRAqlaxfVja3AksG85rjf6tEZa6G/sEQX4qXalC/tVQV1oQkmA== 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=Cvqlu2R+tOwcHb+qvQF9JkT9KaKwZojpLEiw459iCJI=; b=O+qZDU7nthWVi2zgYxf7WGDas/3J+5epakxhzdFsEqz5EJYBn0YA/jNKSMMI38xAX6XkypuUK4UHJ/sWLd969iOZURJpZZvVwYL0aYyMDMmS2BzdhMJ0FKPiIk74z7jGfgJaldHkMzzdCYX1ncTMQjakpaWElPv5cED2/hEw7RQ= 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 PH7PR13MB6268.namprd13.prod.outlook.com (2603:10b6:510:24f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.22; Sat, 28 Oct 2023 06:16:47 +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:16:47 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Peng Zhang Subject: [PATCH 11/11] net/nfp: remove the redundancy logic of representor port Date: Sat, 28 Oct 2023 14:15:58 +0800 Message-Id: <20231028061558.1842855-12-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028061558.1842855-1-chaoyong.he@corigine.com> References: <20231028061558.1842855-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0246.namprd03.prod.outlook.com (2603:10b6:a03:3a0::11) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB6268:EE_ X-MS-Office365-Filtering-Correlation-Id: 494f0153-ca74-4864-4743-08dbd77d76aa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6qKsNDd3FZ032PWBMtHiUONK/FZKqt/azDyJlFgkXtFMW43rTZ55Wh1FEcIyvXTDj023bIyDZdrr5nSR93cCsfMrGbWfde7mHxxjfmxQjZvjpvS31hFoxgVVsYT2JwxZmcFoK/Tsto63IO8pTDLm1XpUfUKldUcMd50pQfBZKlWMqP5G+NI/mHUUEtHIx0TknzQ0gU4cmKFEceEItM2PBCEPORgkcHhXfHB8AqWBXEW05phQHx36n2Zx+fIQYUNQnwq8h0jp0b2ElHwk9ypK72WPV9efEqOIdd6B8MH7BRo8foIZOwT0h6L71pGPtEARNNr7uGSBJhABgeHw52L5F3Nyiktkzai9RZ8HPVqLnk3WtQH8K5p51pP1OskuRXZcluRcCGKxqx+pHXTIlOzYL0aqmE4sIv75CnYUss1NNuFkMFseZRdkTe472odcJH27TYIHotcsyeytbjeWBLxgiHqvsE1m/0zKgX2p6DeCv8WV27vWSLqw/9M2s2RKTZyeE4cLYgGMSmmvA68YLsWeAisIM4IH7AR5vRk8d8PDezRe8NWo0iTDfzfWsFGdBmfyXVioLMxCdgtoEXCX3TXdVgCoc3oF5e3Qu3Wpohp8tLc3PtwWSNJ+4tvEIfPH22qyNT80/kDjejo34Z2cwmvkCSvufiwd0j+Xa8A5p7mI05k= 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)(396003)(39830400003)(366004)(346002)(376002)(136003)(230922051799003)(186009)(1800799009)(451199024)(64100799003)(2906002)(38100700002)(30864003)(83380400001)(1076003)(107886003)(5660300002)(2616005)(86362001)(6512007)(41300700001)(44832011)(36756003)(38350700005)(66476007)(316002)(6916009)(66946007)(54906003)(66556008)(52116002)(6666004)(6506007)(6486002)(8676002)(26005)(478600001)(4326008)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EHaiB/XgMcFoUIzpS5CPdUlwTMmtccuHpNYvGWJWnK+Vp4I+L4vFSgaM2fdEk+XQUttT9nIqG9Js1iUoVMgZgNxOIHU3INdWuuF+gnrGsP9LkjbauWTFmPNsv/4EPovByFobmv8pFcM2QSv4If6wafAPJl11g37V6rb6j7CIuEhVwo5GiKx+SxhZXQ7i/K3kx4bz9lSbo5pwLeOKaMq3d1WmoIYIo/DmuYH9EeG5TYPIjwVnghOhxSQWVRXHziHWHPCXksNbfl5FW2wMBpxqLfkP6Z+4oP/671xNmv9hZGSDOnaSf4QJdVkEe6LgeWCuqgxZYa8hFbWuqOiw7Kd6D4oaoV06mYD7vw/aVGHVjuH8PH9ktlwN92nYS9BKFCAb1dmmv16rLmkV32yBhB9oUDMoFiwwpB1WAkGeYYRGLJ3sqseqXLPhEFDtdAK94081m9sSWdZhMlpSMhCp8DLEzwY/9D7fLpRAggImZ8VhaszpvtdCCcHGBihX3uhW1SeGqxSSHaOMTVdbbAJkjy/+EuuGHlNQvNVfyT6GpGysqZ6EZCKM+MvJ53E7ALZK/enyC7i/f0y4KTpfzsolutVGGGrHzf4PD/oS66guwqSfxhRTBMAtHxOJQjpqNhgKWzfGJVrbdy3fxs2+ocsiHTw/ND/m+TMSBDKjWH5GiRQ43bSLUIymOBD/Y6L6lqIlskj/wn5PMi6nFlxZ73/fqHvhDirp1am/bJK+yP5uq7/1WrK374VYMqutcxe265+/Rd4tIOQG+nA7v9J6TCbO+S4kk0X6bEU10AoQ+Q5ZqMam3h9IijhjX6HyzLEQn9dp1vvLomPyARwK0iC2J3sGNs0NFL21hX/Bg4r56p+Iwa/lbG8fy1zdWX5szopM6m8vri98+rp37NZ9Xbi5S1nnrsP68FSDlEMHHZplRbpFDKqIZnDW4Ofr0pH9gma5rrg0e8QaULceG0ouC7m4msayE1uqLJap6kcr3jOHMEH3F4X2vUIX52c+AzolBItyPzu70VEWU4k0mgQOoRdQ2XCjcdObo6IzW+IMGP6z9wy58zLAr4R0Ysv2yAcSvBuX15A0Cpv/1Er38klFc4Pr9NRJ4zmLOcdhCn9xn3XDqWz6acFa2/T1HAZ321PGJD2+zMHx7FrGWCgDN3rkSfgBFeqQ499xGSCDqqxFL4sL0MO3lDC/eEd5efHLGX976G9ZsG52attAM08VKk7ru5fHRcjgO02DssGWTECT9tavRSqk4XiWP/c8vGcLR0irA3AEGv2ir1pWhPKtZf5MC/BSjSbMIcxotP3EvIff8Bz3mkfMiBPXJqbpE+eeOSb2Fp6D+Vsl3ca/E/JXl+TIf1kbm2fhf7I0yHdewBAkhcF6+FDgbDec+bzQuv5ZS82tlXruq0elJHlN/qiwalxxI0MTAyTXA2ZBI+ZesA0q//fK2VdOrzyFZnBHwihlkTGwmiMCQnFyfavcKs+WO9B068lwEGrdbIGURJBPfJsdQHeeK2PPH4Zg49FPNxF28wrRanfm5fFdOTH5wpO5At5LEWb3mLluRKn4FSmv37ge6FPNwajuj/hOOVtCpZfEt7oJcJJf76Mnf1Y80xjrH83MlNImWiUzGjuIAA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 494f0153-ca74-4864-4743-08dbd77d76aa 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:16:46.9675 (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: kehBcLoxkp9UgTb0qPPa24YcZ3CQS8qVfptdJtXfNjuXR6ZH2BBtZVPXx7FCYHl5u9o3uQ0unXSk3e7TkzPg8Uf4haNNfc2Zx7BqCO9+ZI8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB6268 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 | 128 +++++---- drivers/net/nfp/nfp_net_common.h | 6 +- drivers/net/nfp/nfp_rxtx.c | 4 +- 9 files changed, 94 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 6abd91965c..13dd952754 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,16 @@ 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 +2032,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 +2052,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,