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 775F242C30; Mon, 5 Jun 2023 07:45:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F409C40A7F; Mon, 5 Jun 2023 07:45:52 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2117.outbound.protection.outlook.com [40.107.92.117]) by mails.dpdk.org (Postfix) with ESMTP id 84C2D4003C for ; Mon, 5 Jun 2023 07:45:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a8Fi5chgN+xF0s7fge2DtWTGt1rr1prC2u7mKKQgy2/bGLRyPhyvhXcw9AunQjUV24kN7TE4CJqnYIdcSXg94JNMZyJ8YdokaORRCXJwUxwjeDe2EC5p3pwEqHm0eUBRDp6HVkAKp2eo2ymKPuVMRxaL+6UXBQnHBoOOp90Ua6nUVXX4vk/YLVyKn4Fi3lUuQegW8mJgM5b2GWKnztCcKvC5JFWLoMqfVbRUo7Qa6CLbIoGiMUmIDWMexgELeGToYYAjxro4qfBrxJ4lkRlSAnHwcWq1GPxbrhzysv3RH4ufTY2IVcH37LtWPh0MTefx4fKSgu+oj4Pbaf4SKN6fVA== 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=DaUTR9+EkLz5GfhY74uykR8yume/HWwUEQ2CnRtExDA=; b=iFShIjiCMSkuAn7ZCPmKNrAhD7zC00R0dhJbNwgWZjfZ5k8VqhiZe8VC3fjmcXG+rFuyxwJT5tYp7Ck4z98TNtHXLKZ03MO/Z3kmaO9KgSEHDNEf6Rc8nadvBS+wvAQ7+FhvF72aaKpwt6Bus87fUNr+h7y2unNse+fiz4axLoSNw5j73g+U9B5UHnAN1dPXnPm26Q3zrkhWLTRlLvNYqRl1mrWEVRAcbYUDc96hVv5diI5DijmX34k2foBpKB65m7+QMl4I0F21BxKvDHRmYnPIfwezWG12WqfoCaEz3kinpAJAwe7YArfoR85ZsVKcab5e9CmCBeU7QR1vTnLNuw== 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=DaUTR9+EkLz5GfhY74uykR8yume/HWwUEQ2CnRtExDA=; b=gYTYBNPy7ZuOG7Q+5Dk0xhdBqzk1h163mf3W3574Ot3I/Q1v+hnuUq1SzEJkYcw2ej/cWF22lar1KzBbpxXFHdoIoD7//RYJfWmX7NctdRKaEbEZEqUO1HD+H0hQ/sla/Bn0jE9RRUSdY2+P2dCd3BGC/Dl4zF8/ObqRdnR2l4s= 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 SA3PR13MB6347.namprd13.prod.outlook.com (2603:10b6:806:37f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.18; Mon, 5 Jun 2023 05:45:49 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::f9ea:8aa0:ca72:caef]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::f9ea:8aa0:ca72:caef%4]) with mapi id 15.20.6455.030; Mon, 5 Jun 2023 05:45:49 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH] net/nfp: remove unused struct fields Date: Mon, 5 Jun 2023 13:45:25 +0800 Message-Id: <20230605054525.3460673-1-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SG2PR04CA0161.apcprd04.prod.outlook.com (2603:1096:4::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA3PR13MB6347:EE_ X-MS-Office365-Filtering-Correlation-Id: 1625bddf-cc45-4b0d-97b5-08db65881da7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Cu13VFv/Yse5TsWopH+lP/K2c8u7bxQVCGNiQUPf7PfRIwyTOF9C7HL7l1lqlyonsYJRFHbS8iwqUcosXKSJrGhKjS/8wfjhwm8VVC65cqzqgtcaB2IPmJKICDmyTldQppn3AzYDAJUqCudsgSd4Qj5uUnnRrhkzmRp650P5FPjx7JC6UYr8qMh0aS2Lf11OmHx+3t1fKqv/HepYigWZFUSady8EYRNcw/Q/2OE6fostTMy0YHR9Vt1z1kabhj9YI798rOAs5Vxvp9sy0GyyxldxJMbQ4RchSaYzN1XmYcQw8fYYisrEuoVF3O+0WTKc9V52LSqxvqP72kAfY/oSvqQJLaHhd8lBzPYcrET4Ab9vZaj8lfcfbgITob+fTEEXb9Y80ymetawHl0b9Cu1pOsXF03Yprj7mPMj4eSvcdSGiXVq+CdDZhN2gKhSmGvDH1L/DH7YkWEwFYkwQKWocw3VC6vrgYAtIklbokDFJS6WK2MZOec4f0pciEU+j1wghYM2RCvh6Bo3EZjcBt6oPBCpyLNmhqBmdZjo9Cvx9cwrooo0Wwd2PLXlML9sVslETPasQs0VPeDi9qQuYmdsTvhKAOj5AdNFAcM6TYpU36hcdi+GX/0ppBvcQ/h0FqgPD 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:(13230028)(4636009)(39840400004)(136003)(376002)(396003)(366004)(346002)(451199021)(36756003)(2906002)(86362001)(44832011)(5660300002)(83380400001)(66574015)(6666004)(6486002)(52116002)(186003)(26005)(6506007)(6512007)(107886003)(1076003)(478600001)(6916009)(316002)(38100700002)(66476007)(4326008)(66946007)(38350700002)(66556008)(2616005)(41300700001)(8936002)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NC9vT01GSWovYVc5MGtTZjlwTHVxSysra1Vqd0grc1VCcDRWclhWRjM0aEFR?= =?utf-8?B?TjhHeTg2dVBLaWlHeWZWSDdBdVA2eVQ0bERlNXJTWGJsdnNGcTlyVnNWaW1x?= =?utf-8?B?L1ZZMnVuSmpHa2hTVEgxcXIwejNHa0xCVnhJdDR3bnpxVGsycXVKWmJudG9U?= =?utf-8?B?aDNqT2RCYVlMbUk5ZTNDdDVzeXpvM0xyUnNHUlVwMmhxTnEyOXRrWmtRME10?= =?utf-8?B?N1o1T2dLaVZybnpHMDk1U2tNN2NHN2JsWUZjdVJrOTNDa3lCcnpoL2ZaeVNZ?= =?utf-8?B?NmpzVFk1cUp6anF3aW15bmVMZk5yMGo4cXRiL3FWelM0dzgyME5aM0tCSFAz?= =?utf-8?B?NVhiZm83am1EUjNpSlptLzBhVWFVK3NuaDlaVUZnRlpuTU93dk5UM2NxUGVW?= =?utf-8?B?U1pocTEwdE1BK25ib3lLSFozaHhESk01c1Q0NmV0YXZDYkFXdmovc2JPNjRS?= =?utf-8?B?cnRnNWgyaGt6VnhMaGE4TmRGeWMrbzM1em1DL09qcTNRMmNXcHUrbWhUaCt4?= =?utf-8?B?SjN2eGFmbmcwblZhNTlHNlZGd1dNT1VwM2h3MkhqYTNzbGVzSzhZSFkwS2or?= =?utf-8?B?TU92VDNxVm8yK1U2Ni9qWTB3OWJZUkFtdXBoYURJQ1hTTGd0Z0JGTHA0VDQ2?= =?utf-8?B?QVRuc2grZmZYajVid2JmM1lGZTZKZGh1Zm5kUzE0cVYwUG1aUUdtREEwRVBD?= =?utf-8?B?TTIrdEg1NEplc2xqRnNvUkpUK2pzWkN3QnV5d1NXbmlGOEVLTElyd0ZSVW0y?= =?utf-8?B?bnBuZzc2dER0bHV6VkpLaW5lUVQxMDQzbWpoem9sM2I4eWl4cWF0WkpKYTM0?= =?utf-8?B?WEdWYWZyVWducUcrb010eGV0NmU0am83RGNNeVdXWEVXSnZ5YzNmMThZS0tv?= =?utf-8?B?R3RxVFZuNEZyWXF1aFZENUtWUU5WRE4xTU5ZakFtR3NmelBqc3RCT1BVakcv?= =?utf-8?B?ckJxQ0FDQUhIcnRvSktROHVEUFkxMkVnTHhIOGZLejVzb3Y3cFV0VTVPS1Bv?= =?utf-8?B?YkY0aWtPVkVTQnpxTEVkRlAyZzArYjNERzFGV2JOVk5jYitBRGRnZVpPckh0?= =?utf-8?B?UHZ0K2c4K2UvNG4xQkFsSEg1ZFhMOEFQWG1kVDU4RnZFdnhOekxtazZlWWY1?= =?utf-8?B?RWdDQmU0Y1VPLy8vYkFack1Hdnk4MFp4cDc3Z21FY3o0Sk10ZzA1SlVINUZv?= =?utf-8?B?QXFJdmVqWkc4WWl1ZW9lME5vckZsL3kwd1lSSXAySTVJdHVLcXJhZmRHMU1J?= =?utf-8?B?eFVPVUhtSnV2cjBkS0pxOHJycUxJZENrRlFSVTNFbDl6VE9iVUNzb21QVmJG?= =?utf-8?B?OFJSc2d1am5LUFQ5N0JWTkZtRGRDbURhWWJoQno4T2JKaEtPclZHTWxrWk95?= =?utf-8?B?ZGZFc2cvWUZBam1CZndyMG4yOHdCTmdxdURLUy9FMWwyNkZlQk5GSFI3cHg3?= =?utf-8?B?bExvR2hBL0NFeVZoZ2RZMmNsZ2JqaHZkTmtIb2k1VlJKMDlBZEdkR0dSNEdE?= =?utf-8?B?ZEx5dHFKaUZBL1VGQ005dGFwdHAxdzJ5NGx2RWZwUzdRTFhXUGN0SU5zYkha?= =?utf-8?B?ZzhmMTcrYWcyV2lycmVEcDlndlhRVjBBc0VudlQ0OWhqaEhjclppanRhWUs5?= =?utf-8?B?bjhPMWs1SWJtM1BEcDM2a3NBQlpaQnBESkJyRmdxNjJPc0hxcnZDMmxmUTY5?= =?utf-8?B?QXB3dS9GeFRkSlVrYThWcTBpeE92QkI2UVdtRHZYMmh5VWIwV3hjKytPNjZF?= =?utf-8?B?MnV4Ym5yN1Z4Q3JQSkNyL0x5dWNicHgrRnNsTk1FdEduNmdVKzJoWVUzdE9s?= =?utf-8?B?OGZ4S29kMFhGbnFVY090QlpXbFFHMDJ3bEVnY1c4SU5Kckh2dWFVdDdLaGZ2?= =?utf-8?B?VGNDdFRTeTZ2Qk11bGdLeWJVQnF5ejZhZEUwSnVXRUs0eC9zelB3MmNsdFov?= =?utf-8?B?b3FhcDFrV3E3ZTFvek9KME9wVnA5bTRTSTVEbytlNzZJUWhwcVlwR3V2aWky?= =?utf-8?B?OVVYbytydkdOemFqSGlSRURPcFdqWkt2V25qc2pvYmlrYzdIb3QvOXAxTkdy?= =?utf-8?B?T0NxbkJVM1lBd3orRXl5OVdHbzlScHBONTloOEtscG5LNmYvd2owbkpBOXNo?= =?utf-8?B?MHVRTE5SMkswN0Z2NGk0SVkrUFpLbWxLWWltSlY0ejR0MlM3eUU4am5pcmRz?= =?utf-8?B?Umc9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1625bddf-cc45-4b0d-97b5-08db65881da7 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2023 05:45:49.3254 (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: NrfhNSgosQPK5/5TUhZ+KZXkWveFPY64TludU45OAtMTHLxn3obz/w8GQFqP29p7xzfGvKKviRtREIQ7MGYS8pmjzrqaMHb0UjK61NiFWNI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR13MB6347 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 data fields of nfp structure which are not used by anyone, and modify the corresponding logics. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower.c | 4 +--- drivers/net/nfp/nfp_common.h | 34 +---------------------------- drivers/net/nfp/nfp_ethdev_vf.c | 4 +--- 3 files changed, 3 insertions(+), 39 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index f7e0ba3b76..c5cc537790 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -438,9 +438,7 @@ nfp_flower_pf_recv_pkts(void *rx_queue, rte_ring_enqueue(repr->ring, (void *)mb); avail_multiplexed++; } else if (repr != NULL) { - PMD_RX_LOG(ERR, "[%u] No ring available for repr_port %s\n", - hw->idx, repr->name); - PMD_RX_LOG(DEBUG, "Adding the mbuf to the mbuf array passed by the app"); + PMD_RX_LOG(ERR, "No ring available for repr_port %s", repr->name); rx_pkts[avail++] = mb; } else { PMD_RX_LOG(DEBUG, "Adding the mbuf to the mbuf array passed by the app"); diff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h index 56ea203d7e..2281445861 100644 --- a/drivers/net/nfp/nfp_common.h +++ b/drivers/net/nfp/nfp_common.h @@ -119,36 +119,14 @@ struct nfp_pf_dev { /* The eth table reported by firmware */ struct nfp_eth_table *nfp_eth_table; - /* Current values for control */ - uint32_t ctrl; - uint8_t *ctrl_bar; - uint8_t *tx_bar; - uint8_t *rx_bar; - - uint8_t *qcp_cfg; - rte_spinlock_t reconfig_lock; - - uint16_t flbufsz; - uint16_t device_id; - uint16_t vendor_id; - uint16_t subsystem_device_id; - uint16_t subsystem_vendor_id; -#if defined(DSTQ_SELECTION) -#if DSTQ_SELECTION - uint16_t device_function; -#endif -#endif struct nfp_cpp *cpp; struct nfp_cpp_area *ctrl_area; struct nfp_cpp_area *hwqueues_area; - struct nfp_cpp_area *msix_area; uint8_t *hw_queues; - union eth_table_entry *eth_table; - struct nfp_hwinfo *hwinfo; struct nfp_rtsym_table *sym_tbl; @@ -208,11 +186,6 @@ struct nfp_net_hw { uint16_t vendor_id; uint16_t subsystem_device_id; uint16_t subsystem_vendor_id; -#if defined(DSTQ_SELECTION) -#if DSTQ_SELECTION - uint16_t device_function; -#endif -#endif struct rte_ether_addr mac_addr; @@ -222,19 +195,14 @@ struct nfp_net_hw { struct nfp_cpp *cpp; struct nfp_cpp_area *ctrl_area; - struct nfp_cpp_area *hwqueues_area; - struct nfp_cpp_area *msix_area; struct nfp_cpp_area *mac_stats_area; uint8_t *mac_stats_bar; uint8_t *mac_stats; - uint8_t *hw_queues; - /* Sequential physical port number */ + /* Sequential physical port number, only valid for CoreNIC firmware */ uint8_t idx; /* Internal port number as seen from NFP */ uint8_t nfp_idx; - - union eth_table_entry *eth_table; }; struct nfp_net_adapter { diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index d4357ad115..71f5020ecd 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -402,7 +402,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) if (eth_dev->data->mac_addrs == NULL) { PMD_INIT_LOG(ERR, "Failed to space for MAC address"); err = -ENOMEM; - goto dev_err_queues_map; + goto dev_err_ctrl_map; } nfp_netvf_read_mac(hw); @@ -443,8 +443,6 @@ nfp_netvf_init(struct rte_eth_dev *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); -- 2.39.1