[dpdk-stable] patch 'net/bnxt: save the number of EM flow count' has been queued to LTS release 18.11.3

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

Thanks.

Kevin Traynor

---
From 001848b86710666f4723133a02438adf25bc8590 Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde@broadcom.com>
Date: Wed, 17 Jul 2019 16:11:32 +0530
Subject: [PATCH] net/bnxt: save the number of EM flow count

[ upstream commit ff9c0ca47e81176b5721c0f60dfc411330d205c6 ]

Save the number of EM flow count returned by the FW in HWRM_FUNC_QCFG
and use it to calculate the overall pool of L2 contexts supported by FW.

Fixes: 6d8109bcb398 ("net/bnxt: check VF resources if resource manager is enabled")

Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
---
 drivers/net/bnxt/bnxt.h      |  1 +
 drivers/net/bnxt/bnxt_hwrm.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 5535c376e..0ef5afcba 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -333,4 +333,5 @@ struct bnxt {
 	uint16_t		max_rx_rings;
 	uint16_t		max_l2_ctx;
+	uint16_t		max_rx_em_flows;
 	uint16_t		max_vnics;
 	uint16_t		max_stat_ctx;
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index c540c1bab..6eff260ca 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -577,5 +577,7 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)
 	bp->max_tx_rings = rte_le_to_cpu_16(resp->max_tx_rings);
 	bp->max_rx_rings = rte_le_to_cpu_16(resp->max_rx_rings);
-	bp->max_l2_ctx = rte_le_to_cpu_16(resp->max_l2_ctxs);
+	bp->max_rx_em_flows = rte_le_to_cpu_16(resp->max_rx_em_flows);
+	bp->max_l2_ctx =
+		rte_le_to_cpu_16(resp->max_l2_ctxs) + bp->max_rx_em_flows;
 	/* TODO: For now, do not support VMDq/RFS on VFs. */
 	if (BNXT_PF(bp)) {
@@ -771,5 +773,10 @@ int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp)
 		bp->max_rx_rings = rte_le_to_cpu_16(resp->max_rx_rings);
 		bp->max_ring_grps = rte_le_to_cpu_32(resp->max_hw_ring_grps);
-		bp->max_l2_ctx = rte_le_to_cpu_16(resp->max_l2_ctxs);
+		/* func_resource_qcaps does not return max_rx_em_flows.
+		 * So use the value provided by func_qcaps.
+		 */
+		bp->max_l2_ctx =
+			rte_le_to_cpu_16(resp->max_l2_ctxs) +
+			bp->max_rx_em_flows;
 		bp->max_vnics = rte_le_to_cpu_16(resp->max_vnics);
 		bp->max_stat_ctx = rte_le_to_cpu_16(resp->max_stat_ctx);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-28 14:32:33.330905248 +0100
+++ 0027-net-bnxt-save-the-number-of-EM-flow-count.patch	2019-08-28 14:32:31.644957293 +0100
@@ -1 +1 @@
-From ff9c0ca47e81176b5721c0f60dfc411330d205c6 Mon Sep 17 00:00:00 2001
+From 001848b86710666f4723133a02438adf25bc8590 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ff9c0ca47e81176b5721c0f60dfc411330d205c6 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 45e7359b2..cd809b385 100644
+index 5535c376e..0ef5afcba 100644
@@ -23,2 +24,2 @@
-@@ -430,4 +430,5 @@ struct bnxt {
- 	uint16_t		max_nq_rings;
+@@ -333,4 +333,5 @@ struct bnxt {
+ 	uint16_t		max_rx_rings;
@@ -30 +31 @@
-index b6f9ec0a0..84cda5e6c 100644
+index c540c1bab..6eff260ca 100644
@@ -33 +34 @@
-@@ -590,6 +590,8 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)
+@@ -577,5 +577,7 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)
@@ -37 +37,0 @@
- 	bp->first_vf_id = rte_le_to_cpu_16(resp->first_vf_id);
@@ -43 +43 @@
-@@ -797,5 +799,10 @@ int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp)
+@@ -771,5 +773,10 @@ int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp)