[dpdk-stable] patch 'net/dpaa: fix jumbo buffer config' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

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/26/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 2a2d4ef95d07f89626a84a93510da3387d629f24 Mon Sep 17 00:00:00 2001
From: Hemant Agrawal <hemant.agrawal at nxp.com>
Date: Fri, 21 Sep 2018 16:35:51 +0530
Subject: [PATCH] net/dpaa: fix jumbo buffer config

[ upstream commit deeec8ef57cb2f336b192cfcb6a4df5104c6a9a5 ]

Set the missing dev data mtu for the correct size.
Set the max supported size in hw, if user is asking for more.

Fixes: 9658ac3a4ef6 ("net/dpaa: set the correct frame size in device MTU")

Signed-off-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
 drivers/net/dpaa/dpaa_ethdev.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 7a950ac04..2a380f024 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -195,12 +195,22 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev)
 
 	if (rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) {
+		uint32_t max_len;
+
+		DPAA_PMD_DEBUG("enabling jumbo");
+
 		if (dev->data->dev_conf.rxmode.max_rx_pkt_len <=
-		    DPAA_MAX_RX_PKT_LEN) {
-			fman_if_set_maxfrm(dpaa_intf->fif,
-				dev->data->dev_conf.rxmode.max_rx_pkt_len);
-			return 0;
-		} else {
-			return -1;
+		    DPAA_MAX_RX_PKT_LEN)
+			max_len = dev->data->dev_conf.rxmode.max_rx_pkt_len;
+		else {
+			DPAA_PMD_INFO("enabling jumbo override conf max len=%d "
+				"supported is %d",
+				dev->data->dev_conf.rxmode.max_rx_pkt_len,
+				DPAA_MAX_RX_PKT_LEN);
+			max_len = DPAA_MAX_RX_PKT_LEN;
 		}
+
+		fman_if_set_maxfrm(dpaa_intf->fif, max_len);
+		dev->data->mtu = max_len
+				- ETHER_HDR_LEN - ETHER_CRC_LEN - VLAN_TAG_SIZE;
 	}
 	return 0;
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 15:59:14.318418015 +0000
+++ 0027-net-dpaa-fix-jumbo-buffer-config.patch	2018-11-21 15:59:13.000000000 +0000
@@ -1,13 +1,14 @@
-From deeec8ef57cb2f336b192cfcb6a4df5104c6a9a5 Mon Sep 17 00:00:00 2001
+From 2a2d4ef95d07f89626a84a93510da3387d629f24 Mon Sep 17 00:00:00 2001
 From: Hemant Agrawal <hemant.agrawal at nxp.com>
 Date: Fri, 21 Sep 2018 16:35:51 +0530
 Subject: [PATCH] net/dpaa: fix jumbo buffer config
 
+[ upstream commit deeec8ef57cb2f336b192cfcb6a4df5104c6a9a5 ]
+
 Set the missing dev data mtu for the correct size.
 Set the max supported size in hw, if user is asking for more.
 
 Fixes: 9658ac3a4ef6 ("net/dpaa: set the correct frame size in device MTU")
-Cc: stable at dpdk.org
 
 Signed-off-by: Hemant Agrawal <hemant.agrawal at nxp.com>
 ---
@@ -15,10 +16,10 @@
  1 file changed, 16 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
-index c1f1bf72e..8c585152c 100644
+index 7a950ac04..2a380f024 100644
 --- a/drivers/net/dpaa/dpaa_ethdev.c
 +++ b/drivers/net/dpaa/dpaa_ethdev.c
-@@ -194,12 +194,22 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev)
+@@ -195,12 +195,22 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev)
  
  	if (rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) {
 +		uint32_t max_len;