From patchwork Fri Jul 1 02:20:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 113584 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru 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 7B133A0093; Fri, 1 Jul 2022 04:21:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7281042905; Fri, 1 Jul 2022 04:21:12 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id 1DF0C40A80 for ; Fri, 1 Jul 2022 04:21:10 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sou0GYo5HkWapvGIJNBxm9FbBMnWZ9iBfIyen67rZUnqTMzn/g3sSosFJxA2qJYHGD3/ISl4fqg+7iYQrtn+ODslcndpUA3GNa74/b/aHT6kfRxgO3sf40g98utgGEDwoIZU/eo+6jC79xNJU+18xjh78wfBMlLgH27iXWumcnl+kvs44TBvlgfNQfGkOCFkOZUwP0j7dnTNbOFWnWNNAqh37a9Ic1SLqankFEfhspYBrGVn6BxMfhs3AvcHnUB5+/CB9RX/5DVS6cyc1KGJaoGGIawmDLjy7NPi3h8HWvmLWEm451pNnBNgQfOB22xf1P1t7JcwPQkoJTWtPyPo1w== 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=Ft/XwXnwub++Lq508dydo4EZa+ijmdHevGF9s4Hph+s=; b=KSAQXUuZOCy73cO5kSSnW4+BMf02Xyn1imb9OZe7dBog78WFGD59Z6ewNdk+B2Rq/e1J0svVQCZUyOERtJXYBvXzMIJKsKDkX/PYtmr6x1GWeVko/RMaUz+J7XjYOlkDoGULh3kYHTLnlhQb8z9mKuvck0IcMbZHsGTtiRGYuwKII0zBzyTBeVxUKf8RcdRpqfOf19RHxNYapA1Hc8Bx6WAQ+9vor39DVjFRty7u4kMrYTci19Eblj8UEz2iAbDnE8t+ogamDIiviqQ3Eh74SQMXW9ld6AyJehkgEjQjZB9zuai8iYCgCE2zOs5ijAXMHaqmV2wGGp8PbC9ledu5Vw== 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=Ft/XwXnwub++Lq508dydo4EZa+ijmdHevGF9s4Hph+s=; b=lUIY4t5F6sL1rCzaawR+wzpmwUsZGDdvi39Qj7+K10RTYq9LoeS78qqzrmWK4uzrL6OXam6G1tF1nJL8oLTfkl8uOudvWc3kDDNWUMpmIULwEqQFM6Tn5QZS1hqIL6zEX33RC0N5ZjFE2hmzeeLalH8vGGktw372uCgE+GjgbkI= 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 CH2PR13MB4459.namprd13.prod.outlook.com (2603:10b6:610:35::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.11; Fri, 1 Jul 2022 02:21:09 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5d9e:9ce5:51d1:2021]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5d9e:9ce5:51d1:2021%9]) with mapi id 15.20.5395.014; Fri, 1 Jul 2022 02:21:09 +0000 From: Chaoyong He To: dev@dpdk.org Cc: niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v4 02/12] net/nfp: simplify initialization and remove dead code Date: Fri, 1 Jul 2022 10:20:07 +0800 Message-Id: <1656642017-8992-3-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1656642017-8992-1-git-send-email-chaoyong.he@corigine.com> References: <1656642017-8992-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR02CA0079.apcprd02.prod.outlook.com (2603:1096:4:90::19) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 445c4bf7-22ac-4168-bcf0-08da5b085c08 X-MS-TrafficTypeDiagnostic: CH2PR13MB4459:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IB/qBXjfrLyoxHXo0y30pfhG930pDFmqRbm4JCPtHYEijJaEp3cSurObHEOTOUsgfXefw+Ca/l4hm7dDKq+TNIOxapwnSbzS2FeRR+VP8kFluZArGcNi4ZxuwcaGusJj3ePyuXlaZ2E7ksSzeVCzAid99zcuDzFhWRCHsnxrE8FZQ6rhaKdT4yR1GdYtMA7hC1RY62aNyBiRFgEups79o/wWWnwnJD3wfHXK65icdYRNu8zISowvON5KCdb8568xA7oR2iDRxm9M2004N+XnFfPs8UykwW5O/4RhhmfkHPZyg82Qep8AuUBp7WzSbPmWmdHL1LXRXUhKNEbN/sxWebEL2FSenEPoJ1mLlb4ZU6QEW7FI67BFgr/MdnjBO62VFuDHQPz45nOkWlzg0RKdBe5BI5c/FDGikDgcN+yTn/diwsXxuZoGWacicmxf9pz+B+xKtdtjNjjZxfGu53qXfBCzYygXMkeuWbEmXNpITx7mPIpaAdy+tknmdB7rq/X6RBIw5GfF9JJGvi8IK7ccq3/ZH18q/6sb/kySRB+hkcOxMrBS4rsSbRQity25gNLzogu8s+C+RFDU1+OM8wmt8L2/LVk3a4fJed3kd17BvRA/kU2VTKJBBHCGlgpNZqJPef+PTeruOD26fKQG1/3S2FslneHhs90aC9LYGg8GFPqBZp99ywmsMIgYKGPotS6Yb0t/iKpjiPqaL2BXUdXNwnkbR58h4sXyI9HtBzT8OLje2jIti+9B5uSFZw6flCc8xoye2pJ4z+lmJRssjU2ug8m99EI7DnLzSyD/J+gJwy6+OqTg+m3TU7QHslRzJr7ONpXKedqxlIx/e5g4na2o3Ay4/mdl/mbbgpHldDBzoMqrlJ3L6PaeStPPcv+BhAgT 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:(13230016)(4636009)(39840400004)(346002)(376002)(366004)(396003)(136003)(6486002)(4326008)(186003)(36756003)(26005)(66476007)(66556008)(2616005)(8676002)(83380400001)(6512007)(107886003)(38350700002)(5660300002)(66946007)(8936002)(38100700002)(2906002)(478600001)(44832011)(6916009)(6506007)(316002)(52116002)(41300700001)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?rkFSmFgE8hUPwOhHD7muEV2iObw7?= =?utf-8?q?lRyV1XoDWjWUY1fY765xpgO+zRJIoWhdPmPEgtAL1DdGnofOoA0ldNYkUYJRQoZDR?= =?utf-8?q?sHQ+O8hfgYFt3woDEmqrqb0kGHb6vEUNp6yIon1p85/zVKKmREgRI/CoA63w/SZtB?= =?utf-8?q?yIgIdPm/HXTsw7vJAgP/XoCp25WOHBP+yeL4ZT1LA3+Nv6cDPXDjTGLQQSi2IRWYb?= =?utf-8?q?0JO8HtjbZuN+pJ7b/xBoCVYuV181aOmD6rCkcoObUyk7PODEyJsv0sWIv2BIzVc2O?= =?utf-8?q?jhPvYEOtUg8no+XkZXhPWImW3r9vFv9VxFub8f05to8yXS0NZOL3Twyi/idzsoyVl?= =?utf-8?q?tQ+LQxLc1HgRnS/xHq2HMZZt/wZB0Dd6jwPadj0ttdSEN088XkfHjCvY6NwBdH32h?= =?utf-8?q?HW5FRADkUuMpE3myNoLUiZN3rfJdDHlE3ebQgoVCzoySJr2ItuYiFoEOuq73Z4unR?= =?utf-8?q?6V1ZfEJEtfWSJjAtpCILZY5DOsTuFpd12YlwgoqC+0+Pg/skzviVPNSIM0/49WtYG?= =?utf-8?q?f1P8ieNKAnr4admM0zygQlpORv/mZ01HoiTv28j43bB7VgwH9BOPXw9AE7/wzegUy?= =?utf-8?q?zLamox4tWgxXRVYYNZPKZ0u6mDecPdnwU6QxllLQdwJq35pTkYNnDXkLHc7k+j54W?= =?utf-8?q?NVLgudkwbBEDbCu/nH/LlzazfTA6q2d7kEDXq6zZzehmYPrvo+5qsX+tEgEY21HqJ?= =?utf-8?q?IRdO/Yhb0wwLz52VME4bjlEO6IvSFyfUMMtlHEEPjh5+c7PkyTIpTZ6One7F4qqQj?= =?utf-8?q?hnt3o39SJsoFcQ/6Xl4H44Q4r0dXgYPL9AHvrBGrTtgPapMbKU2nzM/KUSoUBBpvY?= =?utf-8?q?wB2EFEB2VWLZqMEf7nI50BVD8hN5PvA5x4P3xakmxHvPg/X8DLdNZOs5+oYvNcfx5?= =?utf-8?q?nZ0ONJzjYjUwIrZnLCgvv1fHrUMihonETHGWXR6mpRAqrsY9zkLuTTYggkdIbWe/K?= =?utf-8?q?k8TFfn2xnBM8SJo1cLisLXoPXwNVv7U7fpczKtgEm7SkbbXzmKgI/vLMEAFa99jLq?= =?utf-8?q?EkC8Zpvy2Zqmg+U7rGHlxwZwbAJNNfEOgp4sx9skUYTZYyAFB5NYRFQxJgm/5kUQj?= =?utf-8?q?fQhN8ZSZeqRfQUjLISR9txk0/KuJttLNRxrFxm26G9g+s0q5kow4XYfEpJumpP2ug?= =?utf-8?q?zWIZC4dy0++g2CDmnLbS9w9bBzVtEw4q+exReBldOpH0i5MfedWp/Y2TzydHlArMk?= =?utf-8?q?vf3mQOvkNqdoaHjzGohvdfWyFjwi6m/Y12Fd9R+YKeMIiVKBv4CGDHWEJOtlOOkrt?= =?utf-8?q?sy+yCQhScH/d5nOsl/Dft7YGQTlAvlBrH3RqCus2DX2yNIGbvhnK9hSCu0nGouh+/?= =?utf-8?q?28YioWhmFlmcH5eTyvvpOYZcke/ZTSa/i/W7e4ZIjSRLJucCWgYPQG9/uuZ76fv8M?= =?utf-8?q?+hqfkrHsd1wDr4M3oRTisHwwkXuOEa/nDh6MLQ0o+U4pNFRH0AlVqFM4Jgo/D7gIx?= =?utf-8?q?piOcXTtFrtoxyAD/RjW7HjCqmihaj/xYDIgR+yMiFjT4ZNVVjIJ05LQ5i3xJZE2KQ?= =?utf-8?q?vRJsL5mH2F4JEUzJiIPc2vc+f3s8gWCkSA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 445c4bf7-22ac-4168-bcf0-08da5b085c08 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2022 02:21:09.0944 (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: N/LQVUzCTnXtNPXjn4O3Udf0ZZsvd/oDgiZwiJvX/1/acI1G47neToi2xABLp+qC1bJ0JoEAkLpZ41wCFm4rBzb9GUrkET0PfWu0iMJPS2k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR13MB4459 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 Calling nfp_net_init() is only done for the corenic firmware flavor and it is guaranteed to always be called from the primary process, so the explicit check for RTE_PROC_PRIMARY can be dropped. The calling graph of nfp_net_init() already guaranteed the free of resources when it fail, so remove the necessary free logics inside it. While at it remove the unused member is_phyport from struct nfp_net_hw. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_common.h | 1 - drivers/net/nfp/nfp_ethdev.c | 40 +++++++++++----------------------------- 2 files changed, 11 insertions(+), 30 deletions(-) diff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h index 2aaf1d6..b28ebc9 100644 --- a/drivers/net/nfp/nfp_common.h +++ b/drivers/net/nfp/nfp_common.h @@ -238,7 +238,6 @@ struct nfp_net_hw { uint8_t idx; /* Internal port number as seen from NFP */ uint8_t nfp_idx; - bool is_phyport; union eth_table_entry *eth_table; diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 3c4b0ac..2c5607c 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -417,7 +417,6 @@ uint32_t start_q; int stride = 4; int port = 0; - int err; PMD_INIT_FUNC_TRACE(); @@ -452,10 +451,6 @@ PMD_INIT_LOG(DEBUG, "Working with physical port number: %d, " "NFP internal port number: %d", port, hw->nfp_idx); - /* For secondary processes, the primary has done all the work */ - if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return 0; - rte_eth_copy_pci_info(eth_dev, pci_dev); hw->device_id = pci_dev->id.device_id; @@ -506,8 +501,7 @@ break; default: PMD_DRV_LOG(ERR, "nfp_net: no device ID matching"); - err = -ENODEV; - goto dev_err_ctrl_map; + return -ENODEV; } PMD_INIT_LOG(DEBUG, "tx_bar_off: 0x%" PRIx64 "", tx_bar_off); @@ -573,8 +567,7 @@ RTE_ETHER_ADDR_LEN, 0); if (eth_dev->data->mac_addrs == NULL) { PMD_INIT_LOG(ERR, "Failed to space for MAC address"); - err = -ENOMEM; - goto dev_err_queues_map; + return -ENOMEM; } nfp_net_pf_read_mac(app_nic, port); @@ -604,24 +597,15 @@ hw->mac_addr[0], hw->mac_addr[1], hw->mac_addr[2], hw->mac_addr[3], hw->mac_addr[4], hw->mac_addr[5]); - 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; - -dev_err_queues_map: - nfp_cpp_area_free(hw->hwqueues_area); -dev_err_ctrl_map: - nfp_cpp_area_free(hw->ctrl_area); - - return err; } #define DEFAULT_FW_PATH "/lib/firmware/netronome" @@ -818,7 +802,6 @@ hw->eth_dev = eth_dev; hw->idx = i; hw->nfp_idx = nfp_eth_table->ports[i].index; - hw->is_phyport = true; eth_dev->device = &pf_dev->pci_dev->device; @@ -884,8 +867,7 @@ if (cpp == NULL) { PMD_INIT_LOG(ERR, "A CPP handle can not be obtained"); - ret = -EIO; - goto error; + return -EIO; } hwinfo = nfp_hwinfo_read(cpp); @@ -1005,7 +987,7 @@ free(hwinfo); cpp_cleanup: nfp_cpp_free(cpp); -error: + return ret; }