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 4B7B441D8D for ; Mon, 27 Feb 2023 08:04:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4691940A84; Mon, 27 Feb 2023 08:04:26 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2087.outbound.protection.outlook.com [40.107.220.87]) by mails.dpdk.org (Postfix) with ESMTP id D48BD40A7D for ; Mon, 27 Feb 2023 08:04:24 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PCP27xks/ZlDSJlnsdgZNmpcScNZDCQPQoyKnb6stpM0FMp+5gewMnu2KYVLdJBQIgIxcGWv7TlzULX5lE3vOt+oMdcQfdiMt4aNt6oRmtvsOzsAuSvJWPyLHRr7Hv9j59O6wwwquRC/2Pf4Xm9GimwqJTHn3AdqcUefS8h30Bm3pHYBAg52v1YCt0H0Spuq5yubD2mH6y30ZImiTQe0wuvlhB9SyCZR0UlzjXfWJADiQemfSocT/1NNpOC0quQemwF57jH7upivPTnhjfjkO3D6eu6RyVgL8uGEjfErAVAJK2Wg7NTltObkfHPexIupkcSRnDwqiBRp+9CsLSRRkQ== 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=hMx+5VvZ69vlUU4Zvfn2vIuFi/z9sGw8sK85s7sta3k=; b=EBT08QzDOASU0etOP+NvIs2B99eV7utIstmw03e6ZXgz2K51v01vtn8w4QC4smibcoyeCoRXNadf5l/SVcmEwlbBnrZCekwEv+4AIudoVAGSlzU0G+JNtIvAmWHDj2p+oowpaYlJr5fGEpDn36gt3FR8yL6CICp4dtypFtY/R3NilcIfel5dRuCDUZZ2YUf0sgysAA7/LsvIbBl8uL0dBWkeGKF7wA866CJNpwFKd/52r54xFk13imRYXELMweLoAmvF8S8cDx4aXlWKzSJeGFWsOPlEe0m6w6uqODPhnsnKMa++Hsm5CpkAJ4ZaccjTZXRGg+Q8PbcWhNuATUHDBg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hMx+5VvZ69vlUU4Zvfn2vIuFi/z9sGw8sK85s7sta3k=; b=Kf3OX+W4JlaJJ1EjpTEL0knSF3REhZ+SrwtAkBbZudH3SJN4DPqQZXcsPCutzClZna1SRd5D0rS0tWSR9fcQHalZthfE8zuorQZJW4owthJTtpcXzX0Mm1tdk1lr9ojbcy3XCSiI5YeSLhh7uXSC5lg3x4euazqym3h21z8Uc614jaQaLKufR8HEGholS3WOUKcjuD3RwnIFMTZQ97ESErcyi1wpQg26EoscStMLbaugYSKZUVV6kpJhKtaEpckFBfP1T8C8bkqggYXDKifJTSVYUhak88IwATJHYAd22pbAAbVmAKzv6QNCyXnWYz/V6UsfmLe3IbauLA26alVB4w== Received: from MN2PR16CA0031.namprd16.prod.outlook.com (2603:10b6:208:134::44) by DM6PR12MB4483.namprd12.prod.outlook.com (2603:10b6:5:2a2::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29; Mon, 27 Feb 2023 07:04:22 +0000 Received: from BL02EPF000108E9.namprd05.prod.outlook.com (2603:10b6:208:134:cafe::5b) by MN2PR16CA0031.outlook.office365.com (2603:10b6:208:134::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.28 via Frontend Transport; Mon, 27 Feb 2023 07:04:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF000108E9.mail.protection.outlook.com (10.167.241.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:04:22 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 26 Feb 2023 23:04:08 -0800 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 26 Feb 2023 23:04:05 -0800 From: Xueming Li To: Peng Zhang CC: Chaoyong He , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "Ferruh Yigit" , dpdk stable Subject: patch 'net/nfp: fix firmware name derived from PCI name' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:58:54 +0800 Message-ID: <20230227070107.15664-26-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF000108E9:EE_|DM6PR12MB4483:EE_ X-MS-Office365-Filtering-Correlation-Id: d083f142-ace2-4f40-eeb5-08db1890dab2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zUNIlHVVFsi/LS2KnR5A/VFci9MIazaRB5untw8kMyTIl4T/EWbAMP7jwHiJ1PWTc27xxOIdqJKDLqqm2zXfm1c8ro4kl630J4otmyP1czfDvqAU7R8+28fN9jWpzfHtZs1hRnIz+eCH+42qF6S6ldZ5IWxgxuquspAybocNg4FD3qNZpzpI1GxrAl1Y8Q36Y2W2YsQi25nNsPW9AN1k1ktygOZxoB0wg2tA07+mT5TTD2C1KooMqB3Fs6zXVFTHyIWKQGdoow7VCqHvEVCSlBTK90mgVKVs2+NjhhOTLNzZsRhbDkABxa1/1xL+lz13LicJKc/m1U40g8UTsvJMewQhCm1YZyJeb/f0u9C6bp7lffF1ek5XiBN0i52GTi6zVNXu8usAnv9LW/cq7YzKnriepkS45Zq3SJGkgOHfh2IOVKlE1egB2NWRdRbMFOGXZ+zXtQg8FQfU7lir4Yep2eH3LLPhUr7YwKmaSUw0zpmF3JF5eL38ZYdZSj/D2bTmFye6aWAW850/kRyevQ3W+mcssehTrPBhuwIlYGHy4eyMSVDbHyrvTFolPcct43/PUt8KgduyXklFg41p04QVVGiXV+OExpQC6Jq4enWtdsV4dsxhdrYGezlK2CA3UamHSBFyv0ZzdLg5Fcpt6IxbasEvEAPdGTv0k3IfEFkba6hnGhcHZFr1vJkzNhl1n3uCl5D1Qav7+Qp3hbPZ1u7e8G8nJiRZS9GnMZ6qiiMKD8fmPQpruun5QqH/0bYMUldYxvvwK/X6sVM5ZTKgsK9Bos7Uyr0lqqRBvjRcai10Kfw= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(136003)(346002)(39860400002)(396003)(376002)(451199018)(36840700001)(46966006)(40470700004)(82740400003)(2906002)(5660300002)(82310400005)(83380400001)(8936002)(426003)(66574015)(47076005)(26005)(336012)(2616005)(356005)(316002)(966005)(86362001)(40480700001)(1076003)(53546011)(8676002)(6286002)(16526019)(41300700001)(36860700001)(4326008)(7636003)(186003)(478600001)(54906003)(7696005)(6916009)(40460700003)(36756003)(70586007)(70206006)(6666004)(55016003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:04:22.4386 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d083f142-ace2-4f40-eeb5-08db1890dab2 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF000108E9.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4483 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/01/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=f029ceb7aaacc5aa941e8b7145fdf64b2bc338a5 Thanks. Xueming Li --- >From f029ceb7aaacc5aa941e8b7145fdf64b2bc338a5 Mon Sep 17 00:00:00 2001 From: Peng Zhang Date: Thu, 8 Dec 2022 11:31:16 +0800 Subject: [PATCH] net/nfp: fix firmware name derived from PCI name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 3ddb4cc0914a13d6dd47a497c1f61919b3ed1c20 ] Driver looks for a firmware file whose name is derived from the PCI name, the firmware file name format is described in the driver document. But the firmware name used in the code is slightly different than the name in documentation, document has 'pci-0000:04:00.0.nffw' vs code has 'pci-04:00.0.nffw'. After this commit, driver will look for firmware file consistent with what is documented (in nfp.rst). Fixes: 896c265ef954 ("net/nfp: use new CPP interface") Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He Reviewed-by: Niklas Söderlund Acked-by: Ferruh Yigit --- 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) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:41.813833500 +0800 +++ 0027-net-nfp-fix-firmware-name-derived-from-PCI-name.patch 2023-02-27 14:08:40.739237000 +0800 @@ -1 +1 @@ -From 3ddb4cc0914a13d6dd47a497c1f61919b3ed1c20 Mon Sep 17 00:00:00 2001 +From f029ceb7aaacc5aa941e8b7145fdf64b2bc338a5 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 3ddb4cc0914a13d6dd47a497c1f61919b3ed1c20 ] @@ -20 +22,0 @@ -Cc: stable@dpdk.org