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 6708A440E1; Tue, 28 May 2024 03:30:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 533ED40689; Tue, 28 May 2024 03:30:05 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2122.outbound.protection.outlook.com [40.107.93.122]) by mails.dpdk.org (Postfix) with ESMTP id 2C8E840684 for ; Tue, 28 May 2024 03:30:03 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LEqS0U5j1Wr6SJZ8tJ1jFHOUKr0ZlBU+iUK8f7t4HL8hyFXKQeIPxSEhatQnYzgsJgku9V8KVr7dXxOhxLJKgea/XwZqXmiXlzoTbBJ0p2QJbb4X/F8wjSrPQ2x3fXQ41B/E1GtqX/pEoWwbbA2KpUxYx3mBwz20II+uQ2VXyRvpVXZDxcoPGTGJMZNIUmkwyD0cIB1wu+hao//bJYWreeyDX+EtgCO+weFYBzVvYAJ/wQjf+yOfRwDFVKtMzkTrdeCI9kSmWYdKftJew2cmOwo100MXtRP/cyhI9JuAeJdbUJXQT8MM4XEGkz1paUuQoDWb/JKqQBHaMynyT2BGAQ== 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=Aj35TX31maffwiujKNoJEHI+FsC/CaMP47AAxemoRlg=; b=mAUrlnH5vPNdWqbcbAOABzOfKJLbGfokJKdaD+v4bK8mlorcPUgd9wAEo795KFDFrdhCQOX+fnUHW7on7x3YlOVdQT7MutbQCKcQ/NBym9u37YUA/kM2sikazP26lnlPxUr32M41TiZVhXwtszaOK1GBO++b1v+nvO0kc3fCABwfu+AbjOWhcS2lLpGexcPY9/2Q9OIaK/ng9KRAGivszVLmzqbJXVrwFDERPWvyed1rVseQ8iZh2QafnUPVGXxcMJ/I6wwyNYWXYdSGM5XgTKx6oWPl1kgbQftDEaqsfqd15VCepPdcpr6XNDL5+M3JPRflYCWuRCcK/IHIC47lfg== 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=Aj35TX31maffwiujKNoJEHI+FsC/CaMP47AAxemoRlg=; b=WKPhqIiFPeKI8wue9bH1IUVzNziKOBwgZ7PgnwSwa8PNx++YtbYKSGrIe2CkKmIV7XqO0gPUlHkgijyWdR112jGnvWx/arByrUwc+yxxEhsh3O102VRwtVfLQXzrTfORWM6W4FUwMK7xCZEarn1NLSxFPi0cvIuIqMEsE6oMB4E= 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 DM6PR13MB3643.namprd13.prod.outlook.com (2603:10b6:5:242::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.16; Tue, 28 May 2024 01:30:00 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833%7]) with mapi id 15.20.7633.001; Tue, 28 May 2024 01:30:00 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 2/2] net/nfp: support new firmware name scheme Date: Tue, 28 May 2024 09:29:33 +0800 Message-Id: <20240528012933.2345436-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240528012933.2345436-1-chaoyong.he@corigine.com> References: <20240528012933.2345436-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SI1PR02CA0049.apcprd02.prod.outlook.com (2603:1096:4:1f5::18) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB3643:EE_ X-MS-Office365-Filtering-Correlation-Id: 7f430b63-515d-4958-7745-08dc7eb5b0ad X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|366007|376005|1800799015|52116005|38350700005; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Hmej236CX+tCQIiHK+l7SPBxSdff/tzxW+xrCdkGSMeR0Zq2aLFDqwdbSvLQ?= =?us-ascii?Q?VafyD4IkLpfa3RwGw+hbZbpWtnz3SKwHfaBFc2MgLPh+b7tnEla2FhRkvr0I?= =?us-ascii?Q?8gn2BODYr6JFHMe4a4QcgcSpleEekalYE1PUFuGY3LixvbZQYvXwABtc4DCJ?= =?us-ascii?Q?4iIe5nBfaWm6IY0k0kd0uHcfLhH7eaSB9NiGR0aAL60vBDYlZpFWyacvG22P?= =?us-ascii?Q?/iFSfi6iDlv86ilAP9BNleiHaySklRDMqndqYDIGBKEOXQN/27XW0FYIB0jK?= =?us-ascii?Q?ChAAhNOIwV3p6KjqpYpyqhUzCPisBcewg/GXv8ePP166sgnaEofYmh3QyWpl?= =?us-ascii?Q?SDUP+/wxz6e62hWPXQoPc+l6FDNF8itsshaXsYDgY3zQephaoHdpHuqzu8se?= =?us-ascii?Q?vl9ADLOFepByuQr74yWbgEgldRlbbmoEkiHBw+JLoCSdoK4EHH8qt1RwUiJM?= =?us-ascii?Q?82C/ftdKqZMNVJcwoO7aa8cyBkJIPH7k6q9b/pYXQs6GmjIvPuv5wbEM7kQ1?= =?us-ascii?Q?LfC9cwyq+LiAZuLJJOh5qo7YDb+LYrCRLxpBIEqeiev1ohF8fBs8yj3Dt7a+?= =?us-ascii?Q?k3H0klxGiAgz+6xaJk9jrCru6eYgEq/T9EsT/P1pXSzdMSuTSPZxURzWV3c1?= =?us-ascii?Q?Vhdc28Vluhb639aLDbowylF0gHisezOhy0TJSt+POkT7IfLE1ACUpRVek16j?= =?us-ascii?Q?7EfPSxVqSg5UCttSLoUE+TwSIyF2btPWYRUCRb2ER54S/9u9OlzO9ba8iUqd?= =?us-ascii?Q?YU5vjAqXgk4eVMXPTS8BQBlI0KIxaVyWDQ2/LOYF2KlKth0AXTZ8gWHK49vp?= =?us-ascii?Q?5dWpUpOd+JIsGFKzbABZDykbaxmjUqLlKW7x7oHpFoVET+TAKFvdT8d8unQD?= =?us-ascii?Q?xIXMxOXK8y37W4mtox6BKEuaIY64Fixz1G3hC/9YDFC2ujLF0IMu7Cf61bSk?= =?us-ascii?Q?H8tOdCseRr2/axGx3cEa5fTYgSxkLh2J2FzX870wtzguex+ZK6UKiyGxQTiA?= =?us-ascii?Q?MxLtgF1cbGkVsXA0Cww9xKcfK/Hn5ufGOcl+MUMTl7WuC0LQTp8ufq6glD8r?= =?us-ascii?Q?AL7tCYje4hOFVn3QohvBg26wTBLIwyNfX2u3rQRaDWB1+ZD0eFni9Z98mIO7?= =?us-ascii?Q?xxRcWlfD0X5BSLFcExjz/JDpt8bHTvn031+/Jxrg5HQI3U9EPukQbzM793y+?= =?us-ascii?Q?W1nvtS6C6DQqM4UFzFXEEaJEmjJDlNeDdpfD4jeJss8poXPKy7sv+dBcpCx9?= =?us-ascii?Q?MtgLKqZVBLg5/VH3vT5HJBuL9a4dkgp9KWipOA6MZKhR4dm77nxbk58F7JMr?= =?us-ascii?Q?PrFDOcecU6gkHjcg9d+en/fUAV60BYQojAbGNKfd19rQzQ=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366007)(376005)(1800799015)(52116005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?E7HcJHCUsy9h+EOWTq0+nG2kdqp7lv6yY1REStvb3bWresEuLgwyELN5kvRf?= =?us-ascii?Q?CL3b34W9rjkHjy4fDmFOHvOwvMU3Nut581KLczWkJbE1cfRI7D8sWOOIAMuO?= =?us-ascii?Q?/UTaNMmQrldTB8XSJzUPy5MLaQNbdr4+vj9iIFCnqvFYaSkvLkanIl1Urud4?= =?us-ascii?Q?8cLxodbx1ckENUL6pL1F/gHoumpRF/N5uoRmjBTGAWLQ2rD4PzRzBdeh4wlZ?= =?us-ascii?Q?3c33DxMhY46FA1whoFUssbtT272OvIO35GO8batZn5hFSRsfGql6fnwmu3YK?= =?us-ascii?Q?xj2EaLv+t5NM771E3cysZOqExDaX997UV+R9dPF+egXYWIIfagEpR50S9HJo?= =?us-ascii?Q?zH+3+S3SWT8a9Nl9dE2g4heNduWW+ThgCll9xRZkB6o6GESLZwQZuqja1y4Y?= =?us-ascii?Q?UyQ2cvoGpvQGXIRRzPJkwl8lRDRzrF5c06a5+HH5PYV89UYGk0D7CBg15G8x?= =?us-ascii?Q?sYpLH2z1v225TCCbZVV2T4ZX/29bm3DOEqzoU60ZTldllb7/d4kB21cwBobh?= =?us-ascii?Q?pktt/oDEXrBY0cgrqA7LuT/9cAqSebnGsX/p81tVugd+1bcj2V0z6Wq1gTmJ?= =?us-ascii?Q?mySnahIWRbRlveiaO2TIv4sedPelZpS22J05L3uwJDeDilvK3+Hce6Vvun6O?= =?us-ascii?Q?Mfma3ZjB8nnq0CiquCpOuZ2ZJdaLMnNwW4dWWMDBQZeOf3hFx4dN8uCsEXQc?= =?us-ascii?Q?PdoxaJy/ldBNOYbcvtNDvKJ9a/l4+0eYmAW6rBzFmBSS+3XlLkcXXWe6B1VE?= =?us-ascii?Q?7lwb5D6llfNk6TINvlZm9sxFAkl9ojtXzeQD+PkE+1Kn39oVEiXLM43W2BeO?= =?us-ascii?Q?ShWEb5kqy/i1q9QjOBn1LCBCD0D4eEn8BFcIApbTT9CcE00TXOFZguJdu0cN?= =?us-ascii?Q?iD1UXwP/iMafizQoL1Lqa8XJygxTT4U3N+IHqWO7uBGeS0kuG1IuupobWm4x?= =?us-ascii?Q?rRMhSMCbiPLzieY2aJ7YIapCrGsnbzvgW4Nspo1xTolr0WmgG42fdzTo7Wef?= =?us-ascii?Q?y9XjyVS6YQ6N8gZ0q+4yHhya3cdyvWx3X4Dq0BYHyRsE8hIok8Zm+QMnglbq?= =?us-ascii?Q?Hz4DsD/UC1g9cxLRElKwMR+604Rydh/AjpFTt8P7q8HAIs5uoSk/vD+QwiiB?= =?us-ascii?Q?iv2jvxaiU8rLBDT0eqh2mWOQrhmm8j4+7kgAkpd0jdjGp0EDmevY76sn75aO?= =?us-ascii?Q?oclTIFI9Kid9GwNpZokYr1YFAvit6ewFgCjPIV1/IoTiD1XM/jz6GEX1P/KT?= =?us-ascii?Q?qdeKYDi3HxGfeE00WC430OSTO9Qard+T3412Y0VNTFgK7s3IUSq9wWZDbaIb?= =?us-ascii?Q?DuuDQ5pNelmdGQwrVDPgX4Ct+CdS1uN2TnjjrpKH+ouWcoWJx6ExrWAT6Z6P?= =?us-ascii?Q?KPawvZX48F8Y67LBX3yGVNWdwQF4uP3xs5HLfNRhpWF4lqWBUkCbJyoLsmT6?= =?us-ascii?Q?Q7/h6ceTV/yu3PNUkeRKVMwHhNMHS3oxbmJKzxeuIpgjfzEdYw8wnb4PgKYp?= =?us-ascii?Q?gP9QS3cmiouZbat19Df93d6knUNt5LCpmHIugzOjiHwcCokGS979/xnX2EzF?= =?us-ascii?Q?cu7avaUh8ATXwAKWSOkjjR5QaRtfbEXsssmTJuk1r1P+Y+KAsJJnUsJuKs3w?= =?us-ascii?Q?hA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f430b63-515d-4958-7745-08dc7eb5b0ad X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 01:30:00.1074 (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: MamTF26JN2+DoYng6m61FWXhLXExSXxsI2TLOx0SYLW4FcLRRThxIriGqqCwuj4qInegR0H2KlNElJW/gt8gKMR3fDzhXmbFuHJpO2gnqJw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB3643 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 Now all application firmware is indifferent of port speed, so do not bother to compose the firmware name with media info. This will reduce a number of symlinks for firmware files. The logic of firmware name with media info still kept for compatibility. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 771137db92..74d4a726df 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -1130,6 +1130,13 @@ nfp_fw_get_name(struct rte_pci_device *dev, } } + /* And then try the model name */ + snprintf(card_desc, sizeof(card_desc), "%s.nffw", nfp_fw_model); + snprintf(fw_name, fw_size, "%s/%s", DEFAULT_FW_PATH, card_desc); + PMD_DRV_LOG(DEBUG, "Trying with fw file: %s", fw_name); + if (access(fw_name, F_OK) == 0) + return 0; + /* Finally try the card type and media */ snprintf(card_desc, sizeof(card_desc), "nic_%s_%dx%d.nffw", nfp_fw_model, nfp_eth_table->count, -- 2.39.1