To enable VLAN stripping, two conditions must be met:
the corresponding flag must be set and the appropriate
RX prefix should be requested.
VLAN stripping is supported for ef100 datapath only.

Signed-off-by: Artemii Morozov <artemii.moro...@arknetworks.am>
Reviewed-by: Ivan Malov <ivan.ma...@arknetworks.am>
Reviewed-by: Andy Moreton <amore...@xilinx.com>
---
 drivers/common/sfc_efx/base/ef10_filter.c |  6 ++++++
 drivers/common/sfc_efx/base/efx.h         | 12 ++++++++++++
 drivers/common/sfc_efx/base/efx_impl.h    |  1 +
 drivers/common/sfc_efx/base/efx_port.c    | 18 ++++++++++++++++++
 drivers/common/sfc_efx/base/efx_rx.c      | 14 ++++++++++++++
 drivers/common/sfc_efx/base/rhead_rx.c    |  3 +++
 drivers/common/sfc_efx/version.map        |  1 +
 7 files changed, 55 insertions(+)

diff --git a/drivers/common/sfc_efx/base/ef10_filter.c 
b/drivers/common/sfc_efx/base/ef10_filter.c
index d6940011c0..07f561a519 100644
--- a/drivers/common/sfc_efx/base/ef10_filter.c
+++ b/drivers/common/sfc_efx/base/ef10_filter.c
@@ -171,6 +171,7 @@ efx_mcdi_filter_op_add(
        EFX_MCDI_DECLARE_BUF(payload, MC_CMD_FILTER_OP_V3_IN_LEN,
                MC_CMD_FILTER_OP_EXT_OUT_LEN);
        efx_filter_match_flags_t match_flags;
+       efx_port_t *epp = &(enp->en_port);
        uint32_t port_id;
        efx_rc_t rc;
 
@@ -338,6 +339,11 @@ efx_mcdi_filter_op_add(
                    FILTER_OP_V3_IN_MATCH_SET_FLAG, 1);
        }
 
+       if (epp->ep_vlan_strip) {
+               MCDI_IN_SET_DWORD_FIELD(req, FILTER_OP_V3_IN_MATCH_ACTION_FLAGS,
+                       FILTER_OP_V3_IN_MATCH_STRIP_VLAN, 1);
+       }
+
        efx_mcdi_execute(enp, &req);
 
        if (req.emr_rc != 0) {
diff --git a/drivers/common/sfc_efx/base/efx.h 
b/drivers/common/sfc_efx/base/efx.h
index aefd78e646..a17f3f92ba 100644
--- a/drivers/common/sfc_efx/base/efx.h
+++ b/drivers/common/sfc_efx/base/efx.h
@@ -1147,6 +1147,12 @@ efx_port_poll(
        __in            efx_nic_t *enp,
        __out_opt       efx_link_mode_t *link_modep);
 
+LIBEFX_API
+extern __checkReturn   efx_rc_t
+efx_port_vlan_strip_set(
+       __in            efx_nic_t *enp,
+       __in            boolean_t enabled);
+
 LIBEFX_API
 extern         void
 efx_port_fini(
@@ -3101,6 +3107,12 @@ typedef enum efx_rxq_type_e {
  * Request user flag field in the Rx prefix of a queue.
  */
 #define        EFX_RXQ_FLAG_USER_FLAG          0x20
+/*
+ * Request VLAN TCI field in the Rx prefix. The flag just
+ * controls delivery of the stripped VLAN TCI if VLAN stripping
+ * is enabled and done.
+ */
+#define        EFX_RXQ_FLAG_VLAN_STRIPPED_TCI          0x40
 
 LIBEFX_API
 extern __checkReturn   efx_rc_t
diff --git a/drivers/common/sfc_efx/base/efx_impl.h 
b/drivers/common/sfc_efx/base/efx_impl.h
index 45e99d01c5..ed1a4be5ac 100644
--- a/drivers/common/sfc_efx/base/efx_impl.h
+++ b/drivers/common/sfc_efx/base/efx_impl.h
@@ -363,6 +363,7 @@ typedef struct efx_port_s {
        uint32_t                ep_default_adv_cap_mask;
        uint32_t                ep_phy_cap_mask;
        boolean_t               ep_mac_drain;
+       boolean_t               ep_vlan_strip;
 #if EFSYS_OPT_BIST
        efx_bist_type_t         ep_current_bist;
 #endif
diff --git a/drivers/common/sfc_efx/base/efx_port.c 
b/drivers/common/sfc_efx/base/efx_port.c
index a5f982e335..7804eb76bc 100644
--- a/drivers/common/sfc_efx/base/efx_port.c
+++ b/drivers/common/sfc_efx/base/efx_port.c
@@ -204,6 +204,24 @@ efx_loopback_type_name(
 
 #endif /* EFSYS_OPT_LOOPBACK */
 
+       __checkReturn   efx_rc_t
+efx_port_vlan_strip_set(
+       __in            efx_nic_t *enp,
+       __in            boolean_t enabled)
+{
+       efx_port_t *epp = &(enp->en_port);
+       efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
+
+       EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
+
+       if (enabled && !encp->enc_rx_vlan_stripping_supported)
+               return ENOTSUP;
+
+       epp->ep_vlan_strip = enabled;
+
+       return 0;
+}
+
                        void
 efx_port_fini(
        __in            efx_nic_t *enp)
diff --git a/drivers/common/sfc_efx/base/efx_rx.c 
b/drivers/common/sfc_efx/base/efx_rx.c
index 68f42f5cac..b3d9e14c67 100644
--- a/drivers/common/sfc_efx/base/efx_rx.c
+++ b/drivers/common/sfc_efx/base/efx_rx.c
@@ -941,11 +941,25 @@ efx_rx_qcreate_internal(
                        goto fail5;
        }
 
+       if (flags & EFX_RXQ_FLAG_VLAN_STRIPPED_TCI) {
+               const efx_rx_prefix_layout_t *erplp = &erp->er_prefix_layout;
+               const efx_rx_prefix_field_info_t *vlan_tci_field;
+
+               vlan_tci_field =
+                   &erplp->erpl_fields[EFX_RX_PREFIX_FIELD_VLAN_STRIP_TCI];
+               if (vlan_tci_field->erpfi_width_bits == 0) {
+                       rc = ENOTSUP;
+                       goto fail6;
+               }
+       }
+
        enp->en_rx_qcount++;
        *erpp = erp;
 
        return (0);
 
+fail6:
+       EFSYS_PROBE(fail6);
 fail5:
        EFSYS_PROBE(fail5);
 
diff --git a/drivers/common/sfc_efx/base/rhead_rx.c 
b/drivers/common/sfc_efx/base/rhead_rx.c
index d0ac5c02f8..a86551f646 100644
--- a/drivers/common/sfc_efx/base/rhead_rx.c
+++ b/drivers/common/sfc_efx/base/rhead_rx.c
@@ -640,6 +640,9 @@ rhead_rx_qcreate(
        if (flags & EFX_RXQ_FLAG_USER_FLAG)
                fields_mask |= 1U << EFX_RX_PREFIX_FIELD_USER_FLAG;
 
+       if (flags & EFX_RXQ_FLAG_VLAN_STRIPPED_TCI)
+               fields_mask |= 1U << EFX_RX_PREFIX_FIELD_VLAN_STRIP_TCI;
+
        /*
         * LENGTH is required in EF100 host interface, as receive events
         * do not include the packet length.
diff --git a/drivers/common/sfc_efx/version.map 
b/drivers/common/sfc_efx/version.map
index d9b04a611d..e0d473dc72 100644
--- a/drivers/common/sfc_efx/version.map
+++ b/drivers/common/sfc_efx/version.map
@@ -203,6 +203,7 @@ INTERNAL {
        efx_port_init;
        efx_port_loopback_set;
        efx_port_poll;
+       efx_port_vlan_strip_set;
 
        efx_pseudo_hdr_hash_get;
        efx_pseudo_hdr_pkt_length_get;
-- 
2.34.1

Reply via email to