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 20B9FA054A for ; Tue, 25 Oct 2022 17:08:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1D81142C42; Tue, 25 Oct 2022 17:08:25 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 82EE942C1D for ; Tue, 25 Oct 2022 17:08:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710503; 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=5jhIlgGbw2CZT6Mu6mtWMVweiNW7GWc/vw3ajVzjPwc=; b=Q3SndPFL32umJ1EDmvK2SU9o/2Pz5Sm/ve7pNz9ZKQX2pOiR3O5Sr2fYMuBCOaJGntQn1k PYEoOFk+W+8g8UPWP4Y2sBjelVHNay68+JY2QvKPyfELmPOxXf9WxgeM+eBbKjHYdA+Xdp 0pp7T9tuPSpv7JfNJHRFiCPEudFSq+s= 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-85-lR5y9IaGMJuwS2lv07poPQ-1; Tue, 25 Oct 2022 11:08:15 -0400 X-MC-Unique: lR5y9IaGMJuwS2lv07poPQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F12DC38149A1; Tue, 25 Oct 2022 15:08:09 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC4B74A9254; Tue, 25 Oct 2022 15:08:08 +0000 (UTC) From: Kevin Traynor To: Peng Zhang Cc: Chaoyong He , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , dpdk stable Subject: patch 'net/nfp: compose firmware file name with new hwinfo' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:03 +0100 Message-Id: <20221025150734.142189-8-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/01/22. 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/45ae1b821d35cb4727a11e691a4f486fa2d7b048 Thanks. Kevin --- >From 45ae1b821d35cb4727a11e691a4f486fa2d7b048 Mon Sep 17 00:00:00 2001 From: Peng Zhang Date: Tue, 2 Aug 2022 15:55:03 +0800 Subject: [PATCH] net/nfp: compose firmware file name with new hwinfo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 06be30d4763cad78caa156da446f759eac89cd72 ] 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") 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 1a9f7581a7..67a77f0567 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -666,5 +666,7 @@ nfp_fw_setup(struct rte_pci_device *dev, struct nfp_cpp *cpp, 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) { -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:58.767401387 +0100 +++ 0008-net-nfp-compose-firmware-file-name-with-new-hwinfo.patch 2022-10-25 14:18:58.360797908 +0100 @@ -1 +1 @@ -From 06be30d4763cad78caa156da446f759eac89cd72 Mon Sep 17 00:00:00 2001 +From 45ae1b821d35cb4727a11e691a4f486fa2d7b048 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 06be30d4763cad78caa156da446f759eac89cd72 ] + @@ -29 +30,0 @@ -Cc: stable@dpdk.org @@ -39 +40 @@ -index 47359501bc..dffecc3369 100644 +index 1a9f7581a7..67a77f0567 100644 @@ -42 +43 @@ -@@ -681,5 +681,7 @@ nfp_fw_setup(struct rte_pci_device *dev, +@@ -666,5 +666,7 @@ nfp_fw_setup(struct rte_pci_device *dev, struct nfp_cpp *cpp,