From patchwork Tue Aug 2 07:55:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 114522 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 1CD3AA0543; Tue, 2 Aug 2022 09:55:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 106EF42B77; Tue, 2 Aug 2022 09:55:24 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by mails.dpdk.org (Postfix) with ESMTP id E2DEA400D7; Tue, 2 Aug 2022 09:55:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rku4Whx1juO6ffu8Iq4t3giUWNYKphO04ofBngkZJ9vTu52rwCh8yxHSe7Hmp2LimaYLmAKmJziUMexbKNjO4MG9/U4Dz1qE98eekSCAkYiYlJAorp3KVf9wRyjAEXeBiVdVP9NxVMpBvcG83AH/C6qmAk8G7ECI43Fozbsvp6TXGfv1OQuGkB4Nok604T1iuYb4uj++g5YAjsinPzHECloVi/Xoe5cBQmkCxKjtwOaYoFP3+mZEillU5Bz0qcGOSoIzfzhM1hckHhWLnU8sMjfWNFlNzbrifXI29IngK044Lc9KEWc7EVAtMS3rJjnUiX4Z4424ofzlL6y+Liov+Q== 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=ME4hfu5rxrtQxbe3sA7z2AYjsf2HPaYHySO43az/5cc=; b=OITzORMqAMR26f0tOMGSivyz9LcJH6enkOJNk5mV1UnkqdPHOse3NYoSMhsSb1KAVZlz5bfIizsWcGlftBF8GEiAjB5rOlzDhAfPhjrBKHkielOWBx8YkXlOmzFotdhxpjN29QZ1ZIrYGCS54pq/Xb9P3FP9xqkDcPmdqYBXWTuQb3FTsN/O0pFY8b1U0mpIsXwJo4t4ElU/z485NtVjYx4vC/ma8AKi5Lx1GTmyxwnXBI01IRuEc7pKNqdH5yy7ulQP8oagy5c+oL/lA2TTXRZsJqpi+bw7fL97Ylt5ehxRy8aGG3GNnDJzLgU/m0QBiJ7CdUVSVcwd+BvyldJ55w== 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=ME4hfu5rxrtQxbe3sA7z2AYjsf2HPaYHySO43az/5cc=; b=nE8C0zXj9j/7rI+DTcEXzJWESfPHuInkg7HbvNHOpAnZmr6bQ46zp1YOsH+bXzRYD7mVcILFCBieN34s9iXFygT9zOHyUIBwKlNfAsl8ZQdWLxiXkt8FQYLi/LnYkr9MwmRPRvl336TRg2Uu6M5gSLEpcNhRYLxHiaqpb2EtQ4M= 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 CH2PR13MB3605.namprd13.prod.outlook.com (2603:10b6:610:2c::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Tue, 2 Aug 2022 07:55:20 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::102f:f8b7:b4c6:feff]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::102f:f8b7:b4c6:feff%5]) with mapi id 15.20.5504.012; Tue, 2 Aug 2022 07:55:20 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Peng Zhang , stable@dpdk.org Subject: [PATCH v1] net/nfp: compose firmware file name with new hwinfo Date: Tue, 2 Aug 2022 15:55:03 +0800 Message-Id: <1659426903-11379-1-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 X-ClientProxiedBy: SG2PR01CA0110.apcprd01.prod.exchangelabs.com (2603:1096:4:40::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: 7d27229d-9265-4845-c6c4-08da745c58dc X-MS-TrafficTypeDiagnostic: CH2PR13MB3605:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vIppBq+JEkmZpsYOeZWRzVu8YyNQnu7WCF/M5ecsRLKQLZFIBo+jrcTgx8Y0d6uAQJDJgIcH4uLsQ2iwrWChLjLtwWlXwqOStcVmDEucE49BmgJCRgJhZK5rkBgM9de0bLh7ytJC///YVlpDVDzdOueJMVrKYnw6naf7xtcFaiE+hwI0cySW/Md96gNwEzhHiBqY/jjnBrq5WYT8ezga0rgmKzpMBSFhh907dr681osMsDBgvP4c7ePQRkf8u9q21ec2Y5zUxy/yzY9V+NEp1KLJ1FWReLIq+k+QCLqE20CM9pMMwBc9iWuaKIvf2x41NRVAPRI5uww6r/u2gxdOvoryFoSx4MsJFBzgIsV5c91sYoFPaE37SP0vUKfsogoriNZrWN4M7ik47V5WjuW5N6I4Y4uSx0hG8jJviXn3ABj2v5VgAlJH0ZqrwNBaFXv/lW5kuVb0oDNIqE+XUiPitSvcv+aZu+MfhyyGOiejXTSriY7UqqnWgpKrMCh/Wa/AH5xfudc2bs55KpdxMi8pXFqvzqNqmfCI53UOupSsHHrvnfqLImHXs0BdcUn92VRclyDrmCc3XItMgBFLxFdaQ58UYmy1wTHJEM2uX39zgJa/Gp6BWbai/YARMaVqWqZLJ4HIshDlYSWsfEqn22+CNoPRVQXuCntiRI2diWc9H5S5j57KBKk84q1l0qvrSYZbeicbYWs+wgB1paU+jmBCr88NsUIFS6dSZ5ZxAkA7UYjv345V+CLAaJMxOtJtJhf7KcpA1BfLpO4a8DIWWiuonIhWxrI1iyeYPKOtDZ48+0c4dZQNnjjMj0xPJLBIGvMfqpgORDIUqPaZdQpK1RLLT068JFiJBki3AGjs5vzgu5A= 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)(366004)(376002)(396003)(39840400004)(136003)(346002)(38350700002)(6916009)(6506007)(44832011)(38100700002)(8936002)(26005)(66946007)(450100002)(6512007)(86362001)(186003)(8676002)(66556008)(66476007)(316002)(66574015)(4326008)(83380400001)(6666004)(41300700001)(5660300002)(36756003)(2906002)(6486002)(2616005)(52116002)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?GsYYGxD6ZdddCZl5Bb1InkvqECy+?= =?utf-8?q?LIse/E2N5/7bDuSefU1chutmz76gs8FPT08t7RBZJ3l7D1LYlRcWdLws/e56ykOxp?= =?utf-8?q?xqA819RrHkJIO0aARnVCWBfHCVDO0VCV6Y7s5CppOmjY/LCOlNBtTcFHu5i0Izvlc?= =?utf-8?q?s6PLnW/TZtXNxZlZkxF668WBl4gC/JFB4NEji7bRxT0LMg32msIQXuw8Oy6rW9K27?= =?utf-8?q?juTpZ31I2bqXx1WF3V5mrEBkaaX3J89lg6hiqNdrwUxvay+JitTRTyXhKxsUWgUev?= =?utf-8?q?KO5m/Y3VD+vMWJVXE1tmlE4s9xGS3xRafT0V9omnls/ctsc4VQs17cIlnbuWhekK0?= =?utf-8?q?t4UIMAnRH5Yh6PNa1fcAiPLss/pl2pAs8Ch3pNBCElQB89NJbt/nkfYtUcEtrLNKP?= =?utf-8?q?7EpYrHrpu9EMf3jTbpN8iyzTUBrmCVMBP8oqTJbE6mWzeHFQaD0VZxjfDFaSb3Q+F?= =?utf-8?q?oDEMlwUnNUyXOX+StwKsXldy2x4ViB72u7OnOwriB/dIS2Tgb8SO8QQmvrwiS+DZb?= =?utf-8?q?9JXxq3nBKygYbaP1rejum8s6JRNaq8iV3S8nC7pgu5AwHNe2DJ82Bl672AGN2uPkY?= =?utf-8?q?5447WriAxIhrLeU6OlZbLpgJjPd9nf3TbMNLkCD+W1l3O3LIB2FI4wh9fnRRsjCSA?= =?utf-8?q?Eil/rsXpmQwPox1ueWcgwFyFLT7KaDm8HXgxWTEeTjf13U1PEBiRfIBl2HoZzgVKd?= =?utf-8?q?S/wRsXU6fOUlr9nKFP07gplYE3wqQYI9bzQ95runvZJTKydhV7BEcvGOlJDfpV5/p?= =?utf-8?q?AaOy+xsNoN8++Eeno/vExEu+JvJjlhJE1lpR+QjS9FAqShW/qTeF66Hv2KtnxOgBl?= =?utf-8?q?A38PVen6CzDntQnwLFDs5wWQRnLVj+sY1jQaSI757XhVFYnswGMah3QL4jhHqc8It?= =?utf-8?q?yBeXsTY+Biia2bBqp7S4KZWrMwGwN+7GiriTFgfWCiCxUIaBXBfH0vSh0J3WAT0UT?= =?utf-8?q?Zh1DnZ1kaT5tsFRmQZq9P+pyYpU4v2ay2TT4QwewriOBUSC611qrrVyR7U8H5XD1A?= =?utf-8?q?TuH13V+I6aeUslloOgQJPEDp/ctWOhtZgVIJ3jOdSUIsoWiOW6v+lxrF5qw6ayWsu?= =?utf-8?q?XUehxBhbDe3LOseaWCzC8TmTBq5sOuDcm8OwHAMsvCHEz9w3MyzFuZ7kBIQgA/TMh?= =?utf-8?q?EVUgdcALqUeIkbn5DfNZRILHadbv5l111QFg/dBO1vT7mIs5SVStWTI4FjO0DsqoC?= =?utf-8?q?ZMrPK+/NmmKhA8ZkyrEN0Z0b95j6UQpqxqKpFEoBL4BzaQy5PuVchv70H4rNHUzwF?= =?utf-8?q?8gnEezK2zmBKct+1GNpqgEqqdWETd/vIzV1XoQfMddrBuSScpaAix3bkGQk+6XgoT?= =?utf-8?q?ZQep2N00SFnonb4BqO6Qo6jDyMmSdZRbOPBHps1fa0YOxl4sTLFz158rr81BBGBuj?= =?utf-8?q?Yok+we3SS8qm3t8Crc3chZxLtjSNpIIlCipm0JYKB5DY7j3MholwLgO4hrHDYBxFU?= =?utf-8?q?xpyz2pyPiBQxzR29j7X6A+jiR1sEYCdP+N655fUu25hcCr9EGMXVVgsVcGS0EitSX?= =?utf-8?q?j1hU5zQV3+6N0uuW5l4AUiwaO7oXpmHZZQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7d27229d-9265-4845-c6c4-08da745c58dc X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2022 07:55:20.5835 (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: 0/hHwIJp2u6BXJDT/kqcBkAAxkfbb+MDn8oqUIzE1LpEdcdemp+LJDa4hNmQMIK7Kv/zcCM0klqbiS9+KZ+BjkpVM05B2CwdxIFJXBLf0MI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR13MB3605 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 From: Peng Zhang During initialization of the NFP driver, a file name for loading application firmware is composed using the NIC's AMDA information and port type (count and speed). E.g.: "nic_AMDA0145-1012_2x10.nffw". In practice there may be many variants for each NIC type, and many of the variants relate to assembly components which do not concern the driver and application firmware implementation. Yet the current scheme leads to a different application firmware file name for each variant, because they have different AMDA information. To reduce proliferation of content-duplicated application firmware images or symlinks, the NIC's management firmware will only expose differences between variants that need different application firmware via a newly introduced hwinfo, "nffw.partno". Use of the existing hwinfo, "assembly.partno", is maintained in order to support for NICs with management firmware that does not expose "nffw.partno". Fixes: 646ea79ce481 ("net/nfp: move PF functions into its own file") Cc: stable@dpdk.org Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_ethdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 5cdd34e588..e9d01f4414 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -680,7 +680,9 @@ nfp_fw_setup(struct rte_pci_device *dev, char card_desc[100]; int err = 0; - nfp_fw_model = nfp_hwinfo_lookup(hwinfo, "assembly.partno"); + nfp_fw_model = nfp_hwinfo_lookup(hwinfo, "nffw.partno"); + if (nfp_fw_model == NULL) + nfp_fw_model = nfp_hwinfo_lookup(hwinfo, "assembly.partno"); if (nfp_fw_model) { PMD_DRV_LOG(INFO, "firmware model found: %s", nfp_fw_model);