[dpdk-stable] patch 'net/bnxt: fix MTU setting' 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/27/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 fc789f040204499ff499f12ea23e6f9ed700afec Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde at broadcom.com>
Date: Fri, 28 Sep 2018 18:59:54 -0700
Subject: [PATCH] net/bnxt: fix MTU setting

[ upstream commit 80ad678ae715c8bee2f7a396431d3703df245f5a ]

The HW can support maximum frame length of 9600 bytes.
And we are currently capping the max frame size to 9500 bytes.

Fixes: daef48efe5e5 ("net/bnxt: support set MTU")

Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt.h        |  2 +-
 drivers/net/bnxt/bnxt_ethdev.c | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 8aae0426a..c580ec22b 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -21,5 +21,5 @@
 #include "bnxt_cpr.h"
 
-#define BNXT_MAX_MTU		9500
+#define BNXT_MAX_MTU		9574
 #define VLAN_TAG_SIZE		4
 #define BNXT_VF_RSV_NUM_RSS_CTX	1
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index c681f4500..da9607701 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -453,5 +453,5 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
 	dev_info->min_rx_bufsize = 1;
 	dev_info->max_rx_pktlen = BNXT_MAX_MTU + ETHER_HDR_LEN + ETHER_CRC_LEN
-				  + VLAN_TAG_SIZE;
+				  + VLAN_TAG_SIZE * 2;
 
 	dev_info->rx_offload_capa = BNXT_DEV_RX_OFFLOAD_SUPPORT;
@@ -1566,19 +1566,15 @@ static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)
 	struct bnxt *bp = eth_dev->data->dev_private;
 	struct rte_eth_dev_info dev_info;
-	uint32_t max_dev_mtu;
 	uint32_t rc = 0;
 	uint32_t i;
 
 	bnxt_dev_info_get_op(eth_dev, &dev_info);
-	max_dev_mtu = dev_info.max_rx_pktlen -
-		      ETHER_HDR_LEN - ETHER_CRC_LEN - VLAN_TAG_SIZE * 2;
 
-	if (new_mtu < ETHER_MIN_MTU || new_mtu > max_dev_mtu) {
+	if (new_mtu < ETHER_MIN_MTU || new_mtu > BNXT_MAX_MTU) {
 		PMD_DRV_LOG(ERR, "MTU requested must be within (%d, %d)\n",
-			ETHER_MIN_MTU, max_dev_mtu);
+			ETHER_MIN_MTU, BNXT_MAX_MTU);
 		return -EINVAL;
 	}
 
-
 	if (new_mtu > ETHER_MTU) {
 		bp->flags |= BNXT_FLAG_JUMBO;
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 16:44:31.912855667 +0000
+++ 0035-net-bnxt-fix-MTU-setting.patch	2018-11-21 16:44:30.000000000 +0000
@@ -1,13 +1,14 @@
-From 80ad678ae715c8bee2f7a396431d3703df245f5a Mon Sep 17 00:00:00 2001
+From fc789f040204499ff499f12ea23e6f9ed700afec Mon Sep 17 00:00:00 2001
 From: Ajit Khaparde <ajit.khaparde at broadcom.com>
 Date: Fri, 28 Sep 2018 18:59:54 -0700
 Subject: [PATCH] net/bnxt: fix MTU setting
 
+[ upstream commit 80ad678ae715c8bee2f7a396431d3703df245f5a ]
+
 The HW can support maximum frame length of 9600 bytes.
 And we are currently capping the max frame size to 9500 bytes.
 
 Fixes: daef48efe5e5 ("net/bnxt: support set MTU")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
 ---
@@ -27,17 +28,17 @@
  #define VLAN_TAG_SIZE		4
  #define BNXT_VF_RSV_NUM_RSS_CTX	1
 diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
-index 28e2be7e8..8c156e263 100644
+index c681f4500..da9607701 100644
 --- a/drivers/net/bnxt/bnxt_ethdev.c
 +++ b/drivers/net/bnxt/bnxt_ethdev.c
-@@ -452,5 +452,5 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
+@@ -453,5 +453,5 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
  	dev_info->min_rx_bufsize = 1;
  	dev_info->max_rx_pktlen = BNXT_MAX_MTU + ETHER_HDR_LEN + ETHER_CRC_LEN
 -				  + VLAN_TAG_SIZE;
 +				  + VLAN_TAG_SIZE * 2;
  
  	dev_info->rx_offload_capa = BNXT_DEV_RX_OFFLOAD_SUPPORT;
-@@ -1565,19 +1565,15 @@ static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)
+@@ -1566,19 +1566,15 @@ static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)
  	struct bnxt *bp = eth_dev->data->dev_private;
  	struct rte_eth_dev_info dev_info;
 -	uint32_t max_dev_mtu;