[dpdk-stable] patch 'net/bnxt: fix using RSS config struct' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/029c84a92510be2015cf3acaf1efc6ddfab48ce1

Thanks.

Kevin.

---
>From 029c84a92510be2015cf3acaf1efc6ddfab48ce1 Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde at broadcom.com>
Date: Fri, 15 May 2020 04:25:11 -0700
Subject: [PATCH] net/bnxt: fix using RSS config struct

[ upstream commit 39395b9d41aff5488db4924df94098abbe4d4e8c ]

There is no need to maintain local copy.
This helps reduce the size of the bnxt structure.

Fixes: fcc0aa1edc10 ("net/bnxt: add RSS hash configuration")

Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
---
 drivers/net/bnxt/bnxt.h        | 1 -
 drivers/net/bnxt/bnxt_ethdev.c | 4 +++-
 drivers/net/bnxt/bnxt_rxq.c    | 4 +---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 140089d37e..5e5f91d730 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -297,5 +297,4 @@ struct bnxt {
 
 	struct rte_eth_dev		*eth_dev;
-	struct rte_eth_rss_conf		rss_conf;
 	struct rte_pci_device		*pdev;
 	void				*doorbell_base;
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 9ec1e13721..e0b4b4bd67 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1030,5 +1030,7 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev,
 
 	bp->flags |= BNXT_FLAG_UPDATE_HASH;
-	memcpy(&bp->rss_conf, rss_conf, sizeof(*rss_conf));
+	memcpy(&eth_dev->data->dev_conf.rx_adv_conf.rss_conf,
+	       rss_conf,
+	       sizeof(*rss_conf));
 
 	if (rss_conf->rss_hf & ETH_RSS_IPV4)
diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index 005c9f2c2c..d1664dbc09 100644
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -161,8 +161,6 @@ out:
 		uint16_t hash_type = 0;
 
-		if (bp->flags & BNXT_FLAG_UPDATE_HASH) {
-			rss = &bp->rss_conf;
+		if (bp->flags & BNXT_FLAG_UPDATE_HASH)
 			bp->flags &= ~BNXT_FLAG_UPDATE_HASH;
-		}
 
 		if (rss->rss_hf & ETH_RSS_IPV4)
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.203518553 +0100
+++ 0062-net-bnxt-fix-using-RSS-config-struct.patch	2020-06-05 19:20:50.893038927 +0100
@@ -1 +1 @@
-From 39395b9d41aff5488db4924df94098abbe4d4e8c Mon Sep 17 00:00:00 2001
+From 029c84a92510be2015cf3acaf1efc6ddfab48ce1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 39395b9d41aff5488db4924df94098abbe4d4e8c ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 7410db5e42..4093a2f01e 100644
+index 140089d37e..5e5f91d730 100644
@@ -24 +25 @@
-@@ -531,5 +531,4 @@ struct bnxt {
+@@ -297,5 +297,4 @@ struct bnxt {
@@ -31 +32 @@
-index b647450031..4d64a98351 100644
+index 9ec1e13721..e0b4b4bd67 100644
@@ -34 +35 @@
-@@ -1797,5 +1797,7 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev,
+@@ -1030,5 +1030,7 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev,
@@ -42 +43 @@
- 	/* Update the default RSS VNIC(s) */
+ 	if (rss_conf->rss_hf & ETH_RSS_IPV4)
@@ -44 +45 @@
-index 457ebede0e..e42308a97f 100644
+index 005c9f2c2c..d1664dbc09 100644
@@ -47,2 +48,2 @@
-@@ -169,8 +169,6 @@ out:
- 		struct rte_eth_rss_conf *rss = &dev_conf->rx_adv_conf.rss_conf;
+@@ -161,8 +161,6 @@ out:
+ 		uint16_t hash_type = 0;
@@ -56 +57 @@
- 		for (i = 0; i < bp->nr_vnics; i++) {
+ 		if (rss->rss_hf & ETH_RSS_IPV4)