net/bnxt: support WC TCAM management

[dpdk.git] / drivers / net / sfc / sfc_tx.c

diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c
index 7a8495e..28d696d 100644 (file)
--- a/drivers/net/sfc/sfc_tx.c
+++ b/drivers/net/sfc/sfc_tx.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright(c) 2019-2020 Xilinx, Inc.
+ * Copyright(c) 2019-2021 Xilinx, Inc.
  * Copyright(c) 2016-2019 Solarflare Communications Inc.
  *
  * This software was jointly developed between OKTET Labs (under contract
@@ -49,9 +49,15 @@ sfc_tx_get_offload_mask(struct sfc_adapter *sa)
        if (!sa->tso)
                no_caps |= DEV_TX_OFFLOAD_TCP_TSO;
 
-       if (!sa->tso_encap)
-               no_caps |= (DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
-                           DEV_TX_OFFLOAD_GENEVE_TNL_TSO);
+       if (!sa->tso_encap ||
+           (encp->enc_tunnel_encapsulations_supported &
+            (1u << EFX_TUNNEL_PROTOCOL_VXLAN)) == 0)
+               no_caps |= DEV_TX_OFFLOAD_VXLAN_TNL_TSO;
+
+       if (!sa->tso_encap ||
+           (encp->enc_tunnel_encapsulations_supported &
+            (1u << EFX_TUNNEL_PROTOCOL_GENEVE)) == 0)
+               no_caps |= DEV_TX_OFFLOAD_GENEVE_TNL_TSO;
 
        return ~no_caps;
 }
@@ -611,7 +617,8 @@ sfc_tx_start(struct sfc_adapter *sa)
                }
        }
 
-       if (sa->tso_encap && !encp->enc_fw_assisted_tso_v2_encap_enabled) {
+       if (sa->tso_encap && !encp->enc_fw_assisted_tso_v2_encap_enabled &&
+           !encp->enc_tso_v3_enabled) {
                sfc_warn(sa, "Encapsulated TSO support was unable to be restored");
                sa->tso_encap = B_FALSE;
        }