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 06DD741D4F for ; Thu, 23 Feb 2023 10:37:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0313A43160; Thu, 23 Feb 2023 10:37:46 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 17A0143150 for ; Thu, 23 Feb 2023 10:37:45 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id j19-20020a05600c1c1300b003e9b564fae9so3638486wms.2 for ; Thu, 23 Feb 2023 01:37:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I3y/6kZDqOgNQuf+U0OWdmkoJqNuyEuXHWcxMiU+BbQ=; b=mkmKgKk+mHZdeaI+/xhG79osYJ3ewg68sGL0Cb78gmFYCv12gIbXLjOZFlxx4iyXax +yn6cwhVBAA6EAyn/xhawY7YSEAJ14wj044wrDOpEwJqS/EKzgacgmvOCDTliQQSpOsh RZA//UbOaD3Q0CJ/Gnb2M5NxHJzz2MibWOPPFS1JMz0CttuMOx9J6jQcuoxyvw3466At LfCuexyRwWgGghNCNyxykSSMHx0VP898D81KNe99lP9+o/fptQugBi4ARTO74/RcvqGq TvdBQ0yIy1zzAoW37c4ysOw0KFkpUhdKtgt1LSHe01ViparESJ1hDIY0x0vxJa71j9uX KgPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I3y/6kZDqOgNQuf+U0OWdmkoJqNuyEuXHWcxMiU+BbQ=; b=EqNAlWHMe96dFfn6Aw4s+H4CFYPvYmR64/QH4ogdlFoXagFXRW5UAcRPlEh8Q2eg/Z etancTz0dnRsx1cAL9h6BhRnsNXkT+GnqXe+hpQlgEIXxUAj7fbIGCE3BXsragYtRkCs NfEy3CPP73QdFk8DBsEUKE+4qcVegkro3kaYtMyHpGKtDBEc8hZMkZNksRkFqeb8cpGd MJ53ONw4oGEckRjmw9T3OCi755z0Ir4dnxphkxGodXgRA13O3arv/N2C+VvskD3k3w4P An45uJUPipRqBHOT8XAQCYb/FhTobbXuiSMMOfazwbCeorv8Vcr1N2MNS38IIvbcRopC 8fPg== X-Gm-Message-State: AO0yUKXPI0mJpAze98MLR/iOZUo3IprLBKMAFl+Rkq0Zzd3GgLLrhNp0 x6liqspB1o1QCX/7snwFH88= X-Google-Smtp-Source: AK7set8Pv2OVierGtG8iRzygSthI47Txa4ZKZt/MKg1APj5rbcp+dCVuOukbWwDmZayP3KQ2gG5DQQ== X-Received: by 2002:a05:600c:3d92:b0:3da:1e35:dfec with SMTP id bi18-20020a05600c3d9200b003da1e35dfecmr8394194wmb.4.1677145064713; Thu, 23 Feb 2023 01:37:44 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id k2-20020adff282000000b002c6e8cb612fsm8466656wro.92.2023.02.23.01.37.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 01:37:44 -0800 (PST) From: luca.boccassi@gmail.com 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 20.11.8 Date: Thu, 23 Feb 2023 09:36:14 +0000 Message-Id: <20230223093715.3926893-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223093715.3926893-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 20.11.8 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/25/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/a323b6863ee5fdc8280b3be9b59c436c87c61e15 Thanks. Luca Boccassi --- >From a323b6863ee5fdc8280b3be9b59c436c87c61e15 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_net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index b09ccac345..f4925e1879 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -3538,7 +3538,7 @@ 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); fw_f = open(fw_name, O_RDONLY); -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 09:36:28.705293713 +0000 +++ 0010-net-nfp-fix-firmware-name-derived-from-PCI-name.patch 2023-02-23 09:36:28.178169056 +0000 @@ -1 +1 @@ -From 3ddb4cc0914a13d6dd47a497c1f61919b3ed1c20 Mon Sep 17 00:00:00 2001 +From a323b6863ee5fdc8280b3be9b59c436c87c61e15 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 3ddb4cc0914a13d6dd47a497c1f61919b3ed1c20 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ - drivers/net/nfp/nfp_ethdev.c | 2 +- + drivers/net/nfp/nfp_net.c | 2 +- @@ -30,6 +31,6 @@ -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; +diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c +index b09ccac345..f4925e1879 100644 +--- a/drivers/net/nfp/nfp_net.c ++++ b/drivers/net/nfp/nfp_net.c +@@ -3538,7 +3538,7 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card) + @@ -42 +43 @@ - if (rte_firmware_read(fw_name, &fw_buf, &fsize) == 0) + fw_f = open(fw_name, O_RDONLY);