From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 112DEA00C2; Mon, 26 Sep 2022 09:00:32 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E8364415D7; Mon, 26 Sep 2022 09:00:24 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2092.outbound.protection.outlook.com [40.107.244.92]) by mails.dpdk.org (Postfix) with ESMTP id CFE2A41133 for ; Mon, 26 Sep 2022 09:00:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=crhUBixuhoZEMJ0fxHJCkypdPxMXinjeC+9mNMjD7f3qP6qoHHRSURgO6SugJlRr+wwwj0vjA4JzAY4lwWiRDhDKwdjQEWMyYVSv39UR8v5YcpUa8sved1qDP3J2updQl9nHMs788ThtidJpDYZeaJ0BlJiRN1IryQROBDGUu39GkTVyic4s6yo9NOiyO9haZNWCLDMqZgzHAMfG3g/zXpzzugJLwlFuGnKAE8aFHveI0GN8GbwhOuYpazQEl3hVonTrFRL6iOgOKErGGcNjSrKFw2b1AJ6ASeEKCc1eSPXskxmXJVUPay0gC36XjKqLwam+zgtWifQrccAudbTypg== 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=ikUdERG8KQObCNmcGR3HIW7FUmEAJQPS2ukxe60dbwg=; b=FMkAP9AWwHDYLAqNiQ6nOtaKVanoaxb5w+9mNTaabVB1yr+YgzYONr7QeAZ0F1RPwCLSXxf8XhQ/g5Z48IY2SzlVkT7EUxu6r06DRVcdEm5G7DxcnjFUb+X5WTZ1DNb0bLJcn1zq8X27CkUvL86F6i/wLs0BCM3An03FngUUjZvxLsX3MxES3F1OCiHNbzn5BERkEFU4jLdH+y78yntAy5jrkneARfp3wn0/YEUYvEG6W54Zar4S0ai3pNe4KShk6aHpMy6mzdBSvlzrB93QTxv+GOFA3y0EPtZlcg76XUvp9DJdUSObaGGHLcfspGkskmbToX0GGlf8xE6eRbFnIw== 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=ikUdERG8KQObCNmcGR3HIW7FUmEAJQPS2ukxe60dbwg=; b=Z8j8rFy3e8bcT4Bkr0S3pwdk5ja2tAWll+g/4tgL2hXF1E7IGPX/Yt8nYEX7vd/g1E9+AeBYQYyG4RgzRCwYFv26AS0/sM9WVGS4Wmt7V7aFkyLP2vgUqE59QVbBCJzFGMuOhteXouNw6f6ZWPeQrZwWejntVtBaVPB4Ad+FLjU= 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 SA1PR13MB4893.namprd13.prod.outlook.com (2603:10b6:806:18a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.14; Mon, 26 Sep 2022 07:00:21 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::779:2722:a8e5:503b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::779:2722:a8e5:503b%7]) with mapi id 15.20.5676.014; Mon, 26 Sep 2022 07:00:21 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v10 02/13] net/nfp: simplify initialization and remove dead code Date: Mon, 26 Sep 2022 14:59:46 +0800 Message-Id: <1664175597-37248-3-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1664175597-37248-1-git-send-email-chaoyong.he@corigine.com> References: <1664175597-37248-1-git-send-email-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SG2P153CA0005.APCP153.PROD.OUTLOOK.COM (2603:1096::15) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB4893:EE_ X-MS-Office365-Filtering-Correlation-Id: 88525d89-c20d-4574-59df-08da9f8cc70f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4csSskRWnKg0YVtXVUKxXhflC+Dv0ptePC7JtQ8xuVKKS2c6clZ/lvruECDKLw0VGDEow0omE+Byr4qsB3B21e89FCIPc7ovzUQXLbYw4sO/66vy4zMw4w8wveTXbEhx3tcV0pJUPld4mM96RGGnqUltLvah+EoBXj7oB7lM1T1pNxVR3sQHc/eHxkjOyD5N/+J0RsA2w+arWvmLjJ/jB0VYCMGDpIkhueI85p0SP0ky8hf858T+PdIC7jQGHb1OeH2um2cTioAelGuNiSru1csLvAF8M1bCd7QYE8+/LsPKVviH1ov4OpQdvoD87OIrbcr2DIvxqNzfRkBlqENqdG3ZaTj9JQqXf6jVjEyFxIlugOscfzbpEVce7lwz6u1xkxzVQgu5kHoIqWjjM0dMBgBv2yunoaOzwbPwrfYlx1ZJMwvLE6EyePsbT3/o49lPZdx2WXT/kMcnwf5h/CdLR1mZyGhFwdptjgVpfpo/THLONt8vxfK1XCNlyiXJKpaX7PuCCZmJlXZqdt/Wt3lEO9oaOz9tMh1nidOq/yO1Q3zbSxxVkMEW8ydqgl18GIbiRC1/aRDH4xI6LHIEv0DO1U5Rj8nPOtLUZ99h4Sa1T9FHtjfOE+tf8GrYT+cCtaQSbRmuSooC4rpDhUu//UiWQTqHkr/Kpy42MXML3MHWXlWiqYVJ1gjb/y0JThTM8U7XFO6JnBNl2X42OX2ntk0tkVPcbV5+vH0i+kUiMDdp6mnX0odYId1Lkyku2rXhj5zDjAyovrQXp4dcwa00iFhIog== 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:(13230022)(4636009)(366004)(396003)(39830400003)(136003)(376002)(346002)(451199015)(36756003)(38100700002)(38350700002)(2906002)(86362001)(44832011)(66946007)(8936002)(66556008)(66476007)(5660300002)(8676002)(4326008)(83380400001)(186003)(6512007)(6916009)(316002)(52116002)(6666004)(2616005)(26005)(6506007)(478600001)(41300700001)(107886003)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?T2ZhVzdCL0tBYnh6dGdWbk5IU1I0Q2phdyt2a0xpRUtCQXM2TUhBNmlXZWgv?= =?utf-8?B?VTQrdEVXcmw1T3BBSjJBeVdDL1MwTXpoSFo1Z3JtMVIvRjNkK3F4cVZ4d0Rm?= =?utf-8?B?bXl0Umkxd2tud3V5RGRWRDZLUDhGb3JObFYxcHBhZWx1WmNVZmlTZ3YvNU5U?= =?utf-8?B?VW53Yjlscml4cENOK1JFbTdYZktpREJSMjVaNVo1NzY0S2VxVStucmJGMHEv?= =?utf-8?B?RUR3YmlmMk56SHNIbThKYVBmeCtYTTV2OVA4QXMrVUQ5SE5taEpDejc0Q3di?= =?utf-8?B?aTZHNkpvT0FaZ0MxTlRYVzI2NWJvYmR5bjlRT1hGYnpaWXd1aG5oM1BPdlB4?= =?utf-8?B?Y012UHdLeG8ybzNzNTRGSGRieDZsc0E0Q3ZkNTVvSlZqNzJheS9uaWM0VlNN?= =?utf-8?B?K0RuNERrNGxwNzl3Ym1xTHVNT3pPRjVXY1AxTE5nYU1pelhvQXJoRW5QcW96?= =?utf-8?B?anRDT21hTlZXZUFIZ0hZbkFRNFBLbTlzRjJ4RmlPY2xHUFhxbUR3NHo1YmVQ?= =?utf-8?B?RXZSeXd3a3hyWkg1LzlVZEZON3YrNUQwbmkyRDcwZFFYTnhuMUk0ZWd3eDlz?= =?utf-8?B?RXZBVTNRR3dxb29FUWlmN1V2MmEzUThsaGhxMkl2NTdHUUc4WGNEeEVsaHFa?= =?utf-8?B?c2tSeWE3RTVEZENCVjlNUGxhVzR0bUJVRzR0M3FOcDdkaHBLQ1dROU53RkJJ?= =?utf-8?B?N3E1Zjd1eDhvNkdyK2pNTFZFb2RoS052RzhBTFEzZHJIN29pbGpSYk84YXNn?= =?utf-8?B?S0c0TTVodWs5MVo4NXJ0STBIQ0N3L3dsQTgrNHBTRitDbmJXYjJyb2FxeHBm?= =?utf-8?B?VkRWVC9OaE5CRDhBRS8waUZpTitya0RiY0NtODBoTXR4dVlUQVlJQ3VtdFps?= =?utf-8?B?cDRGREoxMzFod3BNazg3VHFGclZ2NmFhSU9ydCtMc3BUeVpzV0dSaDZBcXZN?= =?utf-8?B?Nm5UdGhseFlkWW5sUXExVHNMUzNmNmZsVTN6L2YvWE5tSlowSDhtUENHdXpp?= =?utf-8?B?MjFPY1lESkQwREJxa2NsejRmS3R6NHZvMXhCRmFNOTFvQlpORGNNVVZNSitm?= =?utf-8?B?ZDFqZWNKMUZZcnJyTDNWenFHdlZiQXl0cTgrY20xVnJQSklVQmVtTzN5YlpZ?= =?utf-8?B?d0R3WHd6TTRZOFlMOWlTc2tRelpndlpzd3ZWQm5ZY2RyL2tDRHpqZUFSa01C?= =?utf-8?B?Z01BaDlNb2gwNFhtTmVSb1FMcVFzSVQ2VlE5eTFRaHJoUFVoS2svMGNZajho?= =?utf-8?B?K0tpZnI4ZGYrbktiM0ZxRndIT2ZOdkJGTm1oYzNLRlcrYzJGK2xVSmdJbmZI?= =?utf-8?B?emp5N2VHcGUxcmV3SHk4ajRuRGFML0h4V3BncCtTOGZMY1l3VnV5QTcwWnhw?= =?utf-8?B?ekpFMEs5U05ua053TXlzOEYyWkpPelpuRHdKd1c3c29RdEF2OWViMkZ6YklX?= =?utf-8?B?QXR3bUV6MHFEUDJVUUNXT0MvUVNLcm5BM0dDT2lucDRHT043VUFabnJvOWli?= =?utf-8?B?L1lVN0p4c0Iza05oTDlQcjY1RHZYcDRMK2JLQjFhRUlsbzJjZVY2UThGYVBt?= =?utf-8?B?dms3alFpamU2Tzd4S0VTb3FYTGx0eE1yREVQZ2gwYmhOOTRQRzY3c0hsdG5i?= =?utf-8?B?Q0t4Ukk0MjBKVklaSEFIbk01N2NVdDB0ZXFKdnhZZHFsK2t6OTJSdEYrai9B?= =?utf-8?B?UXJ3YkhiR2xZaDlWd0dPTndxY3JCR0tuNXZhTlRVZi9zWnlrVWdrcnR5ZHFq?= =?utf-8?B?M0w0eGQ4WUFiRHFhS2hOV0c4S0M5MUE5a2lZaERLeGVNdEJ2MVJtK3FDdCtk?= =?utf-8?B?eEF6MVZSWjM5NEVoR0pIa09nbjlsUVIweTBGN0RzK3JvWXBTRWlpUWFCNmVn?= =?utf-8?B?U3pWS2l1U3YvWXQvTDZXMUxvNFRRVDFJOVk4UGp0bXVDaXNyYXFpWlFLZU9r?= =?utf-8?B?MWJXcDBjbnpRK3dsTUt2S3UwWXpqSlhPZ1RsZ2RhNFdPejRQYUlsS1U4S29o?= =?utf-8?B?MHcwalVLMFk2cVNROC80Njd1M21jWEt6SGt6cnR4bXNSR1drbDhPREpMOHBG?= =?utf-8?B?cmFCK24xVHZIUE1SWFlVOEJQQldIS0pUSXNnekNWcDFJYms3RjlZbm9VMUZ1?= =?utf-8?B?ck9sSWdoWW1UWHBSSFhlUmJmdlN5WTlZb3JNMnJFVG52cFZab0pPcndTZG9R?= =?utf-8?B?QkE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88525d89-c20d-4574-59df-08da9f8cc70f X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2022 07:00:21.3225 (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: jeNBk/EKy17hmYVIIjyvKV9N1elORUILPzwjG73L2X7CPhxJd8RKukhzYgQpSBXcgGimtcEHvyK4j3txWnsJ0R69YgYdHqZDF4DFERH6MRs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB4893 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 | 4 ---- drivers/net/nfp/nfp_ethdev.c | 40 +++++++++++----------------------------- 2 files changed, 11 insertions(+), 33 deletions(-) diff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h index d9548d6..5bdf028 100644 --- a/drivers/net/nfp/nfp_common.h +++ b/drivers/net/nfp/nfp_common.h @@ -168,7 +168,6 @@ struct nfp_pf_dev { struct nfp_hwinfo *hwinfo; struct nfp_rtsym_table *sym_tbl; - uint32_t nfp_cpp_service_id; }; struct nfp_app_fw_nic { @@ -240,11 +239,8 @@ 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; - - uint32_t nfp_cpp_service_id; }; struct nfp_net_adapter { diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 47ee418..14c6d69 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_fw_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" @@ -821,7 +805,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; @@ -887,8 +870,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); @@ -1010,7 +992,7 @@ free(hwinfo); cpp_cleanup: nfp_cpp_free(cpp); -error: + return ret; } -- 1.8.3.1