From patchwork Tue Jun 21 08:08:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 113141 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 068EBA0543; Tue, 21 Jun 2022 10:09:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3FA9342B71; Tue, 21 Jun 2022 10:09:18 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2137.outbound.protection.outlook.com [40.107.93.137]) by mails.dpdk.org (Postfix) with ESMTP id 207B04069C for ; Tue, 21 Jun 2022 10:09:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fPyngA3mnkwiokZvQCey1XzRSjJhKb00GRWBqwSzQx+hyNOp7EzYhBcPxXesNEu2sggOodBemUSC66rq2U/et7pEskHgjQLU8s3q0EMm3wQ+OZJl0iAyJ9tG2iDj03EILgdTODGzwJlV4O80d0aY7OWZ7lxeZt4xq+w11zo5zZE/LgDuO6h+qeC3s6IDXw9TgbC2H3WknKXvFzfgRGdry+MwuOPkOAMbi0pKB9fsYaR7XWjl6B0GJnTDKfiNawEDLbizpE18XO8lFpGTiYGf57knpVvK6KttqBlYUxi8rSy3Sb+MrBrHglAsh4OxNEb0cOXfq+jgrzdNV5PFo+sF7Q== 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=KaboE2BW/sMLzI0ik2+NzaUJqpbkTz3gdbm4GzCxWEq6iF0rwxGTzp6scaoAGxrjCG4EWGd+3AKZ3HQvvqcEyrZ9U+ocfiGncqFxvR6FBsVugg5NiUlbreXAtvX4bVJnr1SqxeSzLDL40lKkLq5BifbLxd17NY0FbWN3GFvWoPCOpezUH7PenTGi+fIjCk57XLGChuel24yildqkm1eOtsG/XDRfGrHe1mC2GZxqfoFXUAPr5ZNSGsjkhYwGNUANqg+z5keuOj0fmOp8m2jcalLU32Lk9UPBX3o/TJ6Gt250UWE1coo1v81OmgoSnghPPBaEa4p09P+DOFw1G1ycrg== 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=BpT/n78QkIY6fET4BgVzhLHKngJfPW08pGqps5c4TO/CUKw9XLk0XO6Uxd9HcAzEuDVGARRyI1RvhN+0jaJ9PZzbRu9NZgHiglcNx+UcaUxU8FRHC1yqhUYCP44dPwPS0TOXNVghgG2LD8ENl4HVnzACgbo8XSjuSTMo70qwD8o= 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 DM6PR13MB2730.namprd13.prod.outlook.com (2603:10b6:5:13e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.13; Tue, 21 Jun 2022 08:09:15 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5d9e:9ce5:51d1:2021]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5d9e:9ce5:51d1:2021%7]) with mapi id 15.20.5373.015; Tue, 21 Jun 2022 08:09:14 +0000 From: Chaoyong He To: dev@dpdk.org Cc: niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 02/12] net/nfp: simplify initialization and remove dead code Date: Tue, 21 Jun 2022 16:08:29 +0800 Message-Id: <1655798919-38659-3-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1655798919-38659-1-git-send-email-chaoyong.he@corigine.com> References: <1655798919-38659-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: OS0P286CA0009.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:9c::14) 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: ae29e7de-bbc5-48b6-71e4-08da535d54da X-MS-TrafficTypeDiagnostic: DM6PR13MB2730:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: It0nFpShpgSIWDWxXdAmW9ZCPJgGXb6Xk0MegCxr/BIXZKWmm4D7XBc2DMs+DsBjYspU2hNgOZ3Olx8cbCEmEZnwUgmTPKk0YPGZabLuXwhktdPd1Mq72M1bXNv5LknhYBwv+CzJuzRIrB5zF1KHqVJGA39rLAFLG2BPHSNPc5m2YK1/FghunFge79DoC31msjSDMJ31ANgm9pSXAaNkMPRZgsDFB4dZVTHO3wWuYCNlMGkzmh+JUp23GlQgLcvm0SCkMkGkoP00UReFT3eSmmDQO3FLBxsPEI3a9Rk8hNgJ2pVLReMprwi1L8yRWVj/pcCBrRydeUvevlM9zT0juTC4F5coG/Kf7c6UErE6qJawJkP0u2uYyw0dSP9Y4q9KtOfTKH8xYaTFAYm6Cx1q3azjvIBW16W4+q8cLP4b8dZNAiHV+ABSU14MQg/gFtnPzn8o1Obd6ggIxmMUCDdMfjlqiezR61n7IxaPAPWiySWv2fU+FMbvTK97xNxdKfNzvBGeHjvCwjNMBa2lwoNqBRobhXCztOcIjt/XxFNNhK5wHZ+tm+r4IgaZveOUFK64q/VtDptCPAi0whJTiqwY3t0d8/M+zULiGfxl0w3ee0e6PO1HIBLHFgERshNN3dLF4fALjyg2mxMe+MVPtbg6rj00VqU/1/e1f7DP+BkjU1w/MFmQD7T4bh2qfCoT9K5YB+labRFe50N5vQkkaknceQ== 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)(39830400003)(376002)(366004)(136003)(346002)(396003)(38100700002)(2616005)(38350700002)(86362001)(83380400001)(66946007)(66476007)(41300700001)(186003)(8936002)(8676002)(66556008)(5660300002)(107886003)(44832011)(2906002)(316002)(4326008)(6506007)(26005)(6512007)(6916009)(478600001)(52116002)(6666004)(36756003)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Mugr87pnN9OFhRFYVjgODL9tX4p1?= =?utf-8?q?T5vXQYr2Hqa8tvGK5npzz7Yo762kSZ1uQA6fAW6ogFVY6JxpAYNl/z/EgJohsQJSf?= =?utf-8?q?aZJHdswa7lD237VBgBM5q4aSxiC1VJcmKJZu2v2Kd6l5F8UHeuP1C9G/YGNKGhlTx?= =?utf-8?q?j2fOvv6GjkZ4KBNRcAFQ0M6w7zXwZ+4f/9dfdjsIJ4rG1qlEoP3oj4tbIFQWo6kmJ?= =?utf-8?q?OQtgksRMUKIXraoJ/fmNuXgQCSGbteblm8GpuffL+kfYZ2cTjuQhkzuVBtWyrlX9/?= =?utf-8?q?0vehTJCJOuO08BVUkPtyFXGBp20i5hKEHNhRSwqC90H5+BSaezYJe+pqI32GqXn4B?= =?utf-8?q?/AxfncddSPUHTTWlmrNANy/ufr/AUrOjECJbs0lKNYJJHLmurJtiHyK86AXIt4Ey0?= =?utf-8?q?YidfbFrWGhTyCclsE7OL2m5S6TrELF7hMV94l56RhuKZYG3Xh8TrSBepMceB1nYpP?= =?utf-8?q?w9bueenmy4Fe2NML3DT8NehIgRCbSHpMNcZwFH/7MzNm+/Ac/80YGZTM8bJv+gi5j?= =?utf-8?q?tGwGcjEEsqep8/uB6V3vahVBLVUKplRZ/A4kDyS+NJnEfOxlfgPOKXpLnklG2PDxq?= =?utf-8?q?imTgVl8daUxxi7Z0oj9oBXqp28EKDq9X7fnSC1fU+ZUFyWcbfncf1gAZfXfdzR3JA?= =?utf-8?q?rBHMelWRlVeGlauGWPAF5feveaSMSfvrHcSQp2Jk5r848UF3WQ+oBxmMttnD7TC+m?= =?utf-8?q?+Aj23hMb7QsNzGkKNnegUsRzhAJoRHM2oIxMqK18FnPkOi9ADoaxJGuS7uspD9BwI?= =?utf-8?q?g47aaK2gpHz1yQrR7DlzQWL/dTXtLsaVsPPyXT8IjWOL9C75Z8OdLuq4Sp9+6on4K?= =?utf-8?q?GPPufrujNasbY/5000zcFpz9z54yOtL0/X4yXq2UstbGHck7K6KF/EkcZpQKYyzj9?= =?utf-8?q?aaQQsb3EKe9xWJIBspqudM47v9wleJtn8Q0MNjHWptRDgx0pBVSsgs6XxByI07l2m?= =?utf-8?q?HCtVKjQCUoRqiddVBcSbi0lHQmZWzpHtDMeYqKoaXB6trfRRHYg1SDiIsQrE1ugf9?= =?utf-8?q?ZpqSL1ZwTn3PLKjwmlXyUoHypCIGrn8nI5hRlt0Qreon2FI04trIC0bw3y/KERgM7?= =?utf-8?q?napKxZjUFQh8bVcHQdB8Bi/AyU6d78WJluLpMUHb1j2ueA2NIQtvRc6fSnL7QhtyR?= =?utf-8?q?4TPAm/AA/T1wHoEPFPvt0SMUReD9hYIITZ95GH/hu/e8Y5MvvJV5+qkuO/WEkUpop?= =?utf-8?q?PQd+S+koYxHrecXsPAiz5c9nNypqtRVy2SnPWTPdcC+O3AJ2WVVWV+wlKrKr61Pcw?= =?utf-8?q?QdZv9Bh+lExAyTv1DnQJEgOFlDVlqe4jcs3BkHrw/QwvBuwRBXaM80N5BETgqBMG0?= =?utf-8?q?l0E7p2WJ/h6SlIavYsSauWsNqkT2UQQs3lwzztbFYKO8/v1J/MLlwp7YwCY1ylQwF?= =?utf-8?q?lPDxnhrvjNUHL/iRnjVJRq85taXbTYIe+E6t2LBkXD9kvyS2CZlILIhUbZKx0ASXi?= =?utf-8?q?aUQaNUyc0co6DBP7D4Ccx+Lh3m8vTdAR3rBboQ4+ARX1Z+REaGNfzYOnWkMbkSf4F?= =?utf-8?q?P1jsY1XZCo0+/QrXYO817GahQ3V6GAY3gzss2DPPMJdoOKsq0QDBA/bfAAtDvLCp6?= =?utf-8?q?Zxkn8qVDoxHREvpqZZUuYudUc9SeUGlquWz9lypWyTMiLhBpvJ6GNH2WmCaUj1Jes?= =?utf-8?q?1uL51cnbJ/l9+avYc332bRMFeMX94aVvHHcSwk3kdGMzBce53zImQ=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae29e7de-bbc5-48b6-71e4-08da535d54da X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:09:14.9199 (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: /huKkKDhMyONt3KIltb9pKFzntUMMvTmwiLzAwS0o32/tc1EyRPUjlNEgZJ+jNGmKyiBh0Y4vcIbGKEUeqVaiM5FmKgfThy6ce6RUel2Y+E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB2730 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; }