net/bnxt: fix L2 context calculation for Thor

On Wh+, number of L2 context supported by FW is the sum of number of
EM flow count and number of L2 context count returned in HWRM_FUNC_QCFG.
This is not true for Thor. Restrict this only for Whitney for now.

Fixes: ff9c0ca47e81 ("net/bnxt: save the number of EM flow count")
Cc: stable@dpdk.org
Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Lance Richardson <lance.richardson@broadcom.com>

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 502c69f..dd41852 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -614,8 +614,9 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)
        bp->max_rx_rings = rte_le_to_cpu_16(resp->max_rx_rings);
        bp->first_vf_id = rte_le_to_cpu_16(resp->first_vf_id);
        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;
+       bp->max_l2_ctx = rte_le_to_cpu_16(resp->max_l2_ctxs);
+       if (!BNXT_CHIP_THOR(bp))
+               bp->max_l2_ctx += bp->max_rx_em_flows;
        /* TODO: For now, do not support VMDq/RFS on VFs. */
        if (BNXT_PF(bp)) {
                if (bp->pf.max_vfs)
@@ -861,9 +862,9 @@ int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp)
                /* 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_l2_ctx = rte_le_to_cpu_16(resp->max_l2_ctxs);
+               if (!BNXT_CHIP_THOR(bp))
+                       bp->max_l2_ctx += 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);
        }