patch 'net/nfp: fix initialization' has been queued to stable release 19.11.13

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.13

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/09/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/5b7455b8fa07f64c4e7eb306bfcf318fecc81c60

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 5b7455b8fa07f64c4e7eb306bfcf318fecc81c60 Mon Sep 17 00:00:00 2001
From: Peng Zhang <peng.zhang at corigine.com>
Date: Wed, 15 Jun 2022 12:14:17 +0200
Subject: [PATCH] net/nfp: fix initialization

[ upstream commit 5c305e218f15552d828e10293d19d9a06c4747f4 ]

When the testpmd start-up, it will check MTU range,
if MTU > flubfsz, it will lead testpmd start fail.
Because the hw->flbufsz doesn't have the initialized
value, so it will lead the bug.

Fixes: 417be15e5f11 ("net/nfp: make sure MTU is never larger than mbuf size")

Signed-off-by: Peng Zhang <peng.zhang at corigine.com>
Signed-off-by: Chaoyong He <chaoyong.he at corigine.com>
---
 drivers/net/nfp/nfp_net.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index 978920f52e..46e1872927 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -2919,6 +2919,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
 	hw->cap = nn_cfg_readl(hw, NFP_NET_CFG_CAP);
 	hw->max_mtu = nn_cfg_readl(hw, NFP_NET_CFG_MAX_MTU);
 	hw->mtu = RTE_ETHER_MTU;
+	hw->flbufsz = RTE_ETHER_MTU;
 
 	/* VLAN insertion is incompatible with LSOv2 */
 	if (hw->cap & NFP_NET_CFG_CTRL_LSO2)
-- 
2.37.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-07-07 09:54:13.826381455 +0200
+++ 0064-net-nfp-fix-initialization.patch	2022-07-07 09:54:10.973824666 +0200
@@ -1 +1 @@
-From 5c305e218f15552d828e10293d19d9a06c4747f4 Mon Sep 17 00:00:00 2001
+From 5b7455b8fa07f64c4e7eb306bfcf318fecc81c60 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5c305e218f15552d828e10293d19d9a06c4747f4 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -17,3 +18,2 @@
- drivers/net/nfp/nfp_ethdev.c    | 1 +
- drivers/net/nfp/nfp_ethdev_vf.c | 1 +
- 2 files changed, 2 insertions(+)
+ drivers/net/nfp/nfp_net.c | 1 +
+ 1 file changed, 1 insertion(+)
@@ -21,17 +21,5 @@
-diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
-index 7b8949ab2c..30039462f7 100644
---- a/drivers/net/nfp/nfp_ethdev.c
-+++ b/drivers/net/nfp/nfp_ethdev.c
-@@ -516,6 +516,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
- 	hw->cap = nn_cfg_readl(hw, NFP_NET_CFG_CAP);
- 	hw->max_mtu = nn_cfg_readl(hw, NFP_NET_CFG_MAX_MTU);
- 	hw->mtu = RTE_ETHER_MTU;
-+	hw->flbufsz = RTE_ETHER_MTU;
- 
- 	/* VLAN insertion is incompatible with LSOv2 */
- 	if (hw->cap & NFP_NET_CFG_CTRL_LSO2)
-diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c
-index bddb1ecedd..b666428a05 100644
---- a/drivers/net/nfp/nfp_ethdev_vf.c
-+++ b/drivers/net/nfp/nfp_ethdev_vf.c
-@@ -395,6 +395,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)
+diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
+index 978920f52e..46e1872927 100644
+--- a/drivers/net/nfp/nfp_net.c
++++ b/drivers/net/nfp/nfp_net.c
+@@ -2919,6 +2919,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)