net/sfc/base: support more RSS hash configurations
[dpdk.git] / drivers / net / sfc / base / efx_rx.c
index c1da6b8..b02c7f6 100644 (file)
@@ -1,31 +1,7 @@
-/*
- * 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.
+/* SPDX-License-Identifier: BSD-3-Clause
  *
- * 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.
- *
- * 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) 2007-2018 Solarflare Communications Inc.
+ * All rights reserved.
  */
 
 #include "efx.h"
@@ -42,20 +18,58 @@ static                      void
 siena_rx_fini(
        __in            efx_nic_t *enp);
 
+#if EFSYS_OPT_RX_SCATTER
+static __checkReturn   efx_rc_t
+siena_rx_scatter_enable(
+       __in            efx_nic_t *enp,
+       __in            unsigned int buf_size);
+#endif /* EFSYS_OPT_RX_SCATTER */
+
+#if EFSYS_OPT_RX_SCALE
+static __checkReturn   efx_rc_t
+siena_rx_scale_mode_set(
+       __in            efx_nic_t *enp,
+       __in            uint32_t rss_context,
+       __in            efx_rx_hash_alg_t alg,
+       __in            efx_rx_hash_type_t type,
+       __in            boolean_t insert);
+
+static __checkReturn   efx_rc_t
+siena_rx_scale_key_set(
+       __in            efx_nic_t *enp,
+       __in            uint32_t rss_context,
+       __in_ecount(n)  uint8_t *key,
+       __in            size_t n);
+
+static __checkReturn   efx_rc_t
+siena_rx_scale_tbl_set(
+       __in            efx_nic_t *enp,
+       __in            uint32_t rss_context,
+       __in_ecount(n)  unsigned int *table,
+       __in            size_t n);
+
+static __checkReturn   uint32_t
+siena_rx_prefix_hash(
+       __in            efx_nic_t *enp,
+       __in            efx_rx_hash_alg_t func,
+       __in            uint8_t *buffer);
+
+#endif /* EFSYS_OPT_RX_SCALE */
+
 static __checkReturn   efx_rc_t
 siena_rx_prefix_pktlen(
        __in            efx_nic_t *enp,
        __in            uint8_t *buffer,
        __out           uint16_t *lengthp);
 
-static                 void
+static                         void
 siena_rx_qpost(
-       __in            efx_rxq_t *erp,
-       __in_ecount(n)  efsys_dma_addr_t *addrp,
-       __in            size_t size,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __in            unsigned int added);
+       __in                    efx_rxq_t *erp,
+       __in_ecount(ndescs)     efsys_dma_addr_t *addrp,
+       __in                    size_t size,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __in                    unsigned int added);
 
 static                 void
 siena_rx_qpush(
@@ -63,6 +77,22 @@ siena_rx_qpush(
        __in            unsigned int added,
        __inout         unsigned int *pushedp);
 
+#if EFSYS_OPT_RX_PACKED_STREAM
+static         void
+siena_rx_qpush_ps_credits(
+       __in            efx_rxq_t *erp);
+
+static __checkReturn   uint8_t *
+siena_rx_qps_packet_info(
+       __in            efx_rxq_t *erp,
+       __in            uint8_t *buffer,
+       __in            uint32_t buffer_length,
+       __in            uint32_t current_offset,
+       __out           uint16_t *lengthp,
+       __out           uint32_t *next_offsetp,
+       __out           uint32_t *timestamp);
+#endif
+
 static __checkReturn   efx_rc_t
 siena_rx_qflush(
        __in            efx_rxq_t *erp);
@@ -77,9 +107,11 @@ siena_rx_qcreate(
        __in            unsigned int index,
        __in            unsigned int label,
        __in            efx_rxq_type_t type,
+       __in            uint32_t type_data,
        __in            efsys_mem_t *esmp,
-       __in            size_t n,
+       __in            size_t ndescs,
        __in            uint32_t id,
+       __in            unsigned int flags,
        __in            efx_evq_t *eep,
        __in            efx_rxq_t *erp);
 
@@ -94,9 +126,24 @@ siena_rx_qdestroy(
 static const efx_rx_ops_t __efx_rx_siena_ops = {
        siena_rx_init,                          /* erxo_init */
        siena_rx_fini,                          /* erxo_fini */
+#if EFSYS_OPT_RX_SCATTER
+       siena_rx_scatter_enable,                /* erxo_scatter_enable */
+#endif
+#if EFSYS_OPT_RX_SCALE
+       NULL,                                   /* erxo_scale_context_alloc */
+       NULL,                                   /* erxo_scale_context_free */
+       siena_rx_scale_mode_set,                /* erxo_scale_mode_set */
+       siena_rx_scale_key_set,                 /* erxo_scale_key_set */
+       siena_rx_scale_tbl_set,                 /* erxo_scale_tbl_set */
+       siena_rx_prefix_hash,                   /* erxo_prefix_hash */
+#endif
        siena_rx_prefix_pktlen,                 /* erxo_prefix_pktlen */
        siena_rx_qpost,                         /* erxo_qpost */
        siena_rx_qpush,                         /* erxo_qpush */
+#if EFSYS_OPT_RX_PACKED_STREAM
+       siena_rx_qpush_ps_credits,              /* erxo_qpush_ps_credits */
+       siena_rx_qps_packet_info,               /* erxo_qps_packet_info */
+#endif
        siena_rx_qflush,                        /* erxo_qflush */
        siena_rx_qenable,                       /* erxo_qenable */
        siena_rx_qcreate,                       /* erxo_qcreate */
@@ -104,6 +151,35 @@ static const efx_rx_ops_t __efx_rx_siena_ops = {
 };
 #endif /* EFSYS_OPT_SIENA */
 
+#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
+static const efx_rx_ops_t __efx_rx_ef10_ops = {
+       ef10_rx_init,                           /* erxo_init */
+       ef10_rx_fini,                           /* erxo_fini */
+#if EFSYS_OPT_RX_SCATTER
+       ef10_rx_scatter_enable,                 /* erxo_scatter_enable */
+#endif
+#if EFSYS_OPT_RX_SCALE
+       ef10_rx_scale_context_alloc,            /* erxo_scale_context_alloc */
+       ef10_rx_scale_context_free,             /* erxo_scale_context_free */
+       ef10_rx_scale_mode_set,                 /* erxo_scale_mode_set */
+       ef10_rx_scale_key_set,                  /* erxo_scale_key_set */
+       ef10_rx_scale_tbl_set,                  /* erxo_scale_tbl_set */
+       ef10_rx_prefix_hash,                    /* erxo_prefix_hash */
+#endif
+       ef10_rx_prefix_pktlen,                  /* erxo_prefix_pktlen */
+       ef10_rx_qpost,                          /* erxo_qpost */
+       ef10_rx_qpush,                          /* erxo_qpush */
+#if EFSYS_OPT_RX_PACKED_STREAM
+       ef10_rx_qpush_ps_credits,               /* erxo_qpush_ps_credits */
+       ef10_rx_qps_packet_info,                /* erxo_qps_packet_info */
+#endif
+       ef10_rx_qflush,                         /* erxo_qflush */
+       ef10_rx_qenable,                        /* erxo_qenable */
+       ef10_rx_qcreate,                        /* erxo_qcreate */
+       ef10_rx_qdestroy,                       /* erxo_qdestroy */
+};
+#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */
+
 
        __checkReturn   efx_rc_t
 efx_rx_init(
@@ -132,6 +208,24 @@ efx_rx_init(
                break;
 #endif /* EFSYS_OPT_SIENA */
 
+#if EFSYS_OPT_HUNTINGTON
+       case EFX_FAMILY_HUNTINGTON:
+               erxop = &__efx_rx_ef10_ops;
+               break;
+#endif /* EFSYS_OPT_HUNTINGTON */
+
+#if EFSYS_OPT_MEDFORD
+       case EFX_FAMILY_MEDFORD:
+               erxop = &__efx_rx_ef10_ops;
+               break;
+#endif /* EFSYS_OPT_MEDFORD */
+
+#if EFSYS_OPT_MEDFORD2
+       case EFX_FAMILY_MEDFORD2:
+               erxop = &__efx_rx_ef10_ops;
+               break;
+#endif /* EFSYS_OPT_MEDFORD2 */
+
        default:
                EFSYS_ASSERT(0);
                rc = ENOTSUP;
@@ -176,23 +270,425 @@ efx_rx_fini(
        enp->en_mod_flags &= ~EFX_MOD_RX;
 }
 
-                       void
+#if EFSYS_OPT_RX_SCATTER
+       __checkReturn   efx_rc_t
+efx_rx_scatter_enable(
+       __in            efx_nic_t *enp,
+       __in            unsigned int buf_size)
+{
+       const efx_rx_ops_t *erxop = enp->en_erxop;
+       efx_rc_t rc;
+
+       EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
+       EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_RX);
+
+       if ((rc = erxop->erxo_scatter_enable(enp, buf_size)) != 0)
+               goto fail1;
+
+       return (0);
+
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+       return (rc);
+}
+#endif /* EFSYS_OPT_RX_SCATTER */
+
+#if EFSYS_OPT_RX_SCALE
+       __checkReturn                           efx_rc_t
+efx_rx_scale_hash_flags_get(
+       __in                                    efx_nic_t *enp,
+       __in                                    efx_rx_hash_alg_t hash_alg,
+       __inout_ecount(EFX_RX_HASH_NFLAGS)      unsigned int *flags,
+       __out                                   unsigned int *nflagsp)
+{
+       efx_nic_cfg_t *encp = &enp->en_nic_cfg;
+       boolean_t additional_modes;
+       unsigned int *entryp = flags;
+       efx_rc_t rc;
+
+       if (flags == NULL || nflagsp == NULL) {
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       additional_modes = encp->enc_rx_scale_additional_modes_supported;
+
+#define        LIST_FLAGS(_entryp, _class, _l4_hashing, _additional_modes)     \
+       do {                                                            \
+               if (_l4_hashing) {                                      \
+                       *(_entryp++) = EFX_RX_HASH(_class, 4TUPLE);     \
+                                                                       \
+                       if (_additional_modes) {                        \
+                               *(_entryp++) =                          \
+                                   EFX_RX_HASH(_class, 2TUPLE_DST);    \
+                               *(_entryp++) =                          \
+                                   EFX_RX_HASH(_class, 2TUPLE_SRC);    \
+                       }                                               \
+               }                                                       \
+                                                                       \
+               *(_entryp++) = EFX_RX_HASH(_class, 2TUPLE);             \
+                                                                       \
+               if (_additional_modes) {                                \
+                       *(_entryp++) = EFX_RX_HASH(_class, 1TUPLE_DST); \
+                       *(_entryp++) = EFX_RX_HASH(_class, 1TUPLE_SRC); \
+               }                                                       \
+                                                                       \
+               *(_entryp++) = EFX_RX_HASH(_class, DISABLE);            \
+                                                                       \
+               _NOTE(CONSTANTCONDITION)                                \
+       } while (B_FALSE)
+
+       switch (hash_alg) {
+       case EFX_RX_HASHALG_TOEPLITZ:
+               LIST_FLAGS(entryp, IPV4_TCP, B_TRUE, additional_modes);
+               LIST_FLAGS(entryp, IPV6_TCP, B_TRUE, additional_modes);
+
+               if (additional_modes) {
+                       LIST_FLAGS(entryp, IPV4_UDP, B_TRUE, additional_modes);
+                       LIST_FLAGS(entryp, IPV6_UDP, B_TRUE, additional_modes);
+               }
+
+               LIST_FLAGS(entryp, IPV4, B_FALSE, additional_modes);
+               LIST_FLAGS(entryp, IPV6, B_FALSE, additional_modes);
+               break;
+
+       default:
+               rc = EINVAL;
+               goto fail2;
+       }
+
+#undef LIST_FLAGS
+
+       *nflagsp = (unsigned int)(entryp - flags);
+       EFSYS_ASSERT3U(*nflagsp, <=, EFX_RX_HASH_NFLAGS);
+
+       return (0);
+
+fail2:
+       EFSYS_PROBE(fail2);
+
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
+}
+
+       __checkReturn   efx_rc_t
+efx_rx_hash_default_support_get(
+       __in            efx_nic_t *enp,
+       __out           efx_rx_hash_support_t *supportp)
+{
+       efx_rc_t rc;
+
+       EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
+       EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_RX);
+
+       if (supportp == NULL) {
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       /*
+        * Report the hashing support the client gets by default if it
+        * does not allocate an RSS context itself.
+        */
+       *supportp = enp->en_hash_support;
+
+       return (0);
+
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
+}
+
+       __checkReturn   efx_rc_t
+efx_rx_scale_default_support_get(
+       __in            efx_nic_t *enp,
+       __out           efx_rx_scale_context_type_t *typep)
+{
+       efx_rc_t rc;
+
+       EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
+       EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_RX);
+
+       if (typep == NULL) {
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       /*
+        * Report the RSS support the client gets by default if it
+        * does not allocate an RSS context itself.
+        */
+       *typep = enp->en_rss_context_type;
+
+       return (0);
+
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
+}
+#endif /* EFSYS_OPT_RX_SCALE */
+
+#if EFSYS_OPT_RX_SCALE
+       __checkReturn   efx_rc_t
+efx_rx_scale_context_alloc(
+       __in            efx_nic_t *enp,
+       __in            efx_rx_scale_context_type_t type,
+       __in            uint32_t num_queues,
+       __out           uint32_t *rss_contextp)
+{
+       const efx_rx_ops_t *erxop = enp->en_erxop;
+       efx_rc_t rc;
+
+       EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
+       EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_RX);
+
+       if (erxop->erxo_scale_context_alloc == NULL) {
+               rc = ENOTSUP;
+               goto fail1;
+       }
+       if ((rc = erxop->erxo_scale_context_alloc(enp, type,
+                           num_queues, rss_contextp)) != 0) {
+               goto fail2;
+       }
+
+       return (0);
+
+fail2:
+       EFSYS_PROBE(fail2);
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+       return (rc);
+}
+#endif /* EFSYS_OPT_RX_SCALE */
+
+#if EFSYS_OPT_RX_SCALE
+       __checkReturn   efx_rc_t
+efx_rx_scale_context_free(
+       __in            efx_nic_t *enp,
+       __in            uint32_t rss_context)
+{
+       const efx_rx_ops_t *erxop = enp->en_erxop;
+       efx_rc_t rc;
+
+       EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
+       EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_RX);
+
+       if (erxop->erxo_scale_context_free == NULL) {
+               rc = ENOTSUP;
+               goto fail1;
+       }
+       if ((rc = erxop->erxo_scale_context_free(enp, rss_context)) != 0)
+               goto fail2;
+
+       return (0);
+
+fail2:
+       EFSYS_PROBE(fail2);
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+       return (rc);
+}
+#endif /* EFSYS_OPT_RX_SCALE */
+
+#if EFSYS_OPT_RX_SCALE
+       __checkReturn   efx_rc_t
+efx_rx_scale_mode_set(
+       __in            efx_nic_t *enp,
+       __in            uint32_t rss_context,
+       __in            efx_rx_hash_alg_t alg,
+       __in            efx_rx_hash_type_t type,
+       __in            boolean_t insert)
+{
+       const efx_rx_ops_t *erxop = enp->en_erxop;
+       unsigned int type_flags[EFX_RX_HASH_NFLAGS];
+       unsigned int type_nflags;
+       efx_rx_hash_type_t type_check;
+       unsigned int i;
+       efx_rc_t rc;
+
+       EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
+       EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_RX);
+
+       /*
+        * Legacy flags and modern bits cannot be
+        * used at the same time in the hash type.
+        */
+       if ((type & EFX_RX_HASH_LEGACY_MASK) &&
+           (type & ~EFX_RX_HASH_LEGACY_MASK)) {
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       /*
+        * Translate legacy flags to the new representation
+        * so that chip-specific handlers will consider the
+        * new flags only.
+        */
+       if (type & EFX_RX_HASH_IPV4) {
+               type |= EFX_RX_HASH(IPV4, 2TUPLE);
+               type |= EFX_RX_HASH(IPV4_TCP, 2TUPLE);
+               type |= EFX_RX_HASH(IPV4_UDP, 2TUPLE);
+       }
+
+       if (type & EFX_RX_HASH_TCPIPV4)
+               type |= EFX_RX_HASH(IPV4_TCP, 4TUPLE);
+
+       if (type & EFX_RX_HASH_IPV6) {
+               type |= EFX_RX_HASH(IPV6, 2TUPLE);
+               type |= EFX_RX_HASH(IPV6_TCP, 2TUPLE);
+               type |= EFX_RX_HASH(IPV6_UDP, 2TUPLE);
+       }
+
+       if (type & EFX_RX_HASH_TCPIPV6)
+               type |= EFX_RX_HASH(IPV6_TCP, 4TUPLE);
+
+       type &= ~EFX_RX_HASH_LEGACY_MASK;
+       type_check = type;
+
+       /*
+        * Get the list of supported hash flags and sanitise the input.
+        */
+       rc = efx_rx_scale_hash_flags_get(enp, alg, type_flags, &type_nflags);
+       if (rc != 0)
+               goto fail2;
+
+       for (i = 0; i < type_nflags; ++i) {
+               if ((type_check & type_flags[i]) == type_flags[i])
+                       type_check &= ~(type_flags[i]);
+       }
+
+       if (type_check != 0) {
+               rc = EINVAL;
+               goto fail3;
+       }
+
+       if (erxop->erxo_scale_mode_set != NULL) {
+               if ((rc = erxop->erxo_scale_mode_set(enp, rss_context, alg,
+                           type, insert)) != 0)
+                       goto fail4;
+       }
+
+       return (0);
+
+fail4:
+       EFSYS_PROBE(fail4);
+fail3:
+       EFSYS_PROBE(fail3);
+fail2:
+       EFSYS_PROBE(fail2);
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+       return (rc);
+}
+#endif /* EFSYS_OPT_RX_SCALE */
+
+#if EFSYS_OPT_RX_SCALE
+       __checkReturn   efx_rc_t
+efx_rx_scale_key_set(
+       __in            efx_nic_t *enp,
+       __in            uint32_t rss_context,
+       __in_ecount(n)  uint8_t *key,
+       __in            size_t n)
+{
+       const efx_rx_ops_t *erxop = enp->en_erxop;
+       efx_rc_t rc;
+
+       EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
+       EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_RX);
+
+       if ((rc = erxop->erxo_scale_key_set(enp, rss_context, key, n)) != 0)
+               goto fail1;
+
+       return (0);
+
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
+}
+#endif /* EFSYS_OPT_RX_SCALE */
+
+#if EFSYS_OPT_RX_SCALE
+       __checkReturn   efx_rc_t
+efx_rx_scale_tbl_set(
+       __in            efx_nic_t *enp,
+       __in            uint32_t rss_context,
+       __in_ecount(n)  unsigned int *table,
+       __in            size_t n)
+{
+       const efx_rx_ops_t *erxop = enp->en_erxop;
+       efx_rc_t rc;
+
+       EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
+       EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_RX);
+
+       if ((rc = erxop->erxo_scale_tbl_set(enp, rss_context, table, n)) != 0)
+               goto fail1;
+
+       return (0);
+
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
+}
+#endif /* EFSYS_OPT_RX_SCALE */
+
+                               void
 efx_rx_qpost(
-       __in            efx_rxq_t *erp,
-       __in_ecount(n)  efsys_dma_addr_t *addrp,
-       __in            size_t size,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __in            unsigned int added)
+       __in                    efx_rxq_t *erp,
+       __in_ecount(ndescs)     efsys_dma_addr_t *addrp,
+       __in                    size_t size,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __in                    unsigned int added)
 {
        efx_nic_t *enp = erp->er_enp;
        const efx_rx_ops_t *erxop = enp->en_erxop;
 
        EFSYS_ASSERT3U(erp->er_magic, ==, EFX_RXQ_MAGIC);
 
-       erxop->erxo_qpost(erp, addrp, size, n, completed, added);
+       erxop->erxo_qpost(erp, addrp, size, ndescs, completed, added);
 }
 
+#if EFSYS_OPT_RX_PACKED_STREAM
+
+                       void
+efx_rx_qpush_ps_credits(
+       __in            efx_rxq_t *erp)
+{
+       efx_nic_t *enp = erp->er_enp;
+       const efx_rx_ops_t *erxop = enp->en_erxop;
+
+       EFSYS_ASSERT3U(erp->er_magic, ==, EFX_RXQ_MAGIC);
+
+       erxop->erxo_qpush_ps_credits(erp);
+}
+
+       __checkReturn   uint8_t *
+efx_rx_qps_packet_info(
+       __in            efx_rxq_t *erp,
+       __in            uint8_t *buffer,
+       __in            uint32_t buffer_length,
+       __in            uint32_t current_offset,
+       __out           uint16_t *lengthp,
+       __out           uint32_t *next_offsetp,
+       __out           uint32_t *timestamp)
+{
+       efx_nic_t *enp = erp->er_enp;
+       const efx_rx_ops_t *erxop = enp->en_erxop;
+
+       return (erxop->erxo_qps_packet_info(erp, buffer,
+               buffer_length, current_offset, lengthp,
+               next_offsetp, timestamp));
+}
+
+#endif /* EFSYS_OPT_RX_PACKED_STREAM */
+
                        void
 efx_rx_qpush(
        __in            efx_rxq_t *erp,
@@ -240,15 +736,17 @@ efx_rx_qenable(
        erxop->erxo_qenable(erp);
 }
 
-       __checkReturn   efx_rc_t
-efx_rx_qcreate(
+static __checkReturn   efx_rc_t
+efx_rx_qcreate_internal(
        __in            efx_nic_t *enp,
        __in            unsigned int index,
        __in            unsigned int label,
        __in            efx_rxq_type_t type,
+       __in            uint32_t type_data,
        __in            efsys_mem_t *esmp,
-       __in            size_t n,
+       __in            size_t ndescs,
        __in            uint32_t id,
+       __in            unsigned int flags,
        __in            efx_evq_t *eep,
        __deref_out     efx_rxq_t **erpp)
 {
@@ -270,11 +768,11 @@ efx_rx_qcreate(
        erp->er_magic = EFX_RXQ_MAGIC;
        erp->er_enp = enp;
        erp->er_index = index;
-       erp->er_mask = n - 1;
+       erp->er_mask = ndescs - 1;
        erp->er_esmp = esmp;
 
-       if ((rc = erxop->erxo_qcreate(enp, index, label, type, esmp, n, id,
-           eep, erp)) != 0)
+       if ((rc = erxop->erxo_qcreate(enp, index, label, type, type_data, esmp,
+           ndescs, id, flags, eep, erp)) != 0)
                goto fail2;
 
        enp->en_rx_qcount++;
@@ -292,6 +790,43 @@ fail1:
        return (rc);
 }
 
+       __checkReturn   efx_rc_t
+efx_rx_qcreate(
+       __in            efx_nic_t *enp,
+       __in            unsigned int index,
+       __in            unsigned int label,
+       __in            efx_rxq_type_t type,
+       __in            efsys_mem_t *esmp,
+       __in            size_t ndescs,
+       __in            uint32_t id,
+       __in            unsigned int flags,
+       __in            efx_evq_t *eep,
+       __deref_out     efx_rxq_t **erpp)
+{
+       return efx_rx_qcreate_internal(enp, index, label, type, 0, esmp, ndescs,
+           id, flags, eep, erpp);
+}
+
+#if EFSYS_OPT_RX_PACKED_STREAM
+
+       __checkReturn   efx_rc_t
+efx_rx_qcreate_packed_stream(
+       __in            efx_nic_t *enp,
+       __in            unsigned int index,
+       __in            unsigned int label,
+       __in            uint32_t ps_buf_size,
+       __in            efsys_mem_t *esmp,
+       __in            size_t ndescs,
+       __in            efx_evq_t *eep,
+       __deref_out     efx_rxq_t **erpp)
+{
+       return efx_rx_qcreate_internal(enp, index, label,
+           EFX_RXQ_TYPE_PACKED_STREAM, ps_buf_size, esmp, ndescs,
+           0 /* id unused on EF10 */, EFX_RXQ_FLAG_NONE, eep, erpp);
+}
+
+#endif
+
                        void
 efx_rx_qdestroy(
        __in            efx_rxq_t *erp)
@@ -318,6 +853,23 @@ efx_pseudo_hdr_pkt_length_get(
        return (erxop->erxo_prefix_pktlen(enp, buffer, lengthp));
 }
 
+#if EFSYS_OPT_RX_SCALE
+       __checkReturn   uint32_t
+efx_pseudo_hdr_hash_get(
+       __in            efx_rxq_t *erp,
+       __in            efx_rx_hash_alg_t func,
+       __in            uint8_t *buffer)
+{
+       efx_nic_t *enp = erp->er_enp;
+       const efx_rx_ops_t *erxop = enp->en_erxop;
+
+       EFSYS_ASSERT3U(erp->er_magic, ==, EFX_RXQ_MAGIC);
+
+       EFSYS_ASSERT3U(enp->en_hash_support, ==, EFX_RX_HASH_AVAILABLE);
+       return (erxop->erxo_prefix_hash(enp, func, buffer));
+}
+#endif /* EFSYS_OPT_RX_SCALE */
+
 #if EFSYS_OPT_SIENA
 
 static __checkReturn   efx_rc_t
@@ -345,8 +897,60 @@ siena_rx_init(
                                    index, &oword, B_TRUE);
        }
 
+#if EFSYS_OPT_RX_SCALE
+       /* The RSS key and indirection table are writable. */
+       enp->en_rss_context_type = EFX_RX_SCALE_EXCLUSIVE;
+
+       /* Hardware can insert RX hash with/without RSS */
+       enp->en_hash_support = EFX_RX_HASH_AVAILABLE;
+#endif /* EFSYS_OPT_RX_SCALE */
+
+       return (0);
+}
+
+#if EFSYS_OPT_RX_SCATTER
+static __checkReturn   efx_rc_t
+siena_rx_scatter_enable(
+       __in            efx_nic_t *enp,
+       __in            unsigned int buf_size)
+{
+       unsigned int nbuf32;
+       efx_oword_t oword;
+       efx_rc_t rc;
+
+       nbuf32 = buf_size / 32;
+       if ((nbuf32 == 0) ||
+           (nbuf32 >= (1 << FRF_BZ_RX_USR_BUF_SIZE_WIDTH)) ||
+           ((buf_size % 32) != 0)) {
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       if (enp->en_rx_qcount > 0) {
+               rc = EBUSY;
+               goto fail2;
+       }
+
+       /* Set scatter buffer size */
+       EFX_BAR_READO(enp, FR_AZ_RX_CFG_REG, &oword);
+       EFX_SET_OWORD_FIELD(oword, FRF_BZ_RX_USR_BUF_SIZE, nbuf32);
+       EFX_BAR_WRITEO(enp, FR_AZ_RX_CFG_REG, &oword);
+
+       /* Enable scatter for packets not matching a filter */
+       EFX_BAR_READO(enp, FR_AZ_RX_FILTER_CTL_REG, &oword);
+       EFX_SET_OWORD_FIELD(oword, FRF_BZ_SCATTER_ENBL_NO_MATCH_Q, 1);
+       EFX_BAR_WRITEO(enp, FR_AZ_RX_FILTER_CTL_REG, &oword);
+
        return (0);
+
+fail2:
+       EFSYS_PROBE(fail2);
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
 }
+#endif /* EFSYS_OPT_RX_SCATTER */
 
 
 #define        EFX_RX_LFSR_HASH(_enp, _insert)                                 \
@@ -409,6 +1013,269 @@ siena_rx_init(
        } while (B_FALSE)
 
 
+#if EFSYS_OPT_RX_SCALE
+
+static __checkReturn   efx_rc_t
+siena_rx_scale_mode_set(
+       __in            efx_nic_t *enp,
+       __in            uint32_t rss_context,
+       __in            efx_rx_hash_alg_t alg,
+       __in            efx_rx_hash_type_t type,
+       __in            boolean_t insert)
+{
+       efx_rx_hash_type_t type_ipv4 = EFX_RX_HASH(IPV4, 2TUPLE);
+       efx_rx_hash_type_t type_ipv4_tcp = EFX_RX_HASH(IPV4_TCP, 4TUPLE);
+       efx_rx_hash_type_t type_ipv6 = EFX_RX_HASH(IPV6, 2TUPLE);
+       efx_rx_hash_type_t type_ipv6_tcp = EFX_RX_HASH(IPV6_TCP, 4TUPLE);
+       efx_rc_t rc;
+
+       if (rss_context != EFX_RSS_CONTEXT_DEFAULT) {
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       switch (alg) {
+       case EFX_RX_HASHALG_LFSR:
+               EFX_RX_LFSR_HASH(enp, insert);
+               break;
+
+       case EFX_RX_HASHALG_TOEPLITZ:
+               EFX_RX_TOEPLITZ_IPV4_HASH(enp, insert,
+                   (type & type_ipv4) == type_ipv4,
+                   (type & type_ipv4_tcp) == type_ipv4_tcp);
+
+               EFX_RX_TOEPLITZ_IPV6_HASH(enp,
+                   (type & type_ipv6) == type_ipv6,
+                   (type & type_ipv6_tcp) == type_ipv6_tcp,
+                   rc);
+               if (rc != 0)
+                       goto fail2;
+
+               break;
+
+       default:
+               rc = EINVAL;
+               goto fail3;
+       }
+
+       return (0);
+
+fail3:
+       EFSYS_PROBE(fail3);
+fail2:
+       EFSYS_PROBE(fail2);
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       EFX_RX_LFSR_HASH(enp, B_FALSE);
+
+       return (rc);
+}
+#endif
+
+#if EFSYS_OPT_RX_SCALE
+static __checkReturn   efx_rc_t
+siena_rx_scale_key_set(
+       __in            efx_nic_t *enp,
+       __in            uint32_t rss_context,
+       __in_ecount(n)  uint8_t *key,
+       __in            size_t n)
+{
+       efx_oword_t oword;
+       unsigned int byte;
+       unsigned int offset;
+       efx_rc_t rc;
+
+       if (rss_context != EFX_RSS_CONTEXT_DEFAULT) {
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       byte = 0;
+
+       /* Write Toeplitz IPv4 hash key */
+       EFX_ZERO_OWORD(oword);
+       for (offset = (FRF_BZ_RX_RSS_TKEY_LBN + FRF_BZ_RX_RSS_TKEY_WIDTH) / 8;
+           offset > 0 && byte < n;
+           --offset)
+               oword.eo_u8[offset - 1] = key[byte++];
+
+       EFX_BAR_WRITEO(enp, FR_BZ_RX_RSS_TKEY_REG, &oword);
+
+       byte = 0;
+
+       /* Verify Toeplitz IPv4 hash key */
+       EFX_BAR_READO(enp, FR_BZ_RX_RSS_TKEY_REG, &oword);
+       for (offset = (FRF_BZ_RX_RSS_TKEY_LBN + FRF_BZ_RX_RSS_TKEY_WIDTH) / 8;
+           offset > 0 && byte < n;
+           --offset) {
+               if (oword.eo_u8[offset - 1] != key[byte++]) {
+                       rc = EFAULT;
+                       goto fail2;
+               }
+       }
+
+       if ((enp->en_features & EFX_FEATURE_IPV6) == 0)
+               goto done;
+
+       byte = 0;
+
+       /* Write Toeplitz IPv6 hash key 3 */
+       EFX_BAR_READO(enp, FR_CZ_RX_RSS_IPV6_REG3, &oword);
+       for (offset = (FRF_CZ_RX_RSS_IPV6_TKEY_HI_LBN +
+           FRF_CZ_RX_RSS_IPV6_TKEY_HI_WIDTH) / 8;
+           offset > 0 && byte < n;
+           --offset)
+               oword.eo_u8[offset - 1] = key[byte++];
+
+       EFX_BAR_WRITEO(enp, FR_CZ_RX_RSS_IPV6_REG3, &oword);
+
+       /* Write Toeplitz IPv6 hash key 2 */
+       EFX_ZERO_OWORD(oword);
+       for (offset = (FRF_CZ_RX_RSS_IPV6_TKEY_MID_LBN +
+           FRF_CZ_RX_RSS_IPV6_TKEY_MID_WIDTH) / 8;
+           offset > 0 && byte < n;
+           --offset)
+               oword.eo_u8[offset - 1] = key[byte++];
+
+       EFX_BAR_WRITEO(enp, FR_CZ_RX_RSS_IPV6_REG2, &oword);
+
+       /* Write Toeplitz IPv6 hash key 1 */
+       EFX_ZERO_OWORD(oword);
+       for (offset = (FRF_CZ_RX_RSS_IPV6_TKEY_LO_LBN +
+           FRF_CZ_RX_RSS_IPV6_TKEY_LO_WIDTH) / 8;
+           offset > 0 && byte < n;
+           --offset)
+               oword.eo_u8[offset - 1] = key[byte++];
+
+       EFX_BAR_WRITEO(enp, FR_CZ_RX_RSS_IPV6_REG1, &oword);
+
+       byte = 0;
+
+       /* Verify Toeplitz IPv6 hash key 3 */
+       EFX_BAR_READO(enp, FR_CZ_RX_RSS_IPV6_REG3, &oword);
+       for (offset = (FRF_CZ_RX_RSS_IPV6_TKEY_HI_LBN +
+           FRF_CZ_RX_RSS_IPV6_TKEY_HI_WIDTH) / 8;
+           offset > 0 && byte < n;
+           --offset) {
+               if (oword.eo_u8[offset - 1] != key[byte++]) {
+                       rc = EFAULT;
+                       goto fail3;
+               }
+       }
+
+       /* Verify Toeplitz IPv6 hash key 2 */
+       EFX_BAR_READO(enp, FR_CZ_RX_RSS_IPV6_REG2, &oword);
+       for (offset = (FRF_CZ_RX_RSS_IPV6_TKEY_MID_LBN +
+           FRF_CZ_RX_RSS_IPV6_TKEY_MID_WIDTH) / 8;
+           offset > 0 && byte < n;
+           --offset) {
+               if (oword.eo_u8[offset - 1] != key[byte++]) {
+                       rc = EFAULT;
+                       goto fail4;
+               }
+       }
+
+       /* Verify Toeplitz IPv6 hash key 1 */
+       EFX_BAR_READO(enp, FR_CZ_RX_RSS_IPV6_REG1, &oword);
+       for (offset = (FRF_CZ_RX_RSS_IPV6_TKEY_LO_LBN +
+           FRF_CZ_RX_RSS_IPV6_TKEY_LO_WIDTH) / 8;
+           offset > 0 && byte < n;
+           --offset) {
+               if (oword.eo_u8[offset - 1] != key[byte++]) {
+                       rc = EFAULT;
+                       goto fail5;
+               }
+       }
+
+done:
+       return (0);
+
+fail5:
+       EFSYS_PROBE(fail5);
+fail4:
+       EFSYS_PROBE(fail4);
+fail3:
+       EFSYS_PROBE(fail3);
+fail2:
+       EFSYS_PROBE(fail2);
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
+}
+#endif
+
+#if EFSYS_OPT_RX_SCALE
+static __checkReturn   efx_rc_t
+siena_rx_scale_tbl_set(
+       __in            efx_nic_t *enp,
+       __in            uint32_t rss_context,
+       __in_ecount(n)  unsigned int *table,
+       __in            size_t n)
+{
+       efx_oword_t oword;
+       int index;
+       efx_rc_t rc;
+
+       EFX_STATIC_ASSERT(EFX_RSS_TBL_SIZE == FR_BZ_RX_INDIRECTION_TBL_ROWS);
+       EFX_STATIC_ASSERT(EFX_MAXRSS == (1 << FRF_BZ_IT_QUEUE_WIDTH));
+
+       if (rss_context != EFX_RSS_CONTEXT_DEFAULT) {
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       if (n > FR_BZ_RX_INDIRECTION_TBL_ROWS) {
+               rc = EINVAL;
+               goto fail2;
+       }
+
+       for (index = 0; index < FR_BZ_RX_INDIRECTION_TBL_ROWS; index++) {
+               uint32_t byte;
+
+               /* Calculate the entry to place in the table */
+               byte = (n > 0) ? (uint32_t)table[index % n] : 0;
+
+               EFSYS_PROBE2(table, int, index, uint32_t, byte);
+
+               EFX_POPULATE_OWORD_1(oword, FRF_BZ_IT_QUEUE, byte);
+
+               /* Write the table */
+               EFX_BAR_TBL_WRITEO(enp, FR_BZ_RX_INDIRECTION_TBL,
+                                   index, &oword, B_TRUE);
+       }
+
+       for (index = FR_BZ_RX_INDIRECTION_TBL_ROWS - 1; index >= 0; --index) {
+               uint32_t byte;
+
+               /* Determine if we're starting a new batch */
+               byte = (n > 0) ? (uint32_t)table[index % n] : 0;
+
+               /* Read the table */
+               EFX_BAR_TBL_READO(enp, FR_BZ_RX_INDIRECTION_TBL,
+                                   index, &oword, B_TRUE);
+
+               /* Verify the entry */
+               if (EFX_OWORD_FIELD(oword, FRF_BZ_IT_QUEUE) != byte) {
+                       rc = EFAULT;
+                       goto fail3;
+               }
+       }
+
+       return (0);
+
+fail3:
+       EFSYS_PROBE(fail3);
+fail2:
+       EFSYS_PROBE(fail2);
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
+}
+#endif
+
 /*
  * Falcon/Siena pseudo-header
  * --------------------------
@@ -425,6 +1292,32 @@ siena_rx_init(
  *   LL.LL         LFSR hash     (16-bit big-endian)
  */
 
+#if EFSYS_OPT_RX_SCALE
+static __checkReturn   uint32_t
+siena_rx_prefix_hash(
+       __in            efx_nic_t *enp,
+       __in            efx_rx_hash_alg_t func,
+       __in            uint8_t *buffer)
+{
+       _NOTE(ARGUNUSED(enp))
+
+       switch (func) {
+       case EFX_RX_HASHALG_TOEPLITZ:
+               return ((buffer[12] << 24) |
+                   (buffer[13] << 16) |
+                   (buffer[14] <<  8) |
+                   buffer[15]);
+
+       case EFX_RX_HASHALG_LFSR:
+               return ((buffer[14] << 8) | buffer[15]);
+
+       default:
+               EFSYS_ASSERT(0);
+               return (0);
+       }
+}
+#endif /* EFSYS_OPT_RX_SCALE */
+
 static __checkReturn   efx_rc_t
 siena_rx_prefix_pktlen(
        __in            efx_nic_t *enp,
@@ -439,14 +1332,14 @@ siena_rx_prefix_pktlen(
 }
 
 
-static                 void
+static                         void
 siena_rx_qpost(
-       __in            efx_rxq_t *erp,
-       __in_ecount(n)  efsys_dma_addr_t *addrp,
-       __in            size_t size,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __in            unsigned int added)
+       __in                    efx_rxq_t *erp,
+       __in_ecount(ndescs)     efsys_dma_addr_t *addrp,
+       __in                    size_t size,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __in                    unsigned int added)
 {
        efx_qword_t qword;
        unsigned int i;
@@ -454,11 +1347,11 @@ siena_rx_qpost(
        unsigned int id;
 
        /* The client driver must not overfill the queue */
-       EFSYS_ASSERT3U(added - completed + n, <=,
+       EFSYS_ASSERT3U(added - completed + ndescs, <=,
            EFX_RXQ_LIMIT(erp->er_mask + 1));
 
        id = added & (erp->er_mask);
-       for (i = 0; i < n; i++) {
+       for (i = 0; i < ndescs; i++) {
                EFSYS_PROBE4(rx_post, unsigned int, erp->er_index,
                    unsigned int, id, efsys_dma_addr_t, addrp[i],
                    size_t, size);
@@ -509,6 +1402,32 @@ siena_rx_qpush(
                            erp->er_index, &dword, B_FALSE);
 }
 
+#if EFSYS_OPT_RX_PACKED_STREAM
+static         void
+siena_rx_qpush_ps_credits(
+       __in            efx_rxq_t *erp)
+{
+       /* Not supported by Siena hardware */
+       EFSYS_ASSERT(0);
+}
+
+static         uint8_t *
+siena_rx_qps_packet_info(
+       __in            efx_rxq_t *erp,
+       __in            uint8_t *buffer,
+       __in            uint32_t buffer_length,
+       __in            uint32_t current_offset,
+       __out           uint16_t *lengthp,
+       __out           uint32_t *next_offsetp,
+       __out           uint32_t *timestamp)
+{
+       /* Not supported by Siena hardware */
+       EFSYS_ASSERT(0);
+
+       return (NULL);
+}
+#endif /* EFSYS_OPT_RX_PACKED_STREAM */
+
 static __checkReturn   efx_rc_t
 siena_rx_qflush(
        __in    efx_rxq_t *erp)
@@ -553,19 +1472,22 @@ siena_rx_qcreate(
        __in            unsigned int index,
        __in            unsigned int label,
        __in            efx_rxq_type_t type,
+       __in            uint32_t type_data,
        __in            efsys_mem_t *esmp,
-       __in            size_t n,
+       __in            size_t ndescs,
        __in            uint32_t id,
+       __in            unsigned int flags,
        __in            efx_evq_t *eep,
        __in            efx_rxq_t *erp)
 {
        efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
        efx_oword_t oword;
        uint32_t size;
-       boolean_t jumbo;
+       boolean_t jumbo = B_FALSE;
        efx_rc_t rc;
 
        _NOTE(ARGUNUSED(esmp))
+       _NOTE(ARGUNUSED(type_data))
 
        EFX_STATIC_ASSERT(EFX_EV_RX_NLABELS ==
            (1 << FRF_AZ_RX_DESCQ_LABEL_WIDTH));
@@ -575,7 +1497,8 @@ siena_rx_qcreate(
        EFX_STATIC_ASSERT(ISP2(EFX_RXQ_MAXNDESCS));
        EFX_STATIC_ASSERT(ISP2(EFX_RXQ_MINNDESCS));
 
-       if (!ISP2(n) || (n < EFX_RXQ_MINNDESCS) || (n > EFX_RXQ_MAXNDESCS)) {
+       if (!ISP2(ndescs) ||
+           (ndescs < EFX_RXQ_MINNDESCS) || (ndescs > EFX_RXQ_MAXNDESCS)) {
                rc = EINVAL;
                goto fail1;
        }
@@ -585,7 +1508,7 @@ siena_rx_qcreate(
        }
        for (size = 0; (1 << size) <= (EFX_RXQ_MAXNDESCS / EFX_RXQ_MINNDESCS);
            size++)
-               if ((1 << size) == (int)(n / EFX_RXQ_MINNDESCS))
+               if ((1 << size) == (int)(ndescs / EFX_RXQ_MINNDESCS))
                        break;
        if (id + (1 << size) >= encp->enc_buftbl_limit) {
                rc = EINVAL;
@@ -594,7 +1517,6 @@ siena_rx_qcreate(
 
        switch (type) {
        case EFX_RXQ_TYPE_DEFAULT:
-               jumbo = B_FALSE;
                break;
 
        default:
@@ -602,6 +1524,15 @@ siena_rx_qcreate(
                goto fail4;
        }
 
+       if (flags & EFX_RXQ_FLAG_SCATTER) {
+#if EFSYS_OPT_RX_SCATTER
+               jumbo = B_TRUE;
+#else
+               rc = EINVAL;
+               goto fail5;
+#endif /* EFSYS_OPT_RX_SCATTER */
+       }
+
        /* Set up the new descriptor queue */
        EFX_POPULATE_OWORD_7(oword,
            FRF_AZ_RX_DESCQ_BUF_BASE_ID, id,
@@ -617,6 +1548,10 @@ siena_rx_qcreate(
 
        return (0);
 
+#if !EFSYS_OPT_RX_SCATTER
+fail5:
+       EFSYS_PROBE(fail5);
+#endif
 fail4:
        EFSYS_PROBE(fail4);
 fail3: