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 0F2AE46211 for ; Thu, 13 Feb 2025 11:01:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0AD4240287; Thu, 13 Feb 2025 11:01:29 +0100 (CET) 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 6104040287 for ; Thu, 13 Feb 2025 11:01:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440888; 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=NcroSdfsvFwKB6YLd8TwmAHoH8CcqTjWKqPhYqO6QcU=; b=YfR++q/x4jRwt2JOLCNMu9wBpP2f6SHwmhuaggpvhK+n8qQm+QJEKsH8s01w5yWR17wXTe BoCk+2cHqTGNrj+32xcc1Vd9EbTiDDUR1r+Cg9DfHKhtTIIDFaOkx8X3zmRgxjQJvv3vaT eSKk3SDAOPPVLtnvMOpN/zQ7Ko6d1hI= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-215-FrbT3sFtPZal89qN5IM7SQ-1; Thu, 13 Feb 2025 05:01:24 -0500 X-MC-Unique: FrbT3sFtPZal89qN5IM7SQ-1 X-Mimecast-MFC-AGG-ID: FrbT3sFtPZal89qN5IM7SQ_1739440883 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5098F180087E; Thu, 13 Feb 2025 10:01:23 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 540321800360; Thu, 13 Feb 2025 10:01:21 +0000 (UTC) From: Kevin Traynor To: Chaoyong He Cc: Long Wu , Peng Zhang , dpdk stable Subject: patch 'net/nfp: fix firmware load from flash' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:58:10 +0000 Message-ID: <20250213095933.362078-43-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: mjvyO-fgH8jHNkE6DmxH8yWkUHROlljDJmgArzG9cE0_1739440883 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.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 02/17/25. 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/878de746e37734e368f4d250699e5af438d7b905 Thanks. Kevin --- >From 878de746e37734e368f4d250699e5af438d7b905 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Wed, 22 Jan 2025 09:47:50 +0800 Subject: [PATCH] net/nfp: fix firmware load from flash [ upstream commit d7c07c8e29bea66622183e4279d881c20fafe375 ] The firmware load policy 'NFP_NSP_APP_FW_LOAD_FLASH' means first try to load from file system, if failed then try to load from flash. The original logic will cause load firmware fail if any mistake occurs in the load from file system process. Fix this by relocated the related logic. Fixes: 08ea495d624b ("net/nfp: support loading firmware from flash") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index dce03ed550..b3d7bc301b 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -1533,11 +1533,5 @@ nfp_fw_reload_for_single_pf(struct nfp_nsp *nsp, int ret; - if (policy == NFP_NSP_APP_FW_LOAD_FLASH && nfp_nsp_has_stored_fw_load(nsp)) { - ret = nfp_fw_reload_from_flash(nsp); - if (ret != 0) { - PMD_DRV_LOG(ERR, "Load single PF firmware from flash failed."); - return ret; - } - } else if (fw_name[0] != 0) { + if (fw_name[0] != 0 && policy != NFP_NSP_APP_FW_LOAD_FLASH) { ret = nfp_fw_reload_for_single_pf_from_disk(nsp, fw_name, pf_dev, reset); if (ret != 0) { @@ -1545,4 +1539,10 @@ nfp_fw_reload_for_single_pf(struct nfp_nsp *nsp, return ret; } + } else if (policy != NFP_NSP_APP_FW_LOAD_DISK && nfp_nsp_has_stored_fw_load(nsp)) { + ret = nfp_fw_reload_from_flash(nsp); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Load single PF firmware from flash failed."); + return ret; + } } else { PMD_DRV_LOG(ERR, "Not load firmware, please update flash or recofigure card."); @@ -1609,11 +1609,5 @@ nfp_fw_reload_for_multi_pf(struct nfp_nsp *nsp, } - if (policy == NFP_NSP_APP_FW_LOAD_FLASH && nfp_nsp_has_stored_fw_load(nsp)) { - err = nfp_fw_reload_from_flash(nsp); - if (err != 0) { - PMD_DRV_LOG(ERR, "Load multi PF firmware from flash failed."); - goto keepalive_stop; - } - } else if (fw_name[0] != 0) { + if (fw_name[0] != 0 && policy != NFP_NSP_APP_FW_LOAD_FLASH) { err = nfp_fw_reload_for_multi_pf_from_disk(nsp, fw_name, dev_info, pf_dev, reset); @@ -1622,4 +1616,10 @@ nfp_fw_reload_for_multi_pf(struct nfp_nsp *nsp, goto keepalive_stop; } + } else if (policy != NFP_NSP_APP_FW_LOAD_DISK && nfp_nsp_has_stored_fw_load(nsp)) { + err = nfp_fw_reload_from_flash(nsp); + if (err != 0) { + PMD_DRV_LOG(ERR, "Load multi PF firmware from flash failed."); + goto keepalive_stop; + } } else { PMD_DRV_LOG(ERR, "Not load firmware, please update flash or recofigure card."); @@ -1727,6 +1727,6 @@ nfp_fw_setup(struct nfp_pf_dev *pf_dev, err = nfp_fw_get_name(pf_dev, fw_name, sizeof(fw_name)); if (err != 0) { - PMD_DRV_LOG(ERR, "Can not find suitable firmware."); - goto close_nsp; + fw_name[0] = 0; + PMD_DRV_LOG(DEBUG, "Can not find suitable firmware."); } } -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:39.181234426 +0000 +++ 0043-net-nfp-fix-firmware-load-from-flash.patch 2025-02-12 17:29:34.325945781 +0000 @@ -1 +1 @@ -From d7c07c8e29bea66622183e4279d881c20fafe375 Mon Sep 17 00:00:00 2001 +From 878de746e37734e368f4d250699e5af438d7b905 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d7c07c8e29bea66622183e4279d881c20fafe375 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index ca808afdd9..b9cb9fc652 100644 +index dce03ed550..b3d7bc301b 100644 @@ -28 +29 @@ -@@ -1535,11 +1535,5 @@ nfp_fw_reload_for_single_pf(struct nfp_nsp *nsp, +@@ -1533,11 +1533,5 @@ nfp_fw_reload_for_single_pf(struct nfp_nsp *nsp, @@ -41 +42 @@ -@@ -1547,4 +1541,10 @@ nfp_fw_reload_for_single_pf(struct nfp_nsp *nsp, +@@ -1545,4 +1539,10 @@ nfp_fw_reload_for_single_pf(struct nfp_nsp *nsp, @@ -52 +53 @@ -@@ -1611,11 +1611,5 @@ nfp_fw_reload_for_multi_pf(struct nfp_nsp *nsp, +@@ -1609,11 +1609,5 @@ nfp_fw_reload_for_multi_pf(struct nfp_nsp *nsp, @@ -65 +66 @@ -@@ -1624,4 +1618,10 @@ nfp_fw_reload_for_multi_pf(struct nfp_nsp *nsp, +@@ -1622,4 +1616,10 @@ nfp_fw_reload_for_multi_pf(struct nfp_nsp *nsp, @@ -76 +77 @@ -@@ -1729,6 +1729,6 @@ nfp_fw_setup(struct nfp_pf_dev *pf_dev, +@@ -1727,6 +1727,6 @@ nfp_fw_setup(struct nfp_pf_dev *pf_dev,