net/qede: fix link state configuration
[dpdk.git] / drivers / net / sfc / base / ef10_filter.c
index 2dd823b..7a726ef 100644 (file)
@@ -1,37 +1,13 @@
-/*
- * Copyright (c) 2007-2016 Solarflare Communications Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
  *
- * The views and conclusions contained in the software and documentation are
- * those of the authors and should not be interpreted as representing official
- * policies, either expressed or implied, of the FreeBSD Project.
+ * Copyright(c) 2019-2020 Xilinx, Inc.
+ * Copyright(c) 2007-2019 Solarflare Communications Inc.
  */
 
 #include "efx.h"
 #include "efx_impl.h"
 
-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD
+#if EFX_OPTS_EF10()
 
 #if EFSYS_OPT_FILTER
 
@@ -118,8 +94,7 @@ ef10_filter_init(
        efx_rc_t rc;
        ef10_filter_table_t *eftp;
 
-       EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
-                   enp->en_family == EFX_FAMILY_MEDFORD);
+       EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp));
 
 #define        MATCH_MASK(match) (EFX_MASK32(match) << EFX_LOW_BIT(match))
        EFX_STATIC_ASSERT(EFX_FILTER_MATCH_REM_HOST ==
@@ -142,6 +117,10 @@ ef10_filter_init(
            MATCH_MASK(MC_CMD_FILTER_OP_EXT_IN_MATCH_OUTER_VLAN));
        EFX_STATIC_ASSERT(EFX_FILTER_MATCH_IP_PROTO ==
            MATCH_MASK(MC_CMD_FILTER_OP_EXT_IN_MATCH_IP_PROTO));
+       EFX_STATIC_ASSERT(EFX_FILTER_MATCH_VNI_OR_VSID ==
+           MATCH_MASK(MC_CMD_FILTER_OP_EXT_IN_MATCH_VNI_OR_VSID));
+       EFX_STATIC_ASSERT(EFX_FILTER_MATCH_IFRM_LOC_MAC ==
+           MATCH_MASK(MC_CMD_FILTER_OP_EXT_IN_MATCH_IFRM_DST_MAC));
        EFX_STATIC_ASSERT(EFX_FILTER_MATCH_IFRM_UNKNOWN_MCAST_DST ==
            MATCH_MASK(MC_CMD_FILTER_OP_EXT_IN_MATCH_IFRM_UNKNOWN_MCAST_DST));
        EFX_STATIC_ASSERT(EFX_FILTER_MATCH_IFRM_UNKNOWN_UCAST_DST ==
@@ -173,8 +152,7 @@ fail1:
 ef10_filter_fini(
        __in            efx_nic_t *enp)
 {
-       EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
-                   enp->en_family == EFX_FAMILY_MEDFORD);
+       EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp));
 
        if (enp->en_filter.ef_ef10_filter_table != NULL) {
                EFSYS_KMEM_FREE(enp->en_esip, sizeof (ef10_filter_table_t),
@@ -190,17 +168,23 @@ efx_mcdi_filter_op_add(
        __inout         ef10_filter_handle_t *handle)
 {
        efx_mcdi_req_t req;
-       uint8_t payload[MAX(MC_CMD_FILTER_OP_EXT_IN_LEN,
-                           MC_CMD_FILTER_OP_EXT_OUT_LEN)];
+       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_rc_t rc;
 
-       memset(payload, 0, sizeof (payload));
        req.emr_cmd = MC_CMD_FILTER_OP;
        req.emr_in_buf = payload;
-       req.emr_in_length = MC_CMD_FILTER_OP_EXT_IN_LEN;
+       req.emr_in_length = MC_CMD_FILTER_OP_V3_IN_LEN;
        req.emr_out_buf = payload;
        req.emr_out_length = MC_CMD_FILTER_OP_EXT_OUT_LEN;
 
+       /*
+        * Remove match flag for encapsulated filters that does not correspond
+        * to the MCDI match flags
+        */
+       match_flags = spec->efs_match_flags & ~EFX_FILTER_MATCH_ENCAP_TYPE;
+
        switch (filter_op) {
        case MC_CMD_FILTER_OP_IN_OP_REPLACE:
                MCDI_IN_SET_DWORD(req, FILTER_OP_EXT_IN_HANDLE_LO,
@@ -218,14 +202,18 @@ efx_mcdi_filter_op_add(
                goto fail1;
        }
 
-       MCDI_IN_SET_DWORD(req, FILTER_OP_EXT_IN_PORT_ID,
-           EVB_PORT_ID_ASSIGNED);
+       MCDI_IN_SET_DWORD(req, FILTER_OP_EXT_IN_PORT_ID, enp->en_vport_id);
        MCDI_IN_SET_DWORD(req, FILTER_OP_EXT_IN_MATCH_FIELDS,
-           spec->efs_match_flags);
-       MCDI_IN_SET_DWORD(req, FILTER_OP_EXT_IN_RX_DEST,
-           MC_CMD_FILTER_OP_EXT_IN_RX_DEST_HOST);
-       MCDI_IN_SET_DWORD(req, FILTER_OP_EXT_IN_RX_QUEUE,
-           spec->efs_dmaq_id);
+           match_flags);
+       if (spec->efs_dmaq_id == EFX_FILTER_SPEC_RX_DMAQ_ID_DROP) {
+               MCDI_IN_SET_DWORD(req, FILTER_OP_EXT_IN_RX_DEST,
+                   MC_CMD_FILTER_OP_EXT_IN_RX_DEST_DROP);
+       } else {
+               MCDI_IN_SET_DWORD(req, FILTER_OP_EXT_IN_RX_DEST,
+                   MC_CMD_FILTER_OP_EXT_IN_RX_DEST_HOST);
+               MCDI_IN_SET_DWORD(req, FILTER_OP_EXT_IN_RX_QUEUE,
+                   spec->efs_dmaq_id);
+       }
 
 #if EFSYS_OPT_RX_SCALE
        if (spec->efs_flags & EFX_FILTER_FLAG_RX_RSS) {
@@ -314,18 +302,45 @@ efx_mcdi_filter_op_add(
                        rc = EINVAL;
                        goto fail2;
                }
+
+               memcpy(MCDI_IN2(req, uint8_t, FILTER_OP_EXT_IN_VNI_OR_VSID),
+                   spec->efs_vni_or_vsid, EFX_VNI_OR_VSID_LEN);
+
+               memcpy(MCDI_IN2(req, uint8_t, FILTER_OP_EXT_IN_IFRM_DST_MAC),
+                   spec->efs_ifrm_loc_mac, EFX_MAC_ADDR_LEN);
+       }
+
+       /*
+        * Set the "MARK" or "FLAG" action for all packets matching this filter
+        * if necessary (only useful with equal stride packed stream Rx mode
+        * which provide the information in pseudo-header).
+        * These actions require MC_CMD_FILTER_OP_V3_IN msgrequest.
+        */
+       if ((spec->efs_flags & EFX_FILTER_FLAG_ACTION_MARK) &&
+           (spec->efs_flags & EFX_FILTER_FLAG_ACTION_FLAG)) {
+               rc = EINVAL;
+               goto fail3;
+       }
+       if (spec->efs_flags & EFX_FILTER_FLAG_ACTION_MARK) {
+               MCDI_IN_SET_DWORD(req, FILTER_OP_V3_IN_MATCH_ACTION,
+                   MC_CMD_FILTER_OP_V3_IN_MATCH_ACTION_MARK);
+               MCDI_IN_SET_DWORD(req, FILTER_OP_V3_IN_MATCH_MARK_VALUE,
+                   spec->efs_mark);
+       } else if (spec->efs_flags & EFX_FILTER_FLAG_ACTION_FLAG) {
+               MCDI_IN_SET_DWORD(req, FILTER_OP_V3_IN_MATCH_ACTION,
+                   MC_CMD_FILTER_OP_V3_IN_MATCH_ACTION_FLAG);
        }
 
        efx_mcdi_execute(enp, &req);
 
        if (req.emr_rc != 0) {
                rc = req.emr_rc;
-               goto fail3;
+               goto fail4;
        }
 
        if (req.emr_out_length_used < MC_CMD_FILTER_OP_EXT_OUT_LEN) {
                rc = EMSGSIZE;
-               goto fail4;
+               goto fail5;
        }
 
        handle->efh_lo = MCDI_OUT_DWORD(req, FILTER_OP_EXT_OUT_HANDLE_LO);
@@ -333,6 +348,8 @@ efx_mcdi_filter_op_add(
 
        return (0);
 
+fail5:
+       EFSYS_PROBE(fail5);
 fail4:
        EFSYS_PROBE(fail4);
 fail3:
@@ -353,11 +370,10 @@ efx_mcdi_filter_op_delete(
        __inout         ef10_filter_handle_t *handle)
 {
        efx_mcdi_req_t req;
-       uint8_t payload[MAX(MC_CMD_FILTER_OP_EXT_IN_LEN,
-                           MC_CMD_FILTER_OP_EXT_OUT_LEN)];
+       EFX_MCDI_DECLARE_BUF(payload, MC_CMD_FILTER_OP_EXT_IN_LEN,
+               MC_CMD_FILTER_OP_EXT_OUT_LEN);
        efx_rc_t rc;
 
-       memset(payload, 0, sizeof (payload));
        req.emr_cmd = MC_CMD_FILTER_OP;
        req.emr_in_buf = payload;
        req.emr_in_length = MC_CMD_FILTER_OP_EXT_IN_LEN;
@@ -437,6 +453,12 @@ ef10_filter_equal(
                return (B_FALSE);
        if (left->efs_encap_type != right->efs_encap_type)
                return (B_FALSE);
+       if (memcmp(left->efs_vni_or_vsid, right->efs_vni_or_vsid,
+           EFX_VNI_OR_VSID_LEN))
+               return (B_FALSE);
+       if (memcmp(left->efs_ifrm_loc_mac, right->efs_ifrm_loc_mac,
+           EFX_MAC_ADDR_LEN))
+               return (B_FALSE);
 
        return (B_TRUE);
 
@@ -518,8 +540,7 @@ ef10_filter_restore(
        efsys_lock_state_t state;
        efx_rc_t rc;
 
-       EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
-                   enp->en_family == EFX_FAMILY_MEDFORD);
+       EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp));
 
        for (tbl_id = 0; tbl_id < EFX_EF10_FILTER_TBL_ROWS; tbl_id++) {
 
@@ -569,6 +590,231 @@ fail1:
        return (rc);
 }
 
+enum ef10_filter_add_action_e {
+       /* Insert a new filter */
+       EF10_FILTER_ADD_NEW,
+       /*
+        * Replace old filter with a new, overriding the old one
+        * if it has lower priority.
+        */
+       EF10_FILTER_ADD_REPLACE,
+       /* Store new, lower priority filter as overridden by old filter */
+       EF10_FILTER_ADD_STORE,
+       /* Special case for AUTO filters, remove AUTO_OLD flag */
+       EF10_FILTER_ADD_REFRESH,
+};
+
+static __checkReturn   efx_rc_t
+ef10_filter_add_lookup_equal_spec(
+       __in            efx_filter_spec_t *spec,
+       __in            efx_filter_spec_t *probe_spec,
+       __in            efx_filter_replacement_policy_t policy,
+       __out           boolean_t *found)
+{
+       efx_rc_t rc;
+
+       /* Refreshing AUTO filter */
+       if (spec->efs_priority == EFX_FILTER_PRI_AUTO &&
+           probe_spec->efs_priority == EFX_FILTER_PRI_AUTO) {
+               *found = B_TRUE;
+               return (0);
+       }
+
+       /*
+        * With exclusive filters, higher priority ones
+        * override lower priority ones, and lower priority
+        * ones are stored in case the higher priority one
+        * is removed.
+        */
+       if (ef10_filter_is_exclusive(spec)) {
+               switch (policy) {
+               case EFX_FILTER_REPLACEMENT_HIGHER_OR_EQUAL_PRIORITY:
+                       if (spec->efs_priority == probe_spec->efs_priority) {
+                               *found = B_TRUE;
+                               break;
+                       }
+                       /* Fall-through */
+               case EFX_FILTER_REPLACEMENT_HIGHER_PRIORITY:
+                       if (spec->efs_priority > probe_spec->efs_priority) {
+                               *found = B_TRUE;
+                               break;
+                       }
+                       /* Fall-through */
+               case EFX_FILTER_REPLACEMENT_NEVER:
+                       /*
+                        * Lower priority filter needs to be
+                        * stored. It does *not* replace the
+                        * old one. That is why EEXIST is not
+                        * returned in that case.
+                        */
+                       if (spec->efs_priority < probe_spec->efs_priority) {
+                               *found = B_TRUE;
+                               break;
+                       } else {
+                               rc = EEXIST;
+                               goto fail1;
+                       }
+               default:
+                       EFSYS_ASSERT(0);
+                       rc = EEXIST;
+                       goto fail2;
+               }
+       } else {
+               *found = B_FALSE;
+       }
+
+       return (0);
+
+fail2:
+       EFSYS_PROBE(fail2);
+
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
+}
+
+
+static                 void
+ef10_filter_add_select_action(
+       __in            efx_filter_spec_t *saved_spec,
+       __in            efx_filter_spec_t *spec,
+       __out           enum ef10_filter_add_action_e *action,
+       __out           efx_filter_spec_t **overridden_spec)
+{
+       efx_filter_spec_t *overridden = NULL;
+
+       if (saved_spec == NULL) {
+               *action = EF10_FILTER_ADD_NEW;
+       } else if (ef10_filter_is_exclusive(spec) == B_FALSE) {
+               /*
+                * Non-exclusive filters are always stored in separate entries
+                * in the table. The only case involving a saved spec is
+                * refreshing an AUTO filter.
+                */
+               EFSYS_ASSERT(saved_spec->efs_overridden_spec == NULL);
+               EFSYS_ASSERT(spec->efs_priority == EFX_FILTER_PRI_AUTO);
+               EFSYS_ASSERT(saved_spec->efs_priority == EFX_FILTER_PRI_AUTO);
+               *action = EF10_FILTER_ADD_REFRESH;
+       } else {
+               /* Exclusive filters stored in the same entry */
+               if (spec->efs_priority > saved_spec->efs_priority) {
+                       /*
+                        * Insert a high priority filter over a lower priority
+                        * one. Only two priority levels are implemented, so
+                        * there must not already be an overridden filter.
+                        */
+                       EFX_STATIC_ASSERT(EFX_FILTER_NPRI == 2);
+                       EFSYS_ASSERT(saved_spec->efs_overridden_spec == NULL);
+                       overridden = saved_spec;
+                       *action = EF10_FILTER_ADD_REPLACE;
+               } else if (spec->efs_priority == saved_spec->efs_priority) {
+                       /* Replace in-place or refresh an existing filter */
+                       if (spec->efs_priority == EFX_FILTER_PRI_AUTO)
+                               *action = EF10_FILTER_ADD_REFRESH;
+                       else
+                               *action = EF10_FILTER_ADD_REPLACE;
+               } else {
+                       /*
+                        * Insert a lower priority filter, storing it in case
+                        * the higher priority filter is removed.
+                        *
+                        * Currently there are only two priority levels, so this
+                        * must be an AUTO filter.
+                        */
+                       EFX_STATIC_ASSERT(EFX_FILTER_NPRI == 2);
+                       EFSYS_ASSERT(spec->efs_priority == EFX_FILTER_PRI_AUTO);
+                       if (saved_spec->efs_overridden_spec != NULL) {
+                               *action = EF10_FILTER_ADD_REFRESH;
+                       } else {
+                               overridden = spec;
+                               *action = EF10_FILTER_ADD_STORE;
+                       }
+               }
+       }
+
+       *overridden_spec = overridden;
+}
+
+static __checkReturn   efx_rc_t
+ef10_filter_add_execute_action(
+       __in            efx_nic_t *enp,
+       __in            efx_filter_spec_t *saved_spec,
+       __in            efx_filter_spec_t *spec,
+       __in            efx_filter_spec_t *overridden_spec,
+       __in            enum ef10_filter_add_action_e action,
+       __in            int ins_index)
+{
+       ef10_filter_table_t *eftp = enp->en_filter.ef_ef10_filter_table;
+       efsys_lock_state_t state;
+       efx_rc_t rc;
+
+       EFSYS_LOCK(enp->en_eslp, state);
+
+       if (action == EF10_FILTER_ADD_REFRESH) {
+               ef10_filter_set_entry_not_auto_old(eftp, ins_index);
+               goto out_unlock;
+       } else if (action == EF10_FILTER_ADD_STORE) {
+               EFSYS_ASSERT(overridden_spec != NULL);
+               saved_spec->efs_overridden_spec = overridden_spec;
+               goto out_unlock;
+       }
+
+       EFSYS_UNLOCK(enp->en_eslp, state);
+
+       switch (action) {
+       case EF10_FILTER_ADD_REPLACE:
+               /*
+                * On replacing the filter handle may change after a
+                * successful replace operation.
+                */
+               rc = efx_mcdi_filter_op_add(enp, spec,
+                   MC_CMD_FILTER_OP_IN_OP_REPLACE,
+                   &eftp->eft_entry[ins_index].efe_handle);
+               break;
+       case EF10_FILTER_ADD_NEW:
+               if (ef10_filter_is_exclusive(spec)) {
+                       rc = efx_mcdi_filter_op_add(enp, spec,
+                           MC_CMD_FILTER_OP_IN_OP_INSERT,
+                           &eftp->eft_entry[ins_index].efe_handle);
+               } else {
+                       rc = efx_mcdi_filter_op_add(enp, spec,
+                           MC_CMD_FILTER_OP_IN_OP_SUBSCRIBE,
+                           &eftp->eft_entry[ins_index].efe_handle);
+               }
+               break;
+       default:
+               rc = EINVAL;
+               EFSYS_ASSERT(0);
+               break;
+       }
+       if (rc != 0)
+               goto fail1;
+
+       EFSYS_LOCK(enp->en_eslp, state);
+
+       if (action == EF10_FILTER_ADD_REPLACE) {
+               /* Update the fields that may differ */
+               saved_spec->efs_priority = spec->efs_priority;
+               saved_spec->efs_flags = spec->efs_flags;
+               saved_spec->efs_rss_context = spec->efs_rss_context;
+               saved_spec->efs_dmaq_id = spec->efs_dmaq_id;
+
+               if (overridden_spec != NULL)
+                       saved_spec->efs_overridden_spec = overridden_spec;
+       }
+
+out_unlock:
+       EFSYS_UNLOCK(enp->en_eslp, state);
+
+       return (0);
+
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
+}
+
 /*
  * An arbitrary search limit for the software hash table. As per the linux net
  * driver.
@@ -579,22 +825,23 @@ static    __checkReturn   efx_rc_t
 ef10_filter_add_internal(
        __in            efx_nic_t *enp,
        __inout         efx_filter_spec_t *spec,
-       __in            boolean_t may_replace,
+       __in            efx_filter_replacement_policy_t policy,
        __out_opt       uint32_t *filter_id)
 {
        efx_rc_t rc;
        ef10_filter_table_t *eftp = enp->en_filter.ef_ef10_filter_table;
+       enum ef10_filter_add_action_e action;
+       efx_filter_spec_t *overridden_spec = NULL;
        efx_filter_spec_t *saved_spec;
        uint32_t hash;
        unsigned int depth;
        int ins_index;
-       boolean_t replacing = B_FALSE;
-       unsigned int i;
        efsys_lock_state_t state;
        boolean_t locked = B_FALSE;
 
-       EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
-                   enp->en_family == EFX_FAMILY_MEDFORD);
+       EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp));
+
+       EFSYS_ASSERT(spec->efs_overridden_spec == NULL);
 
        hash = ef10_filter_hash(spec);
 
@@ -608,145 +855,136 @@ ef10_filter_add_internal(
         * else a free slot to insert at.  If any of them are busy,
         * we have to wait and retry.
         */
-       for (;;) {
-               ins_index = -1;
-               depth = 1;
-               EFSYS_LOCK(enp->en_eslp, state);
-               locked = B_TRUE;
+retry:
+       EFSYS_LOCK(enp->en_eslp, state);
+       locked = B_TRUE;
+
+       ins_index = -1;
+
+       for (depth = 1; depth <= EF10_FILTER_SEARCH_LIMIT; depth++) {
+               unsigned int probe_index;
+               efx_filter_spec_t *probe_spec;
+
+               probe_index = (hash + depth) & (EFX_EF10_FILTER_TBL_ROWS - 1);
+               probe_spec = ef10_filter_entry_spec(eftp, probe_index);
 
-               for (;;) {
-                       i = (hash + depth) & (EFX_EF10_FILTER_TBL_ROWS - 1);
-                       saved_spec = ef10_filter_entry_spec(eftp, i);
-
-                       if (!saved_spec) {
-                               if (ins_index < 0) {
-                                       ins_index = i;
-                               }
-                       } else if (ef10_filter_equal(spec, saved_spec)) {
-                               if (ef10_filter_entry_is_busy(eftp, i))
-                                       break;
-                               if (saved_spec->efs_priority
-                                           == EFX_FILTER_PRI_AUTO) {
-                                       ins_index = i;
-                                       goto found;
-                               } else if (ef10_filter_is_exclusive(spec)) {
-                                       if (may_replace) {
-                                               ins_index = i;
-                                               goto found;
-                                       } else {
-                                               rc = EEXIST;
-                                               goto fail1;
-                                       }
-                               }
-
-                               /* Leave existing */
+               if (probe_spec == NULL) {
+                       if (ins_index < 0)
+                               ins_index = probe_index;
+               } else if (ef10_filter_equal(spec, probe_spec)) {
+                       boolean_t found;
+
+                       if (ef10_filter_entry_is_busy(eftp, probe_index)) {
+                               EFSYS_UNLOCK(enp->en_eslp, state);
+                               locked = B_FALSE;
+                               goto retry;
                        }
 
-                       /*
-                        * Once we reach the maximum search depth, use
-                        * the first suitable slot or return EBUSY if
-                        * there was none.
-                        */
-                       if (depth == EF10_FILTER_SEARCH_LIMIT) {
-                               if (ins_index < 0) {
-                                       rc = EBUSY;
-                                       goto fail2;
-                               }
-                               goto found;
+                       rc = ef10_filter_add_lookup_equal_spec(spec,
+                           probe_spec, policy, &found);
+                       if (rc != 0)
+                               goto fail1;
+
+                       if (found != B_FALSE) {
+                               ins_index = probe_index;
+                               break;
                        }
-                       depth++;
                }
-               EFSYS_UNLOCK(enp->en_eslp, state);
-               locked = B_FALSE;
        }
 
-found:
        /*
-        * Create a software table entry if necessary, and mark it
-        * busy.  We might yet fail to insert, but any attempt to
-        * insert a conflicting filter while we're waiting for the
-        * firmware must find the busy entry.
+        * Once we reach the maximum search depth, use the first suitable slot
+        * or return EBUSY if there was none.
         */
-       saved_spec = ef10_filter_entry_spec(eftp, ins_index);
-       if (saved_spec) {
-               if (saved_spec->efs_priority == EFX_FILTER_PRI_AUTO) {
-                       /* This is a filter we are refreshing */
-                       ef10_filter_set_entry_not_auto_old(eftp, ins_index);
-                       goto out_unlock;
-
-               }
-               replacing = B_TRUE;
-       } else {
-               EFSYS_KMEM_ALLOC(enp->en_esip, sizeof (*spec), saved_spec);
-               if (!saved_spec) {
-                       rc = ENOMEM;
-                       goto fail3;
-               }
-               *saved_spec = *spec;
-               ef10_filter_set_entry(eftp, ins_index, saved_spec);
+       if (ins_index < 0) {
+               rc = EBUSY;
+               goto fail2;
        }
+
+       /*
+        * Mark software table entry busy. We might yet fail to insert,
+        * but any attempt to insert a conflicting filter while we're
+        * waiting for the firmware must find the busy entry.
+        */
        ef10_filter_set_entry_busy(eftp, ins_index);
 
-       EFSYS_UNLOCK(enp->en_eslp, state);
-       locked = B_FALSE;
+       saved_spec = ef10_filter_entry_spec(eftp, ins_index);
+       ef10_filter_add_select_action(saved_spec, spec, &action,
+           &overridden_spec);
 
        /*
-        * On replacing the filter handle may change after after a successful
-        * replace operation.
+        * Allocate a new filter if found entry is empty or
+        * a filter should be overridden.
         */
-       if (replacing) {
-               rc = efx_mcdi_filter_op_add(enp, spec,
-                   MC_CMD_FILTER_OP_IN_OP_REPLACE,
-                   &eftp->eft_entry[ins_index].efe_handle);
-       } else if (ef10_filter_is_exclusive(spec)) {
-               rc = efx_mcdi_filter_op_add(enp, spec,
-                   MC_CMD_FILTER_OP_IN_OP_INSERT,
-                   &eftp->eft_entry[ins_index].efe_handle);
-       } else {
-               rc = efx_mcdi_filter_op_add(enp, spec,
-                   MC_CMD_FILTER_OP_IN_OP_SUBSCRIBE,
-                   &eftp->eft_entry[ins_index].efe_handle);
-       }
-
-       if (rc != 0)
-               goto fail4;
+       if (overridden_spec != NULL || saved_spec == NULL) {
+               efx_filter_spec_t *new_spec;
 
-       EFSYS_LOCK(enp->en_eslp, state);
-       locked = B_TRUE;
+               EFSYS_UNLOCK(enp->en_eslp, state);
+               locked = B_FALSE;
 
-       if (replacing) {
-               /* Update the fields that may differ */
-               saved_spec->efs_priority = spec->efs_priority;
-               saved_spec->efs_flags = spec->efs_flags;
-               saved_spec->efs_rss_context = spec->efs_rss_context;
-               saved_spec->efs_dmaq_id = spec->efs_dmaq_id;
-       }
+               EFSYS_KMEM_ALLOC(enp->en_esip, sizeof (*new_spec), new_spec);
+               if (new_spec == NULL) {
+                       rc = ENOMEM;
+                       overridden_spec = NULL;
+                       goto fail3;
+               }
 
-       ef10_filter_set_entry_not_busy(eftp, ins_index);
+               EFSYS_LOCK(enp->en_eslp, state);
+               locked = B_TRUE;
 
-out_unlock:
+               if (saved_spec == NULL) {
+                       *new_spec = *spec;
+                       ef10_filter_set_entry(eftp, ins_index, new_spec);
+               } else {
+                       *new_spec = *overridden_spec;
+                       overridden_spec = new_spec;
+               }
+       }
 
        EFSYS_UNLOCK(enp->en_eslp, state);
        locked = B_FALSE;
 
+       rc = ef10_filter_add_execute_action(enp, saved_spec, spec,
+           overridden_spec, action, ins_index);
+       if (rc != 0)
+               goto fail4;
+
        if (filter_id)
                *filter_id = ins_index;
 
+       EFSYS_LOCK(enp->en_eslp, state);
+       ef10_filter_set_entry_not_busy(eftp, ins_index);
+       EFSYS_UNLOCK(enp->en_eslp, state);
+
        return (0);
 
 fail4:
        EFSYS_PROBE(fail4);
 
-       if (!replacing) {
-               EFSYS_KMEM_FREE(enp->en_esip, sizeof (*spec), saved_spec);
-               saved_spec = NULL;
+       EFSYS_ASSERT(locked == B_FALSE);
+       EFSYS_LOCK(enp->en_eslp, state);
+
+       if (action == EF10_FILTER_ADD_NEW) {
+               EFSYS_KMEM_FREE(enp->en_esip, sizeof (*spec),
+                   ef10_filter_entry_spec(eftp, ins_index));
+               ef10_filter_set_entry(eftp, ins_index, NULL);
        }
-       ef10_filter_set_entry_not_busy(eftp, ins_index);
-       ef10_filter_set_entry(eftp, ins_index, NULL);
+
+       EFSYS_UNLOCK(enp->en_eslp, state);
+
+       if (overridden_spec != NULL)
+               EFSYS_KMEM_FREE(enp->en_esip, sizeof (*spec), overridden_spec);
 
 fail3:
        EFSYS_PROBE(fail3);
 
+       EFSYS_ASSERT(locked == B_FALSE);
+       EFSYS_LOCK(enp->en_eslp, state);
+
+       ef10_filter_set_entry_not_busy(eftp, ins_index);
+
+       EFSYS_UNLOCK(enp->en_eslp, state);
+
 fail2:
        EFSYS_PROBE(fail2);
 
@@ -763,11 +1001,11 @@ fail1:
 ef10_filter_add(
        __in            efx_nic_t *enp,
        __inout         efx_filter_spec_t *spec,
-       __in            boolean_t may_replace)
+       __in            enum efx_filter_replacement_policy_e policy)
 {
        efx_rc_t rc;
 
-       rc = ef10_filter_add_internal(enp, spec, may_replace, NULL);
+       rc = ef10_filter_add_internal(enp, spec, policy, NULL);
        if (rc != 0)
                goto fail1;
 
@@ -779,11 +1017,15 @@ fail1:
        return (rc);
 }
 
-
+/*
+ * Delete a filter by index from the filter table with priority
+ * that is not higher than specified.
+ */
 static __checkReturn   efx_rc_t
 ef10_filter_delete_internal(
        __in            efx_nic_t *enp,
-       __in            uint32_t filter_id)
+       __in            uint32_t filter_id,
+       __in            efx_filter_priority_t priority)
 {
        efx_rc_t rc;
        ef10_filter_table_t *table = enp->en_filter.ef_ef10_filter_table;
@@ -805,7 +1047,8 @@ ef10_filter_delete_internal(
                EFSYS_LOCK(enp->en_eslp, state);
        }
        if ((spec = ef10_filter_entry_spec(table, filter_idx)) != NULL) {
-               ef10_filter_set_entry_busy(table, filter_idx);
+               if (spec->efs_priority <= priority)
+                       ef10_filter_set_entry_busy(table, filter_idx);
        }
        EFSYS_UNLOCK(enp->en_eslp, state);
 
@@ -814,31 +1057,53 @@ ef10_filter_delete_internal(
                goto fail1;
        }
 
-       /*
-        * Try to remove the hardware filter. This may fail if the MC has
-        * rebooted (which frees all hardware filter resources).
-        */
-       if (ef10_filter_is_exclusive(spec)) {
-               rc = efx_mcdi_filter_op_delete(enp,
-                   MC_CMD_FILTER_OP_IN_OP_REMOVE,
-                   &table->eft_entry[filter_idx].efe_handle);
+       if (spec->efs_priority > priority) {
+               /*
+                * Applied filter stays, but overridden filter is removed since
+                * next user request to delete the applied filter should not
+                * restore outdated filter.
+                */
+               if (spec->efs_overridden_spec != NULL) {
+                       EFSYS_ASSERT(spec->efs_overridden_spec->efs_overridden_spec ==
+                           NULL);
+                       EFSYS_KMEM_FREE(enp->en_esip, sizeof (*spec),
+                           spec->efs_overridden_spec);
+                       spec->efs_overridden_spec = NULL;
+               }
        } else {
-               rc = efx_mcdi_filter_op_delete(enp,
-                   MC_CMD_FILTER_OP_IN_OP_UNSUBSCRIBE,
-                   &table->eft_entry[filter_idx].efe_handle);
-       }
+               /*
+                * Try to remove the hardware filter or replace it with the
+                * saved automatic filter. This may fail if the MC has
+                * rebooted (which frees all hardware filter resources).
+                */
+               if (spec->efs_overridden_spec != NULL) {
+                       rc = efx_mcdi_filter_op_add(enp,
+                           spec->efs_overridden_spec,
+                           MC_CMD_FILTER_OP_IN_OP_REPLACE,
+                           &table->eft_entry[filter_idx].efe_handle);
+               } else if (ef10_filter_is_exclusive(spec)) {
+                       rc = efx_mcdi_filter_op_delete(enp,
+                           MC_CMD_FILTER_OP_IN_OP_REMOVE,
+                           &table->eft_entry[filter_idx].efe_handle);
+               } else {
+                       rc = efx_mcdi_filter_op_delete(enp,
+                           MC_CMD_FILTER_OP_IN_OP_UNSUBSCRIBE,
+                           &table->eft_entry[filter_idx].efe_handle);
+               }
 
-       /* Free the software table entry */
-       EFSYS_LOCK(enp->en_eslp, state);
-       ef10_filter_set_entry_not_busy(table, filter_idx);
-       ef10_filter_set_entry(table, filter_idx, NULL);
-       EFSYS_UNLOCK(enp->en_eslp, state);
+               /* Free the software table entry */
+               EFSYS_LOCK(enp->en_eslp, state);
+               ef10_filter_set_entry_not_busy(table, filter_idx);
+               ef10_filter_set_entry(table, filter_idx,
+                   spec->efs_overridden_spec);
+               EFSYS_UNLOCK(enp->en_eslp, state);
 
-       EFSYS_KMEM_FREE(enp->en_esip, sizeof (*spec), spec);
+               EFSYS_KMEM_FREE(enp->en_esip, sizeof (*spec), spec);
 
-       /* Check result of hardware filter removal */
-       if (rc != 0)
-               goto fail2;
+               /* Check result of hardware filter removal */
+               if (rc != 0)
+                       goto fail2;
+       }
 
        return (0);
 
@@ -851,22 +1116,40 @@ fail1:
        return (rc);
 }
 
-       __checkReturn   efx_rc_t
-ef10_filter_delete(
+static                 void
+ef10_filter_delete_auto(
        __in            efx_nic_t *enp,
-       __inout         efx_filter_spec_t *spec)
+       __in            uint32_t filter_id)
 {
-       efx_rc_t rc;
        ef10_filter_table_t *table = enp->en_filter.ef_ef10_filter_table;
-       efx_filter_spec_t *saved_spec;
-       unsigned int hash;
-       unsigned int depth;
-       unsigned int i;
-       efsys_lock_state_t state;
+       uint32_t filter_idx = filter_id % EFX_EF10_FILTER_TBL_ROWS;
+
+       /*
+        * AUTO_OLD flag is cleared since the auto filter that is to be removed
+        * may not be the filter at the specified index itself, but the filter
+        * that is overridden by it.
+        */
+       ef10_filter_set_entry_not_auto_old(table, filter_idx);
+
+       (void) ef10_filter_delete_internal(enp, filter_idx,
+           EFX_FILTER_PRI_AUTO);
+}
+
+       __checkReturn   efx_rc_t
+ef10_filter_delete(
+       __in            efx_nic_t *enp,
+       __inout         efx_filter_spec_t *spec)
+{
+       efx_rc_t rc;
+       ef10_filter_table_t *table = enp->en_filter.ef_ef10_filter_table;
+       efx_filter_spec_t *saved_spec;
+       unsigned int hash;
+       unsigned int depth;
+       unsigned int i;
+       efsys_lock_state_t state;
        boolean_t locked = B_FALSE;
 
-       EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
-                   enp->en_family == EFX_FAMILY_MEDFORD);
+       EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp));
 
        hash = ef10_filter_hash(spec);
 
@@ -891,7 +1174,7 @@ ef10_filter_delete(
        EFSYS_UNLOCK(enp->en_eslp, state);
        locked = B_FALSE;
 
-       rc = ef10_filter_delete_internal(enp, i);
+       rc = ef10_filter_delete_internal(enp, i, EFX_FILTER_PRI_MANUAL);
        if (rc != 0)
                goto fail2;
 
@@ -914,23 +1197,24 @@ efx_mcdi_get_parser_disp_info(
        __in                            efx_nic_t *enp,
        __out_ecount(buffer_length)     uint32_t *buffer,
        __in                            size_t buffer_length,
+       __in                            boolean_t encap,
        __out                           size_t *list_lengthp)
 {
        efx_mcdi_req_t req;
-       uint8_t payload[MAX(MC_CMD_GET_PARSER_DISP_INFO_IN_LEN,
-                           MC_CMD_GET_PARSER_DISP_INFO_OUT_LENMAX)];
+       EFX_MCDI_DECLARE_BUF(payload, MC_CMD_GET_PARSER_DISP_INFO_IN_LEN,
+               MC_CMD_GET_PARSER_DISP_INFO_OUT_LENMAX);
        size_t matches_count;
        size_t list_size;
        efx_rc_t rc;
 
-       (void) memset(payload, 0, sizeof (payload));
        req.emr_cmd = MC_CMD_GET_PARSER_DISP_INFO;
        req.emr_in_buf = payload;
        req.emr_in_length = MC_CMD_GET_PARSER_DISP_INFO_IN_LEN;
        req.emr_out_buf = payload;
        req.emr_out_length = MC_CMD_GET_PARSER_DISP_INFO_OUT_LENMAX;
 
-       MCDI_IN_SET_DWORD(req, GET_PARSER_DISP_INFO_OUT_OP,
+       MCDI_IN_SET_DWORD(req, GET_PARSER_DISP_INFO_OUT_OP, encap ?
+           MC_CMD_GET_PARSER_DISP_INFO_IN_OP_GET_SUPPORTED_ENCAP_RX_MATCHES :
            MC_CMD_GET_PARSER_DISP_INFO_IN_OP_GET_SUPPORTED_RX_MATCHES);
 
        efx_mcdi_execute(enp, &req);
@@ -990,28 +1274,76 @@ ef10_filter_supported_filters(
        __in                            size_t buffer_length,
        __out                           size_t *list_lengthp)
 {
-
+       efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
        size_t mcdi_list_length;
+       size_t mcdi_encap_list_length;
        size_t list_length;
        uint32_t i;
+       uint32_t next_buf_idx;
+       size_t next_buf_length;
        efx_rc_t rc;
-       uint32_t all_filter_flags =
+       boolean_t no_space = B_FALSE;
+       efx_filter_match_flags_t all_filter_flags =
            (EFX_FILTER_MATCH_REM_HOST | EFX_FILTER_MATCH_LOC_HOST |
            EFX_FILTER_MATCH_REM_MAC | EFX_FILTER_MATCH_REM_PORT |
            EFX_FILTER_MATCH_LOC_MAC | EFX_FILTER_MATCH_LOC_PORT |
            EFX_FILTER_MATCH_ETHER_TYPE | EFX_FILTER_MATCH_INNER_VID |
            EFX_FILTER_MATCH_OUTER_VID | EFX_FILTER_MATCH_IP_PROTO |
+           EFX_FILTER_MATCH_VNI_OR_VSID |
+           EFX_FILTER_MATCH_IFRM_LOC_MAC |
+           EFX_FILTER_MATCH_IFRM_UNKNOWN_MCAST_DST |
+           EFX_FILTER_MATCH_IFRM_UNKNOWN_UCAST_DST |
+           EFX_FILTER_MATCH_ENCAP_TYPE |
            EFX_FILTER_MATCH_UNKNOWN_MCAST_DST |
            EFX_FILTER_MATCH_UNKNOWN_UCAST_DST);
 
-       rc = efx_mcdi_get_parser_disp_info(enp, buffer, buffer_length,
-                                           &mcdi_list_length);
+       /*
+        * Two calls to MC_CMD_GET_PARSER_DISP_INFO are needed: one to get the
+        * list of supported filters for ordinary packets, and then another to
+        * get the list of supported filters for encapsulated packets. To
+        * distinguish the second list from the first, the
+        * EFX_FILTER_MATCH_ENCAP_TYPE flag is added to each filter for
+        * encapsulated packets.
+        */
+       rc = efx_mcdi_get_parser_disp_info(enp, buffer, buffer_length, B_FALSE,
+           &mcdi_list_length);
        if (rc != 0) {
-               if (rc == ENOSPC) {
-                       /* Pass through mcdi_list_length for the list length */
-                       *list_lengthp = mcdi_list_length;
+               if (rc == ENOSPC)
+                       no_space = B_TRUE;
+               else
+                       goto fail1;
+       }
+
+       if (no_space) {
+               next_buf_idx = 0;
+               next_buf_length = 0;
+       } else {
+               EFSYS_ASSERT(mcdi_list_length <= buffer_length);
+               next_buf_idx = mcdi_list_length;
+               next_buf_length = buffer_length - mcdi_list_length;
+       }
+
+       if (encp->enc_tunnel_encapsulations_supported != 0) {
+               rc = efx_mcdi_get_parser_disp_info(enp, &buffer[next_buf_idx],
+                   next_buf_length, B_TRUE, &mcdi_encap_list_length);
+               if (rc != 0) {
+                       if (rc == ENOSPC)
+                               no_space = B_TRUE;
+                       else
+                               goto fail2;
+               } else {
+                       for (i = next_buf_idx;
+                           i < next_buf_idx + mcdi_encap_list_length; i++)
+                               buffer[i] |= EFX_FILTER_MATCH_ENCAP_TYPE;
                }
-               goto fail1;
+       } else {
+               mcdi_encap_list_length = 0;
+       }
+
+       if (no_space) {
+               *list_lengthp = mcdi_list_length + mcdi_encap_list_length;
+               rc = ENOSPC;
+               goto fail3;
        }
 
        /*
@@ -1024,9 +1356,10 @@ ef10_filter_supported_filters(
         * of the matches is preserved as they are ordered from highest to
         * lowest priority.
         */
-       EFSYS_ASSERT(mcdi_list_length <= buffer_length);
+       EFSYS_ASSERT(mcdi_list_length + mcdi_encap_list_length <=
+           buffer_length);
        list_length = 0;
-       for (i = 0; i < mcdi_list_length; i++) {
+       for (i = 0; i < mcdi_list_length + mcdi_encap_list_length; i++) {
                if ((buffer[i] & ~all_filter_flags) == 0) {
                        buffer[list_length] = buffer[i];
                        list_length++;
@@ -1037,6 +1370,10 @@ ef10_filter_supported_filters(
 
        return (0);
 
+fail3:
+       EFSYS_PROBE(fail3);
+fail2:
+       EFSYS_PROBE(fail2);
 fail1:
        EFSYS_PROBE1(fail1, efx_rc_t, rc);
 
@@ -1057,12 +1394,15 @@ ef10_filter_insert_unicast(
        efx_filter_spec_init_rx(&spec, EFX_FILTER_PRI_AUTO,
            filter_flags,
            eftp->eft_default_rxq);
-       efx_filter_spec_set_eth_local(&spec, EFX_FILTER_SPEC_VID_UNSPEC, addr);
+       rc = efx_filter_spec_set_eth_local(&spec, EFX_FILTER_SPEC_VID_UNSPEC,
+           addr);
+       if (rc != 0)
+               goto fail1;
 
-       rc = ef10_filter_add_internal(enp, &spec, B_TRUE,
+       rc = ef10_filter_add_internal(enp, &spec, EFX_FILTER_REPLACEMENT_NEVER,
            &eftp->eft_unicst_filter_indexes[eftp->eft_unicst_filter_count]);
        if (rc != 0)
-               goto fail1;
+               goto fail2;
 
        eftp->eft_unicst_filter_count++;
        EFSYS_ASSERT(eftp->eft_unicst_filter_count <=
@@ -1070,6 +1410,8 @@ ef10_filter_insert_unicast(
 
        return (0);
 
+fail2:
+       EFSYS_PROBE(fail2);
 fail1:
        EFSYS_PROBE1(fail1, efx_rc_t, rc);
        return (rc);
@@ -1088,11 +1430,13 @@ ef10_filter_insert_all_unicast(
        efx_filter_spec_init_rx(&spec, EFX_FILTER_PRI_AUTO,
            filter_flags,
            eftp->eft_default_rxq);
-       efx_filter_spec_set_uc_def(&spec);
-       rc = ef10_filter_add_internal(enp, &spec, B_TRUE,
-           &eftp->eft_unicst_filter_indexes[eftp->eft_unicst_filter_count]);
+       rc = efx_filter_spec_set_uc_def(&spec);
        if (rc != 0)
                goto fail1;
+       rc = ef10_filter_add_internal(enp, &spec, EFX_FILTER_REPLACEMENT_NEVER,
+           &eftp->eft_unicst_filter_indexes[eftp->eft_unicst_filter_count]);
+       if (rc != 0)
+               goto fail2;
 
        eftp->eft_unicst_filter_count++;
        EFSYS_ASSERT(eftp->eft_unicst_filter_count <=
@@ -1100,6 +1444,8 @@ ef10_filter_insert_all_unicast(
 
        return (0);
 
+fail2:
+       EFSYS_PROBE(fail2);
 fail1:
        EFSYS_PROBE1(fail1, efx_rc_t, rc);
        return (rc);
@@ -1141,12 +1487,24 @@ ef10_filter_insert_multicast_list(
                    filter_flags,
                    eftp->eft_default_rxq);
 
-               efx_filter_spec_set_eth_local(&spec,
+               rc = efx_filter_spec_set_eth_local(&spec,
                    EFX_FILTER_SPEC_VID_UNSPEC,
                    &addrs[i * EFX_MAC_ADDR_LEN]);
+               if (rc != 0) {
+                       if (rollback == B_TRUE) {
+                               /* Only stop upon failure if told to rollback */
+                               goto rollback;
+                       } else {
+                               /*
+                                * Don't try to add a filter with a corrupt
+                                * specification.
+                                */
+                               continue;
+                       }
+               }
 
-               rc = ef10_filter_add_internal(enp, &spec, B_TRUE,
-                                           &filter_index);
+               rc = ef10_filter_add_internal(enp, &spec,
+                   EFX_FILTER_REPLACEMENT_NEVER, &filter_index);
 
                if (rc == 0) {
                        eftp->eft_mulcst_filter_indexes[filter_count] =
@@ -1166,11 +1524,15 @@ ef10_filter_insert_multicast_list(
                    eftp->eft_default_rxq);
 
                EFX_MAC_BROADCAST_ADDR_SET(addr);
-               efx_filter_spec_set_eth_local(&spec, EFX_FILTER_SPEC_VID_UNSPEC,
-                   addr);
+               rc = efx_filter_spec_set_eth_local(&spec,
+                   EFX_FILTER_SPEC_VID_UNSPEC, addr);
+               if ((rc != 0) && (rollback == B_TRUE)) {
+                       /* Only stop upon failure if told to rollback */
+                       goto rollback;
+               }
 
-               rc = ef10_filter_add_internal(enp, &spec, B_TRUE,
-                                           &filter_index);
+               rc = ef10_filter_add_internal(enp, &spec,
+                   EFX_FILTER_REPLACEMENT_NEVER, &filter_index);
 
                if (rc == 0) {
                        eftp->eft_mulcst_filter_indexes[filter_count] =
@@ -1191,7 +1553,7 @@ rollback:
        /* Remove any filters we have inserted */
        i = filter_count;
        while (i--) {
-               (void) ef10_filter_delete_internal(enp,
+               ef10_filter_delete_auto(enp,
                    eftp->eft_mulcst_filter_indexes[i]);
        }
        eftp->eft_mulcst_filter_count = 0;
@@ -1215,12 +1577,14 @@ ef10_filter_insert_all_multicast(
        efx_filter_spec_init_rx(&spec, EFX_FILTER_PRI_AUTO,
            filter_flags,
            eftp->eft_default_rxq);
-       efx_filter_spec_set_mc_def(&spec);
+       rc = efx_filter_spec_set_mc_def(&spec);
+       if (rc != 0)
+               goto fail1;
 
-       rc = ef10_filter_add_internal(enp, &spec, B_TRUE,
+       rc = ef10_filter_add_internal(enp, &spec, EFX_FILTER_REPLACEMENT_NEVER,
            &eftp->eft_mulcst_filter_indexes[0]);
        if (rc != 0)
-               goto fail1;
+               goto fail2;
 
        eftp->eft_mulcst_filter_count = 1;
        eftp->eft_using_all_mulcst = B_TRUE;
@@ -1231,6 +1595,8 @@ ef10_filter_insert_all_multicast(
 
        return (0);
 
+fail2:
+       EFSYS_PROBE(fail2);
 fail1:
        EFSYS_PROBE1(fail1, efx_rc_t, rc);
 
@@ -1318,8 +1684,9 @@ ef10_filter_insert_encap_filters(
                if (rc != 0)
                        goto fail1;
 
-               rc = ef10_filter_add_internal(enp, &spec, B_TRUE,
-                           &table->eft_encap_filter_indexes[
+               rc = ef10_filter_add_internal(enp, &spec,
+                   EFX_FILTER_REPLACEMENT_NEVER,
+                   &table->eft_encap_filter_indexes[
                                    table->eft_encap_filter_count]);
                if (rc != 0) {
                        if (rc != EACCES)
@@ -1348,7 +1715,7 @@ ef10_filter_remove_old(
 
        for (i = 0; i < EFX_ARRAY_SIZE(table->eft_entry); i++) {
                if (ef10_filter_entry_is_auto_old(table, i)) {
-                       (void) ef10_filter_delete_internal(enp, i);
+                       ef10_filter_delete_auto(enp, i);
                }
        }
 }
@@ -1389,66 +1756,43 @@ fail1:
 
 }
 
-
-/*
- * Reconfigure all filters.
- * If all_unicst and/or all mulcst filters cannot be applied then
- * return ENOTSUP (Note the filters for the specified addresses are
- * still applied in this case).
- */
-       __checkReturn   efx_rc_t
-ef10_filter_reconfigure(
-       __in                            efx_nic_t *enp,
-       __in_ecount(6)                  uint8_t const *mac_addr,
-       __in                            boolean_t all_unicst,
-       __in                            boolean_t mulcst,
-       __in                            boolean_t all_mulcst,
-       __in                            boolean_t brdcst,
-       __in_ecount(6*count)            uint8_t const *addrs,
-       __in                            uint32_t count)
+static                 void
+ef10_filter_remove_all_existing_filters(
+       __in                            efx_nic_t *enp)
 {
-       efx_nic_cfg_t *encp = &enp->en_nic_cfg;
        ef10_filter_table_t *table = enp->en_filter.ef_ef10_filter_table;
-       efx_filter_flags_t filter_flags;
+       efx_port_t *epp = &(enp->en_port);
        unsigned int i;
-       efx_rc_t all_unicst_rc = 0;
-       efx_rc_t all_mulcst_rc = 0;
-       efx_rc_t rc;
-
-       if (table->eft_default_rxq == NULL) {
-               /*
-                * Filters direct traffic to the default RXQ, and so cannot be
-                * inserted until it is available. Any currently configured
-                * filters must be removed (ignore errors in case the MC
-                * has rebooted, which removes hardware filters).
-                */
-               for (i = 0; i < table->eft_unicst_filter_count; i++) {
-                       (void) ef10_filter_delete_internal(enp,
-                                       table->eft_unicst_filter_indexes[i]);
-               }
-               table->eft_unicst_filter_count = 0;
 
-               for (i = 0; i < table->eft_mulcst_filter_count; i++) {
-                       (void) ef10_filter_delete_internal(enp,
-                                       table->eft_mulcst_filter_indexes[i]);
-               }
-               table->eft_mulcst_filter_count = 0;
+       for (i = 0; i < table->eft_unicst_filter_count; i++) {
+               ef10_filter_delete_auto(enp,
+                               table->eft_unicst_filter_indexes[i]);
+       }
+       table->eft_unicst_filter_count = 0;
 
-               for (i = 0; i < table->eft_encap_filter_count; i++) {
-                       (void) ef10_filter_delete_internal(enp,
-                                       table->eft_encap_filter_indexes[i]);
-               }
-               table->eft_encap_filter_count = 0;
+       for (i = 0; i < table->eft_mulcst_filter_count; i++) {
+               ef10_filter_delete_auto(enp,
+                               table->eft_mulcst_filter_indexes[i]);
+       }
+       table->eft_mulcst_filter_count = 0;
 
-               return (0);
+       for (i = 0; i < table->eft_encap_filter_count; i++) {
+               ef10_filter_delete_auto(enp,
+                               table->eft_encap_filter_indexes[i]);
        }
+       table->eft_encap_filter_count = 0;
 
-       if (table->eft_using_rss)
-               filter_flags = EFX_FILTER_FLAG_RX_RSS;
-       else
-               filter_flags = 0;
+       epp->ep_all_unicst_inserted = B_FALSE;
+       epp->ep_all_mulcst_inserted = B_FALSE;
+}
+
+static                 void
+ef10_filter_mark_old_filters(
+       __in                            efx_nic_t *enp)
+{
+       ef10_filter_table_t *table = enp->en_filter.ef_ef10_filter_table;
+       unsigned int i;
 
-       /* Mark old filters which may need to be removed */
        for (i = 0; i < table->eft_unicst_filter_count; i++) {
                ef10_filter_set_entry_auto_old(table,
                                        table->eft_unicst_filter_indexes[i]);
@@ -1461,11 +1805,22 @@ ef10_filter_reconfigure(
                ef10_filter_set_entry_auto_old(table,
                                        table->eft_encap_filter_indexes[i]);
        }
+}
+
+static __checkReturn   efx_rc_t
+ef10_filter_insert_renew_unicst_filters(
+       __in                            efx_nic_t *enp,
+       __in_ecount(6)                  uint8_t const *mac_addr,
+       __in                            boolean_t all_unicst,
+       __in                            efx_filter_flags_t filter_flags,
+       __out                           boolean_t *all_unicst_inserted)
+{
+       ef10_filter_table_t *table = enp->en_filter.ef_ef10_filter_table;
+       efx_port_t *epp = &(enp->en_port);
+       efx_rc_t rc;
 
        /*
-        * Insert or renew unicast filters.
-        *
-        * Frimware does not perform chaining on unicast filters. As traffic is
+        * Firmware does not perform chaining on unicast filters. As traffic is
         * therefore only delivered to the first matching filter, we should
         * always insert the specific filter for our MAC address, to try and
         * ensure we get that traffic.
@@ -1476,61 +1831,54 @@ ef10_filter_reconfigure(
         * therefore relies on the privilege model only allowing functions to
         * insert filters for their own MAC address unless explicitly given
         * additional privileges by the user. This also means that, even on a
-        * priviliged function, inserting a unicast mismatch filter may not
+        * privileged function, inserting a unicast mismatch filter may not
         * catch all traffic in multi PCI function scenarios.)
         */
        table->eft_unicst_filter_count = 0;
        rc = ef10_filter_insert_unicast(enp, mac_addr, filter_flags);
+       *all_unicst_inserted = B_FALSE;
        if (all_unicst || (rc != 0)) {
+               efx_rc_t all_unicst_rc;
+
                all_unicst_rc = ef10_filter_insert_all_unicast(enp,
                                                    filter_flags);
-               if ((rc != 0) && (all_unicst_rc != 0))
+               if (all_unicst_rc == 0) {
+                       *all_unicst_inserted = B_TRUE;
+                       epp->ep_all_unicst_inserted = B_TRUE;
+               } else if (rc != 0)
                        goto fail1;
        }
 
-       /*
-        * WORKAROUND_BUG26807 controls firmware support for chained multicast
-        * filters, and can only be enabled or disabled when the hardware filter
-        * table is empty.
-        *
-        * Chained multicast filters require support from the datapath firmware,
-        * and may not be available (e.g. low-latency variants or old Huntington
-        * firmware).
-        *
-        * Firmware will reset (FLR) functions which have inserted filters in
-        * the hardware filter table when the workaround is enabled/disabled.
-        * Functions without any hardware filters are not reset.
-        *
-        * Re-check if the workaround is enabled after adding unicast hardware
-        * filters. This ensures that encp->enc_bug26807_workaround matches the
-        * firmware state, and that later changes to enable/disable the
-        * workaround will result in this function seeing a reset (FLR).
-        *
-        * In common-code drivers, we only support multiple PCI function
-        * scenarios with firmware that supports multicast chaining, so we can
-        * assume it is enabled for such cases and hence simplify the filter
-        * insertion logic. Firmware that does not support multicast chaining
-        * does not support multiple PCI function configurations either, so
-        * filter insertion is much simpler and the same strategies can still be
-        * used.
-        */
-       if ((rc = ef10_filter_get_workarounds(enp)) != 0)
-               goto fail2;
+       return (0);
 
-       if ((table->eft_using_all_mulcst != all_mulcst) &&
-           (encp->enc_bug26807_workaround == B_TRUE)) {
-               /*
-                * Multicast filter chaining is enabled, so traffic that matches
-                * more than one multicast filter will be replicated and
-                * delivered to multiple recipients.  To avoid this duplicate
-                * delivery, remove old multicast filters before inserting new
-                * multicast filters.
-                */
-               ef10_filter_remove_old(enp);
-       }
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
+}
+
+static __checkReturn   efx_rc_t
+ef10_filter_insert_renew_mulcst_filters(
+       __in                            efx_nic_t *enp,
+       __in                            boolean_t mulcst,
+       __in                            boolean_t all_mulcst,
+       __in                            boolean_t brdcst,
+       __in_ecount(6*count)            uint8_t const *addrs,
+       __in                            uint32_t count,
+       __in                            efx_filter_flags_t filter_flags,
+       __in                            boolean_t all_unicst_inserted,
+       __out                           boolean_t *all_mulcst_inserted)
+{
+       ef10_filter_table_t *table = enp->en_filter.ef_ef10_filter_table;
+       efx_nic_cfg_t *encp = &enp->en_nic_cfg;
+       efx_port_t *epp = &(enp->en_port);
+       efx_rc_t rc;
+
+       *all_mulcst_inserted = B_FALSE;
 
-       /* Insert or renew multicast filters */
        if (all_mulcst == B_TRUE) {
+               efx_rc_t all_mulcst_rc;
+
                /*
                 * Insert the all multicast filter. If that fails, try to insert
                 * all of our multicast filters (but without rollback on
@@ -1538,11 +1886,14 @@ ef10_filter_reconfigure(
                 */
                all_mulcst_rc = ef10_filter_insert_all_multicast(enp,
                                                            filter_flags);
-               if (all_mulcst_rc != 0) {
+               if (all_mulcst_rc == 0) {
+                       epp->ep_all_mulcst_inserted = B_TRUE;
+                       *all_mulcst_inserted = B_TRUE;
+               } else {
                        rc = ef10_filter_insert_multicast_list(enp, B_TRUE,
                            brdcst, addrs, count, filter_flags, B_FALSE);
                        if (rc != 0)
-                               goto fail3;
+                               goto fail1;
                }
        } else {
                /*
@@ -1564,20 +1915,144 @@ ef10_filter_reconfigure(
                                 * by packets matching multiple filters.
                                 */
                                ef10_filter_remove_old(enp);
+                               if (all_unicst_inserted == B_FALSE)
+                                       epp->ep_all_unicst_inserted = B_FALSE;
+                               if (*all_mulcst_inserted == B_FALSE)
+                                       epp->ep_all_mulcst_inserted = B_FALSE;
                        }
 
                        rc = ef10_filter_insert_all_multicast(enp,
                                                            filter_flags);
-                       if (rc != 0) {
+                       if (rc == 0) {
+                               epp->ep_all_mulcst_inserted = B_TRUE;
+                               *all_mulcst_inserted = B_TRUE;
+                       } else {
                                rc = ef10_filter_insert_multicast_list(enp,
                                    mulcst, brdcst,
                                    addrs, count, filter_flags, B_FALSE);
                                if (rc != 0)
-                                       goto fail4;
+                                       goto fail2;
                        }
                }
        }
 
+       return (0);
+
+fail2:
+       EFSYS_PROBE1(fail2, efx_rc_t, rc);
+
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
+}
+
+/*
+ * Reconfigure all filters.
+ * If all_unicst and/or all mulcst filters cannot be applied then
+ * return ENOTSUP (Note the filters for the specified addresses are
+ * still applied in this case).
+ */
+       __checkReturn   efx_rc_t
+ef10_filter_reconfigure(
+       __in                            efx_nic_t *enp,
+       __in_ecount(6)                  uint8_t const *mac_addr,
+       __in                            boolean_t all_unicst,
+       __in                            boolean_t mulcst,
+       __in                            boolean_t all_mulcst,
+       __in                            boolean_t brdcst,
+       __in_ecount(6*count)            uint8_t const *addrs,
+       __in                            uint32_t count)
+{
+       efx_nic_cfg_t *encp = &enp->en_nic_cfg;
+       efx_port_t *epp = &(enp->en_port);
+       ef10_filter_table_t *table = enp->en_filter.ef_ef10_filter_table;
+       efx_filter_flags_t filter_flags;
+       unsigned int i;
+       boolean_t all_unicst_inserted = B_FALSE;
+       boolean_t all_mulcst_inserted = B_FALSE;
+       efx_rc_t rc;
+
+       if (table->eft_default_rxq == NULL) {
+               /*
+                * Filters direct traffic to the default RXQ, and so cannot be
+                * inserted until it is available. Any currently configured
+                * filters must be removed (ignore errors in case the MC
+                * has rebooted, which removes hardware filters).
+                */
+               ef10_filter_remove_all_existing_filters(enp);
+               return (0);
+       }
+
+       if (table->eft_using_rss)
+               filter_flags = EFX_FILTER_FLAG_RX_RSS;
+       else
+               filter_flags = 0;
+
+       /* Mark old filters which may need to be removed */
+       ef10_filter_mark_old_filters(enp);
+
+       /* Insert or renew unicast filters */
+       rc = ef10_filter_insert_renew_unicst_filters(enp, mac_addr, all_unicst,
+                                                    filter_flags,
+                                                    &all_unicst_inserted);
+       if (rc != 0)
+               goto fail1;
+
+       /*
+        * WORKAROUND_BUG26807 controls firmware support for chained multicast
+        * filters, and can only be enabled or disabled when the hardware filter
+        * table is empty.
+        *
+        * Chained multicast filters require support from the datapath firmware,
+        * and may not be available (e.g. low-latency variants or old Huntington
+        * firmware).
+        *
+        * Firmware will reset (FLR) functions which have inserted filters in
+        * the hardware filter table when the workaround is enabled/disabled.
+        * Functions without any hardware filters are not reset.
+        *
+        * Re-check if the workaround is enabled after adding unicast hardware
+        * filters. This ensures that encp->enc_bug26807_workaround matches the
+        * firmware state, and that later changes to enable/disable the
+        * workaround will result in this function seeing a reset (FLR).
+        *
+        * In common-code drivers, we only support multiple PCI function
+        * scenarios with firmware that supports multicast chaining, so we can
+        * assume it is enabled for such cases and hence simplify the filter
+        * insertion logic. Firmware that does not support multicast chaining
+        * does not support multiple PCI function configurations either, so
+        * filter insertion is much simpler and the same strategies can still be
+        * used.
+        */
+       if ((rc = ef10_filter_get_workarounds(enp)) != 0)
+               goto fail2;
+
+       if ((table->eft_using_all_mulcst != all_mulcst) &&
+           (encp->enc_bug26807_workaround == B_TRUE)) {
+               /*
+                * Multicast filter chaining is enabled, so traffic that matches
+                * more than one multicast filter will be replicated and
+                * delivered to multiple recipients.  To avoid this duplicate
+                * delivery, remove old multicast filters before inserting new
+                * multicast filters.
+                */
+               ef10_filter_remove_old(enp);
+               if (all_unicst_inserted == B_FALSE)
+                       epp->ep_all_unicst_inserted = B_FALSE;
+
+               epp->ep_all_mulcst_inserted = B_FALSE;
+       }
+
+       /* Insert or renew multicast filters */
+       rc = ef10_filter_insert_renew_mulcst_filters(enp, mulcst, all_mulcst,
+                                                    brdcst, addrs, count,
+                                                    filter_flags,
+                                                    all_unicst_inserted,
+                                                    &all_mulcst_inserted);
+       if (rc != 0)
+               goto fail3;
+
        if (encp->enc_tunnel_encapsulations_supported != 0) {
                /* Try to insert filters for encapsulated packets. */
                (void) ef10_filter_insert_encap_filters(enp,
@@ -1587,17 +2062,19 @@ ef10_filter_reconfigure(
 
        /* Remove old filters which were not renewed */
        ef10_filter_remove_old(enp);
+       if (all_unicst_inserted == B_FALSE)
+               epp->ep_all_unicst_inserted = B_FALSE;
+       if (all_mulcst_inserted == B_FALSE)
+               epp->ep_all_mulcst_inserted = B_FALSE;
 
        /* report if any optional flags were rejected */
-       if (((all_unicst != B_FALSE) && (all_unicst_rc != 0)) ||
-           ((all_mulcst != B_FALSE) && (all_mulcst_rc != 0))) {
+       if (((all_unicst != B_FALSE) && (all_unicst_inserted == B_FALSE)) ||
+           ((all_mulcst != B_FALSE) && (all_mulcst_inserted == B_FALSE))) {
                rc = ENOTSUP;
        }
 
        return (rc);
 
-fail4:
-       EFSYS_PROBE(fail4);
 fail3:
        EFSYS_PROBE(fail3);
 fail2:
@@ -1660,4 +2137,4 @@ ef10_filter_default_rxq_clear(
 
 #endif /* EFSYS_OPT_FILTER */
 
-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */
+#endif /* EFX_OPTS_EF10() */