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 2A70341D52 for ; Thu, 23 Feb 2023 16:07:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 26E4F43221; Thu, 23 Feb 2023 16:07:13 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 5F45F4321C for ; Thu, 23 Feb 2023 16:07:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4JbGUUdFLxGlxVL3M47MUOXSNM50dgIXI4kErpaNWNk=; b=PoFq/Q2Hv/5jQaW+/moj3ksRKlYfMZLMwfAo3+Hpz8CebN5Fo6K1vQxXvB8mYyWNN86GFa qaCnx6IcOra3PTBXpl8xWjVl0ZlXd8SsYVtp3uqpMWACfgZK0nMf7V6thOvtr1sCOXaBUx rL06JHrvytQOQ5abkhKdcudjTpZdkKk= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-198-7Z6VcAxqNKOOp9eOmjU8dQ-1; Thu, 23 Feb 2023 10:07:08 -0500 X-MC-Unique: 7Z6VcAxqNKOOp9eOmjU8dQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8A2181C0A5BB; Thu, 23 Feb 2023 15:07:05 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B0FD2166B29; Thu, 23 Feb 2023 15:07:04 +0000 (UTC) From: Kevin Traynor 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 21.11.4 Date: Thu, 23 Feb 2023 15:05:04 +0000 Message-Id: <20230223150631.723699-13-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 21.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/28/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/d13acd65cc5f8e17e5ab0474c114f2c5b7920645 Thanks. Kevin --- >From d13acd65cc5f8e17e5ab0474c114f2c5b7920645 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 [ 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 74f4c1edeb..8f922e4465 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -637,5 +637,5 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card) /* 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); -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:24.172478314 +0000 +++ 0013-net-nfp-fix-firmware-name-derived-from-PCI-name.patch 2023-02-23 14:46:23.714235771 +0000 @@ -1 +1 @@ -From 3ddb4cc0914a13d6dd47a497c1f61919b3ed1c20 Mon Sep 17 00:00:00 2001 +From d13acd65cc5f8e17e5ab0474c114f2c5b7920645 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 3ddb4cc0914a13d6dd47a497c1f61919b3ed1c20 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index 0956ea81df..f22ae24b53 100644 +index 74f4c1edeb..8f922e4465 100644 @@ -34 +35 @@ -@@ -725,5 +725,5 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card) +@@ -637,5 +637,5 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card)