From patchwork Thu Dec 8 03:31:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 120545 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 02B42A00C2; Thu, 8 Dec 2022 04:31:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5CEF440E28; Thu, 8 Dec 2022 04:31:37 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2106.outbound.protection.outlook.com [40.107.220.106]) by mails.dpdk.org (Postfix) with ESMTP id 8EB1640DDC; Thu, 8 Dec 2022 04:31:36 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SI4t7vBSnaTXsTGycLy0GJrw9HgCRWJ08s2DRv7fcmnsjs6252EmSKynF2K/QV/PVE010y7SSjudYUVLB2H5cPTBQJTuvht7BhEW/sT8QeVDCqcYlz2Z8IjISqswNLhvfIA28ANV9ih/bNoqZgmp9KdSu6djcKFjQwTQTjgMgbTY4L1h2DXUoVJ0LiLjCgyVpGAraGqb7nmalPSj7vpWIB1K8ufXEMTJaLtG2QYvmk4eGz4+6yQJZWaZ0rvDgUwX+pJqKjGEATQcRBFdhzRXhCumLBQj41XfGqTIXBYEQbmDwnRY0veIWetIM1rJPcST/U9PpyQGzhAT4qP8Sd2/iw== 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=5308Y5KTDd7geftkDT+T4xMIJ3fw7KXFTfry5g/3eOM=; b=XkmdoKoDSjhRU2niHMFWudWCmuY3l1vMII55D8c0sA6h2ceXnqSbjW/CaPIMreGRS1GQpE5lwLOz9VlfSRXy6AeAuQh4iUhuTaZFsXFtlvDt/qo710njXIbDPkyscZexQfT8rGDWTy8vAYdFun0NVqcbJBmSQAU9sfWnJwqH6Ox/U+ylGz3jccbWoGNsEclYnmKQORVS+pb0uYt8snXf0j9rwG6ZYTXXv8E0RAIjqzqjLBU+aBMByhyTe3UzUUUSNxZf1h+bmN0oqUA72RvDbewzvd0/EuT/+XndfXCFKmtZuiqqZwxxW7w+PCoyV3d+NDNexLfsQKIuEJBXrojABQ== 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=5308Y5KTDd7geftkDT+T4xMIJ3fw7KXFTfry5g/3eOM=; b=mkiEKvYKUOdM9zTZL/KCDIXme4wBkIdZlcxQayEx5IxHBcCZagS+FR5DSoDB69JEDNQDgf27Q0JVtIU0XK/MgJs7rr7YBBfhiLY+XocPyWSxd9jQqk9S6z9nsmh5rm3e2mpkKEKDjsqsje1JwmkFOWcA1DylLbr/3txCuF/BIw0= 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 MN2PR13MB4054.namprd13.prod.outlook.com (2603:10b6:208:265::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.14; Thu, 8 Dec 2022 03:31:34 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5122:8c31:51f3:4ee7]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5122:8c31:51f3:4ee7%4]) with mapi id 15.20.5880.014; Thu, 8 Dec 2022 03:31:33 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Peng Zhang , stable@dpdk.org, Chaoyong He Subject: [PATCH v2] net/nfp: using the correct PCI name to look for the firmware Date: Thu, 8 Dec 2022 11:31:16 +0800 Message-Id: <20221208033116.34163-1-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20221128023705.32671-1-chaoyong.he@corigine.com> References: <20221128023705.32671-1-chaoyong.he@corigine.com> X-ClientProxiedBy: LO2P123CA0105.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:139::20) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|MN2PR13MB4054:EE_ X-MS-Office365-Filtering-Correlation-Id: 95ac9cd3-2436-47f4-7cd6-08dad8ccb41d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tpWzIEg8heQp6mUJaxUeA2djd+WyLO84AxFuRq3DPnfLhRH0qKkyqqkhfNEaS8Qz8pyjDSVOCIl4Bf39wN4kYqT3Y1uRAJISEcusSBEFPXomM02jYXHLYjDnIHLBqi/npZq4LukoEq1MI+UxJ7zvxqpNeelWgPPsq38Jf9ndw2EgqyuqtsHpUT8mqJpPV5MJ1AECdFLqQgONSShF7U8ckYDRVQW6Tr4ljg7SVpMROl1F6DwkG9vZXw+E/qDtlp9P8rKtbS7DO3BzB5M7lTUf8sBaROE18+RuQTvjb0RLTit3S1JrwQy3+esHcFS54nii0M65Ta+ul8aUJqXvVWwcAK0rYJdfQC4umFLSnZ0p1M18Y/A8ZlZWlrty/IaDft5DMWVY25q8FPMjdN5phgbR40p0o55zKUnSLRGcfREl9assdkOJmhZr8Sh+0HOfdeqVp7LrTEb6IRggUIWiWkVLsrWS7eT7y+sUPUbdOACCzs72NCDKSqzUWpPITNac7VXfBwpgYkY4JFjg5h1ThdtCBxqgQqNLNUfhasKs+W1zJcZDqpUkYO4lFk6FVeW8Hz3jrV4R9QBZ0oZzJGWfVFxNHXuHhhnVW+atR56PxNLlSxZUqh87jiD2T5HqKjHD72aXPmNHb5VF9nHRNGg/QYb9acYjtZTNp96pzuSYoE5VyBJVLVSgdlstosR7kVYZV+lp 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)(396003)(366004)(346002)(376002)(39840400004)(136003)(451199015)(66574015)(52116002)(38350700002)(86362001)(478600001)(36756003)(6486002)(6506007)(38100700002)(83380400001)(6512007)(2616005)(186003)(1076003)(41300700001)(8936002)(4326008)(44832011)(6666004)(26005)(316002)(54906003)(66556008)(107886003)(5660300002)(66476007)(8676002)(6916009)(66946007)(2906002)(450100002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?vQlx6I+Nd/xcl4OEjFXXGlaN6NQC?= =?utf-8?q?ZMwzbGG4uPULkE8pQTcw78WJoSlr5cfcPb9HlY0jcrAReeqc5xntatXOaxgWAU2N5?= =?utf-8?q?mZO31BLpkjZrl5Y7+WohVefuZVddJj4yeixSG0MzBGdDgdP/NQgmqC8q6sTb0O1Kf?= =?utf-8?q?1YH68iXh1Vey7QNa0CFPN+4g4IUUjDQS1O8UEsApRkAU8595VbNUSgugmOcI73+TX?= =?utf-8?q?yYp56N6KshV0Xu9bl1Wec7hLE0xUU6WiP1NctVBLUQQqr6XVG/LZU4nRxnBwemXxw?= =?utf-8?q?33ntn3tL32y/o5ct2AZd8S7/YnF16E53nuktpf1gIdTuQ/vYoOXhEzHRpmS3v1jKw?= =?utf-8?q?I5Ov6lDn61R1U6+G8Kz+eAsYBfbcL6G2Erd0CJU3CJBmyxB9ZgcO/KlQaa1F/iFph?= =?utf-8?q?JLMiyHEf5nXSfVNtwnocY/KOpQFhpKH7AEH8Oc7grqvet93cKvgxgq3f4OPOE96mY?= =?utf-8?q?D9tuNFy7wZw9j7HvSEn9d1JvyKlDsrFWHwZkgL/L6MylcYOWOe55aCB2vUFXyi2fC?= =?utf-8?q?wSK/HsxMlhGd9pLkIb8iEOGhC2UHjLqaHHug7mf/zQxU5q6XJX+XH02SFtFEwSAMz?= =?utf-8?q?T1qBwcs1Pk9/zhwhAMMn1ivxb+9o3pOFhpOSr8e+DzVwzbOZ+UyJFqnwE6nsoGfNa?= =?utf-8?q?x/ACL1ExIsebEubj5IJTt+aJNCFb+h3caJIi0a7Z90zzbHfgvcCm1aaLm1k9cS5Lm?= =?utf-8?q?qgKdWyRGZ2ILXcvXPyyR64ZgtgBig0eDiP/J6kbBpgTxeI8jam+nOif0Ax9mDg120?= =?utf-8?q?HJ1BnjZzgROaXPQYXRDYmRObx5zRIB3MbAtmX+3ds3DrKnLzV5IAOOMCIh+XIXh6Z?= =?utf-8?q?XTEYWBCICnsq/g0XjKyFD7avQw742k7TAGlN8EVjZschinFnX5Ee0mVwsscYuDiPF?= =?utf-8?q?aieybEMCIupU89ELIiq8RDk3aacmKg87/cxDyeHL2fW2KoAW9azk0tX2WHuRzcSa1?= =?utf-8?q?k1HebCkP8JzWQbsfFQ+fbWDBsvKIhBXemzPozBKG/NiV8WGRcycHR4za69idI2s7M?= =?utf-8?q?ol+cIrNRotZvnkL3PZ6RH3yVEhdfiwGfGiyzg+M0FWJGrihBV/w6UklfWWg272U7U?= =?utf-8?q?VFafbS6se4Do1qVvM9rmj52Y6SyhfcPrtQ4vhEXLDT9aYhgkbHRQeVAOoP723yyQ1?= =?utf-8?q?wvGNm9niJq+mlZU4+W8Ce3XAqW1XQ7sh5cirMjQVcj/NtmcJyyTxgmx7h1kYQIXnj?= =?utf-8?q?bHgbiDHK00Mzq0hHyGNgIUnUQGzlE5IT4XqVqgy8mOmZP/CieatJKeKGEJLIRQSNd?= =?utf-8?q?3B+3PC68q7xnH/nsQD5N8Dmh8yKl9tRRoY3GypIpcwSSgSCn387I4KxmCbQhXvpXf?= =?utf-8?q?FTv9einQgBjgjEhtYpwJUK5s/GClMRGMT06RzxZoLQmt9QOTRsbd64ZUe1zm0EdSz?= =?utf-8?q?jEAlHDa7PXB4cpv8eEwASYtU1srCnheFfyZnkKM58VoBZLKgd5M1swzHZ+sRZ8UKY?= =?utf-8?q?sbFYayTxuAEnza6wvMIgBI9LThuTkr/Mq8SVL8fN84Cbx/UmxeBB3Aos7ovr/uCKw?= =?utf-8?q?3Qj44zb0c4D41+gZ3fyIflJHEEcEVokR6g=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95ac9cd3-2436-47f4-7cd6-08dad8ccb41d X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2022 03:31:33.7479 (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: tqyh0iTwpVIGA8ANUgu4moEc3EYY7gyUwQqNXnttwBdASYCqBXrwi3CAuanFUXB+WikenfrFaNfe056h6cTxXbGZmhop7W8VTD1nfa4XqP8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR13MB4054 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 In the description of nfp document, DPDK PMD supports that the PF looks for a firmware file by the PCI name. After this commit, it will looks for the PCI name format such as pci-0000:04:00.0.nffw rather than pci-04:00.0.nffw, which will keep consistent with what is written in the nfp.rst. Fixes: 896c265ef954 ("net/nfp: use new CPP interface") Cc: stable@dpdk.org Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He Reviewed-by: Niklas Söderlund Acked-by: Ferruh Yigit --- v2: * add fixline. --- drivers/net/nfp/nfp_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 0956ea81df..f22ae24b53 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -724,7 +724,7 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card) goto load_fw; /* Then try the PCI name */ snprintf(fw_name, sizeof(fw_name), "%s/pci-%s.nffw", DEFAULT_FW_PATH, - dev->device.name); + dev->name); PMD_DRV_LOG(DEBUG, "Trying with fw file: %s", fw_name); if (rte_firmware_read(fw_name, &fw_buf, &fsize) == 0)