net/i40e: disable QinQ by default

Previously, QinQ is enabled by default and can't be disabled,
but there'll be performance drop if QinQ is enabled.

So, disabled QinQ by default and also updated the knowing VLAN
issue with this configure.

Fixes: 5bd74df1dbf5 ("net/i40e: fix QinQ enablement")
Signed-off-by: Kevin Liu <kevinx.liu@intel.com>
Acked-by: Beilei Xing <beilei.xing@intel.com>

diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst
index 85fdc4944ded3434eb62d7121de37cf628c61cb2..48757743463b5692d1dc44a9b8b630faefa531b8 100644 (file)
--- a/doc/guides/nics/i40e.rst
+++ b/doc/guides/nics/i40e.rst
@@ -969,11 +969,15 @@ it will fail and return the info "Conflict with the first rule's input set",
 which means the current rule's input set conflicts with the first rule's.
 Remove the first rule if want to change the input set of the PCTYPE.
 
-Disable QinQ is not supported when FW >= 8.4
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Vlan related Features miss when FW >= 8.4
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-If upgrade FW to version 8.4 and higher, enable QinQ by default and disable QinQ is not supported.
+If FW version >= 8.4, there'll be some Vlan related issues:
 
+#. TCI input set for QinQ  is invalid.
+#. Fail to configure TPID for QinQ.
+#. Need to enable QinQ before enabling Vlan filter.
+#. Fail to strip outer Vlan.
 
 Example of getting best performance with l3fwd example
 ------------------------------------------------------

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 7ab788246c1fb0c2ff6a8c81791c849f8901b8aa..67d79de08d7a7d3e3d6b5d52aa7f9fbac603121a 100644 (file)
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -4018,12 +4018,6 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
        }
 
        if (mask & RTE_ETH_VLAN_EXTEND_MASK) {
-               /* Double VLAN not allowed to be disabled.*/
-               if (pf->fw8_3gt && !(rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_EXTEND)) {
-                       PMD_DRV_LOG(WARNING,
-                               "Disable double VLAN is not allowed after firmwarev8.3!");
-                       return 0;
-               }
                i = 0;
                num = vsi->mac_num;
                mac_filter = rte_zmalloc("mac_filter_info_data",
@@ -6154,7 +6148,6 @@ i40e_vsi_config_vlan_stripping(struct i40e_vsi *vsi, bool on)
 static int
 i40e_dev_init_vlan(struct rte_eth_dev *dev)
 {
-       struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
        struct rte_eth_dev_data *data = dev->data;
        int ret;
        int mask = 0;
@@ -6165,11 +6158,6 @@ i40e_dev_init_vlan(struct rte_eth_dev *dev)
               RTE_ETH_VLAN_FILTER_MASK |
               RTE_ETH_VLAN_EXTEND_MASK;
 
-       /* Double VLAN be enabled by default.*/
-       if (pf->fw8_3gt) {
-               struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
-               rxmode->offloads |= RTE_ETH_RX_OFFLOAD_VLAN_EXTEND;
-       }
        ret = i40e_vlan_offload_set(dev, mask);
        if (ret) {
                PMD_DRV_LOG(INFO, "Failed to update vlan offload");