net/mlx4: remove useless code
[dpdk.git] / drivers / net / sfc / base / ef10_rx.c
index 95a182b..849f674 100644 (file)
@@ -137,24 +137,343 @@ efx_mcdi_fini_rxq(
 
        efx_mcdi_execute_quiet(enp, &req);
 
-       if ((req.emr_rc != 0) && (req.emr_rc != MC_CMD_ERR_EALREADY)) {
+       if (req.emr_rc != 0) {
+               rc = req.emr_rc;
+               goto fail1;
+       }
+
+       return (0);
+
+fail1:
+       /*
+        * EALREADY is not an error, but indicates that the MC has rebooted and
+        * that the RXQ has already been destroyed.
+        */
+       if (rc != EALREADY)
+               EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
+}
+
+#if EFSYS_OPT_RX_SCALE
+static __checkReturn   efx_rc_t
+efx_mcdi_rss_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)
+{
+       efx_mcdi_req_t req;
+       uint8_t payload[MAX(MC_CMD_RSS_CONTEXT_ALLOC_IN_LEN,
+                           MC_CMD_RSS_CONTEXT_ALLOC_OUT_LEN)];
+       uint32_t rss_context;
+       uint32_t context_type;
+       efx_rc_t rc;
+
+       if (num_queues > EFX_MAXRSS) {
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       switch (type) {
+       case EFX_RX_SCALE_EXCLUSIVE:
+               context_type = MC_CMD_RSS_CONTEXT_ALLOC_IN_TYPE_EXCLUSIVE;
+               break;
+       case EFX_RX_SCALE_SHARED:
+               context_type = MC_CMD_RSS_CONTEXT_ALLOC_IN_TYPE_SHARED;
+               break;
+       default:
+               rc = EINVAL;
+               goto fail2;
+       }
+
+       (void) memset(payload, 0, sizeof (payload));
+       req.emr_cmd = MC_CMD_RSS_CONTEXT_ALLOC;
+       req.emr_in_buf = payload;
+       req.emr_in_length = MC_CMD_RSS_CONTEXT_ALLOC_IN_LEN;
+       req.emr_out_buf = payload;
+       req.emr_out_length = MC_CMD_RSS_CONTEXT_ALLOC_OUT_LEN;
+
+       MCDI_IN_SET_DWORD(req, RSS_CONTEXT_ALLOC_IN_UPSTREAM_PORT_ID,
+           EVB_PORT_ID_ASSIGNED);
+       MCDI_IN_SET_DWORD(req, RSS_CONTEXT_ALLOC_IN_TYPE, context_type);
+       /* NUM_QUEUES is only used to validate indirection table offsets */
+       MCDI_IN_SET_DWORD(req, RSS_CONTEXT_ALLOC_IN_NUM_QUEUES, num_queues);
+
+       efx_mcdi_execute(enp, &req);
+
+       if (req.emr_rc != 0) {
+               rc = req.emr_rc;
+               goto fail3;
+       }
+
+       if (req.emr_out_length_used < MC_CMD_RSS_CONTEXT_ALLOC_OUT_LEN) {
+               rc = EMSGSIZE;
+               goto fail4;
+       }
+
+       rss_context = MCDI_OUT_DWORD(req, RSS_CONTEXT_ALLOC_OUT_RSS_CONTEXT_ID);
+       if (rss_context == EF10_RSS_CONTEXT_INVALID) {
+               rc = ENOENT;
+               goto fail5;
+       }
+
+       *rss_contextp = rss_context;
+
+       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 /* EFSYS_OPT_RX_SCALE */
+
+#if EFSYS_OPT_RX_SCALE
+static                 efx_rc_t
+efx_mcdi_rss_context_free(
+       __in            efx_nic_t *enp,
+       __in            uint32_t rss_context)
+{
+       efx_mcdi_req_t req;
+       uint8_t payload[MAX(MC_CMD_RSS_CONTEXT_FREE_IN_LEN,
+                           MC_CMD_RSS_CONTEXT_FREE_OUT_LEN)];
+       efx_rc_t rc;
+
+       if (rss_context == EF10_RSS_CONTEXT_INVALID) {
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       (void) memset(payload, 0, sizeof (payload));
+       req.emr_cmd = MC_CMD_RSS_CONTEXT_FREE;
+       req.emr_in_buf = payload;
+       req.emr_in_length = MC_CMD_RSS_CONTEXT_FREE_IN_LEN;
+       req.emr_out_buf = payload;
+       req.emr_out_length = MC_CMD_RSS_CONTEXT_FREE_OUT_LEN;
+
+       MCDI_IN_SET_DWORD(req, RSS_CONTEXT_FREE_IN_RSS_CONTEXT_ID, rss_context);
+
+       efx_mcdi_execute_quiet(enp, &req);
+
+       if (req.emr_rc != 0) {
+               rc = req.emr_rc;
+               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
+static                 efx_rc_t
+efx_mcdi_rss_context_set_flags(
+       __in            efx_nic_t *enp,
+       __in            uint32_t rss_context,
+       __in            efx_rx_hash_type_t type)
+{
+       efx_mcdi_req_t req;
+       uint8_t payload[MAX(MC_CMD_RSS_CONTEXT_SET_FLAGS_IN_LEN,
+                           MC_CMD_RSS_CONTEXT_SET_FLAGS_OUT_LEN)];
+       efx_rc_t rc;
+
+       if (rss_context == EF10_RSS_CONTEXT_INVALID) {
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       (void) memset(payload, 0, sizeof (payload));
+       req.emr_cmd = MC_CMD_RSS_CONTEXT_SET_FLAGS;
+       req.emr_in_buf = payload;
+       req.emr_in_length = MC_CMD_RSS_CONTEXT_SET_FLAGS_IN_LEN;
+       req.emr_out_buf = payload;
+       req.emr_out_length = MC_CMD_RSS_CONTEXT_SET_FLAGS_OUT_LEN;
+
+       MCDI_IN_SET_DWORD(req, RSS_CONTEXT_SET_FLAGS_IN_RSS_CONTEXT_ID,
+           rss_context);
+
+       MCDI_IN_POPULATE_DWORD_4(req, RSS_CONTEXT_SET_FLAGS_IN_FLAGS,
+           RSS_CONTEXT_SET_FLAGS_IN_TOEPLITZ_IPV4_EN,
+           (type & EFX_RX_HASH_IPV4) ? 1 : 0,
+           RSS_CONTEXT_SET_FLAGS_IN_TOEPLITZ_TCPV4_EN,
+           (type & EFX_RX_HASH_TCPIPV4) ? 1 : 0,
+           RSS_CONTEXT_SET_FLAGS_IN_TOEPLITZ_IPV6_EN,
+           (type & EFX_RX_HASH_IPV6) ? 1 : 0,
+           RSS_CONTEXT_SET_FLAGS_IN_TOEPLITZ_TCPV6_EN,
+           (type & EFX_RX_HASH_TCPIPV6) ? 1 : 0);
+
+       efx_mcdi_execute(enp, &req);
+
+       if (req.emr_rc != 0) {
+               rc = req.emr_rc;
+               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
+static                 efx_rc_t
+efx_mcdi_rss_context_set_key(
+       __in            efx_nic_t *enp,
+       __in            uint32_t rss_context,
+       __in_ecount(n)  uint8_t *key,
+       __in            size_t n)
+{
+       efx_mcdi_req_t req;
+       uint8_t payload[MAX(MC_CMD_RSS_CONTEXT_SET_KEY_IN_LEN,
+                           MC_CMD_RSS_CONTEXT_SET_KEY_OUT_LEN)];
+       efx_rc_t rc;
+
+       if (rss_context == EF10_RSS_CONTEXT_INVALID) {
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       (void) memset(payload, 0, sizeof (payload));
+       req.emr_cmd = MC_CMD_RSS_CONTEXT_SET_KEY;
+       req.emr_in_buf = payload;
+       req.emr_in_length = MC_CMD_RSS_CONTEXT_SET_KEY_IN_LEN;
+       req.emr_out_buf = payload;
+       req.emr_out_length = MC_CMD_RSS_CONTEXT_SET_KEY_OUT_LEN;
+
+       MCDI_IN_SET_DWORD(req, RSS_CONTEXT_SET_KEY_IN_RSS_CONTEXT_ID,
+           rss_context);
+
+       EFSYS_ASSERT3U(n, ==, MC_CMD_RSS_CONTEXT_SET_KEY_IN_TOEPLITZ_KEY_LEN);
+       if (n != MC_CMD_RSS_CONTEXT_SET_KEY_IN_TOEPLITZ_KEY_LEN) {
+               rc = EINVAL;
+               goto fail2;
+       }
+
+       memcpy(MCDI_IN2(req, uint8_t, RSS_CONTEXT_SET_KEY_IN_TOEPLITZ_KEY),
+           key, n);
+
+       efx_mcdi_execute(enp, &req);
+
+       if (req.emr_rc != 0) {
                rc = req.emr_rc;
+               goto fail3;
+       }
+
+       return (0);
+
+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
+static                 efx_rc_t
+efx_mcdi_rss_context_set_table(
+       __in            efx_nic_t *enp,
+       __in            uint32_t rss_context,
+       __in_ecount(n)  unsigned int *table,
+       __in            size_t n)
+{
+       efx_mcdi_req_t req;
+       uint8_t payload[MAX(MC_CMD_RSS_CONTEXT_SET_TABLE_IN_LEN,
+                           MC_CMD_RSS_CONTEXT_SET_TABLE_OUT_LEN)];
+       uint8_t *req_table;
+       int i, rc;
+
+       if (rss_context == EF10_RSS_CONTEXT_INVALID) {
+               rc = EINVAL;
                goto fail1;
        }
 
+       (void) memset(payload, 0, sizeof (payload));
+       req.emr_cmd = MC_CMD_RSS_CONTEXT_SET_TABLE;
+       req.emr_in_buf = payload;
+       req.emr_in_length = MC_CMD_RSS_CONTEXT_SET_TABLE_IN_LEN;
+       req.emr_out_buf = payload;
+       req.emr_out_length = MC_CMD_RSS_CONTEXT_SET_TABLE_OUT_LEN;
+
+       MCDI_IN_SET_DWORD(req, RSS_CONTEXT_SET_TABLE_IN_RSS_CONTEXT_ID,
+           rss_context);
+
+       req_table =
+           MCDI_IN2(req, uint8_t, RSS_CONTEXT_SET_TABLE_IN_INDIRECTION_TABLE);
+
+       for (i = 0;
+           i < MC_CMD_RSS_CONTEXT_SET_TABLE_IN_INDIRECTION_TABLE_LEN;
+           i++) {
+               req_table[i] = (n > 0) ? (uint8_t)table[i % n] : 0;
+       }
+
+       efx_mcdi_execute(enp, &req);
+
+       if (req.emr_rc != 0) {
+               rc = req.emr_rc;
+               goto fail2;
+       }
+
        return (0);
 
+fail2:
+       EFSYS_PROBE(fail2);
 fail1:
        EFSYS_PROBE1(fail1, efx_rc_t, rc);
 
        return (rc);
 }
+#endif /* EFSYS_OPT_RX_SCALE */
 
 
        __checkReturn   efx_rc_t
 ef10_rx_init(
        __in            efx_nic_t *enp)
 {
+#if EFSYS_OPT_RX_SCALE
+
+       if (efx_mcdi_rss_context_alloc(enp, EFX_RX_SCALE_EXCLUSIVE, EFX_MAXRSS,
+               &enp->en_rss_context) == 0) {
+               /*
+                * Allocated an exclusive RSS context, which allows both the
+                * indirection table and key to be modified.
+                */
+               enp->en_rss_context_type = EFX_RX_SCALE_EXCLUSIVE;
+               enp->en_hash_support = EFX_RX_HASH_AVAILABLE;
+       } else {
+               /*
+                * Failed to allocate an exclusive RSS context. Continue
+                * operation without support for RSS. The pseudo-header in
+                * received packets will not contain a Toeplitz hash value.
+                */
+               enp->en_rss_context_type = EFX_RX_SCALE_UNAVAILABLE;
+               enp->en_hash_support = EFX_RX_HASH_UNAVAILABLE;
+       }
+
+#endif /* EFSYS_OPT_RX_SCALE */
 
        return (0);
 }
@@ -170,6 +489,161 @@ ef10_rx_scatter_enable(
 }
 #endif /* EFSYS_OPT_RX_SCATTER */
 
+#if EFSYS_OPT_RX_SCALE
+       __checkReturn   efx_rc_t
+ef10_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)
+{
+       efx_rc_t rc;
+
+       rc = efx_mcdi_rss_context_alloc(enp, type, num_queues, rss_contextp);
+       if (rc != 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
+ef10_rx_scale_context_free(
+       __in            efx_nic_t *enp,
+       __in            uint32_t rss_context)
+{
+       efx_rc_t rc;
+
+       rc = efx_mcdi_rss_context_free(enp, rss_context);
+       if (rc != 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
+ef10_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_rc_t rc;
+
+       EFSYS_ASSERT3U(alg, ==, EFX_RX_HASHALG_TOEPLITZ);
+       EFSYS_ASSERT3U(insert, ==, B_TRUE);
+
+       if ((alg != EFX_RX_HASHALG_TOEPLITZ) || (insert == B_FALSE)) {
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       if (rss_context == EFX_RSS_CONTEXT_DEFAULT) {
+               if (enp->en_rss_context_type == EFX_RX_SCALE_UNAVAILABLE) {
+                       rc = ENOTSUP;
+                       goto fail2;
+               }
+               rss_context = enp->en_rss_context;
+       }
+
+       if ((rc = efx_mcdi_rss_context_set_flags(enp,
+                   rss_context, type)) != 0)
+               goto fail3;
+
+       return (0);
+
+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
+ef10_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_rc_t rc;
+
+       EFX_STATIC_ASSERT(EFX_RSS_KEY_SIZE ==
+           MC_CMD_RSS_CONTEXT_SET_KEY_IN_TOEPLITZ_KEY_LEN);
+
+       if (rss_context == EFX_RSS_CONTEXT_DEFAULT) {
+               if (enp->en_rss_context_type == EFX_RX_SCALE_UNAVAILABLE) {
+                       rc = ENOTSUP;
+                       goto fail1;
+               }
+               rss_context = enp->en_rss_context;
+       }
+
+       if ((rc = efx_mcdi_rss_context_set_key(enp, rss_context, key, n)) != 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
+ef10_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_rc_t rc;
+
+
+       if (rss_context == EFX_RSS_CONTEXT_DEFAULT) {
+               if (enp->en_rss_context_type == EFX_RX_SCALE_UNAVAILABLE) {
+                       rc = ENOTSUP;
+                       goto fail1;
+               }
+               rss_context = enp->en_rss_context;
+       }
+
+       if ((rc = efx_mcdi_rss_context_set_table(enp,
+                   rss_context, table, n)) != 0)
+               goto fail2;
+
+       return (0);
+
+fail2:
+       EFSYS_PROBE(fail2);
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
+}
+#endif /* EFSYS_OPT_RX_SCALE */
+
 
 /*
  * EF10 RX pseudo-header
@@ -210,6 +684,29 @@ ef10_rx_prefix_pktlen(
        return (0);
 }
 
+#if EFSYS_OPT_RX_SCALE
+       __checkReturn   uint32_t
+ef10_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[0] |
+                   (buffer[1] << 8) |
+                   (buffer[2] << 16) |
+                   (buffer[3] << 24));
+
+       default:
+               EFSYS_ASSERT(0);
+               return (0);
+       }
+}
+#endif /* EFSYS_OPT_RX_SCALE */
+
                        void
 ef10_rx_qpost(
        __in            efx_rxq_t *erp,
@@ -279,6 +776,81 @@ ef10_rx_qpush(
                            erp->er_index, &dword, B_FALSE);
 }
 
+#if EFSYS_OPT_RX_PACKED_STREAM
+
+                       void
+ef10_rx_qps_update_credits(
+       __in    efx_rxq_t *erp)
+{
+       efx_nic_t *enp = erp->er_enp;
+       efx_dword_t dword;
+       efx_evq_rxq_state_t *rxq_state =
+               &erp->er_eep->ee_rxq_state[erp->er_label];
+
+       EFSYS_ASSERT(rxq_state->eers_rx_packed_stream);
+
+       if (rxq_state->eers_rx_packed_stream_credits == 0)
+               return;
+
+       EFX_POPULATE_DWORD_3(dword,
+           ERF_DZ_RX_DESC_MAGIC_DOORBELL, 1,
+           ERF_DZ_RX_DESC_MAGIC_CMD,
+           ERE_DZ_RX_DESC_MAGIC_CMD_PS_CREDITS,
+           ERF_DZ_RX_DESC_MAGIC_DATA,
+           rxq_state->eers_rx_packed_stream_credits);
+       EFX_BAR_TBL_WRITED(enp, ER_DZ_RX_DESC_UPD_REG,
+           erp->er_index, &dword, B_FALSE);
+
+       rxq_state->eers_rx_packed_stream_credits = 0;
+}
+
+       __checkReturn   uint8_t *
+ef10_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)
+{
+       uint16_t buf_len;
+       uint8_t *pkt_start;
+       efx_qword_t *qwordp;
+       efx_evq_rxq_state_t *rxq_state =
+               &erp->er_eep->ee_rxq_state[erp->er_label];
+
+       EFSYS_ASSERT(rxq_state->eers_rx_packed_stream);
+
+       buffer += current_offset;
+       pkt_start = buffer + EFX_RX_PACKED_STREAM_RX_PREFIX_SIZE;
+
+       qwordp = (efx_qword_t *)buffer;
+       *timestamp = EFX_QWORD_FIELD(*qwordp, ES_DZ_PS_RX_PREFIX_TSTAMP);
+       *lengthp   = EFX_QWORD_FIELD(*qwordp, ES_DZ_PS_RX_PREFIX_ORIG_LEN);
+       buf_len    = EFX_QWORD_FIELD(*qwordp, ES_DZ_PS_RX_PREFIX_CAP_LEN);
+
+       buf_len = P2ROUNDUP(buf_len + EFX_RX_PACKED_STREAM_RX_PREFIX_SIZE,
+                           EFX_RX_PACKED_STREAM_ALIGNMENT);
+       *next_offsetp =
+           current_offset + buf_len + EFX_RX_PACKED_STREAM_ALIGNMENT;
+
+       EFSYS_ASSERT3U(*next_offsetp, <=, buffer_length);
+       EFSYS_ASSERT3U(current_offset + *lengthp, <, *next_offsetp);
+
+       if ((*next_offsetp ^ current_offset) &
+           EFX_RX_PACKED_STREAM_MEM_PER_CREDIT) {
+               if (rxq_state->eers_rx_packed_stream_credits <
+                   EFX_RX_PACKED_STREAM_MAX_CREDITS)
+                       rxq_state->eers_rx_packed_stream_credits++;
+       }
+
+       return (pkt_start);
+}
+
+
+#endif
+
        __checkReturn   efx_rc_t
 ef10_rx_qflush(
        __in    efx_rxq_t *erp)
@@ -292,7 +864,14 @@ ef10_rx_qflush(
        return (0);
 
 fail1:
-       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+       /*
+        * EALREADY is not an error, but indicates that the MC has rebooted and
+        * that the RXQ has already been destroyed. Callers need to know that
+        * the RXQ flush has completed to avoid waiting until timeout for a
+        * flush done event that will not be delivered.
+        */
+       if (rc != EALREADY)
+               EFSYS_PROBE1(fail1, efx_rc_t, rc);
 
        return (rc);
 }
@@ -346,12 +925,45 @@ ef10_rx_qcreate(
        case EFX_RXQ_TYPE_SCATTER:
                ps_buf_size = 0;
                break;
+#if EFSYS_OPT_RX_PACKED_STREAM
+       case EFX_RXQ_TYPE_PACKED_STREAM_1M:
+               ps_buf_size = MC_CMD_INIT_RXQ_EXT_IN_PS_BUFF_1M;
+               break;
+       case EFX_RXQ_TYPE_PACKED_STREAM_512K:
+               ps_buf_size = MC_CMD_INIT_RXQ_EXT_IN_PS_BUFF_512K;
+               break;
+       case EFX_RXQ_TYPE_PACKED_STREAM_256K:
+               ps_buf_size = MC_CMD_INIT_RXQ_EXT_IN_PS_BUFF_256K;
+               break;
+       case EFX_RXQ_TYPE_PACKED_STREAM_128K:
+               ps_buf_size = MC_CMD_INIT_RXQ_EXT_IN_PS_BUFF_128K;
+               break;
+       case EFX_RXQ_TYPE_PACKED_STREAM_64K:
+               ps_buf_size = MC_CMD_INIT_RXQ_EXT_IN_PS_BUFF_64K;
+               break;
+#endif /* EFSYS_OPT_RX_PACKED_STREAM */
        default:
                rc = ENOTSUP;
                goto fail3;
        }
 
+#if EFSYS_OPT_RX_PACKED_STREAM
+       if (ps_buf_size != 0) {
+               /* Check if datapath firmware supports packed stream mode */
+               if (encp->enc_rx_packed_stream_supported == B_FALSE) {
+                       rc = ENOTSUP;
+                       goto fail4;
+               }
+               /* Check if packed stream allows configurable buffer sizes */
+               if ((type != EFX_RXQ_TYPE_PACKED_STREAM_1M) &&
+                   (encp->enc_rx_var_packed_stream_supported == B_FALSE)) {
+                       rc = ENOTSUP;
+                       goto fail5;
+               }
+       }
+#else /* EFSYS_OPT_RX_PACKED_STREAM */
        EFSYS_ASSERT(ps_buf_size == 0);
+#endif /* EFSYS_OPT_RX_PACKED_STREAM */
 
        /* Scatter can only be disabled if the firmware supports doing so */
        if (type == EFX_RXQ_TYPE_SCATTER)
@@ -372,6 +984,12 @@ ef10_rx_qcreate(
 
 fail6:
        EFSYS_PROBE(fail6);
+#if EFSYS_OPT_RX_PACKED_STREAM
+fail5:
+       EFSYS_PROBE(fail5);
+fail4:
+       EFSYS_PROBE(fail4);
+#endif /* EFSYS_OPT_RX_PACKED_STREAM */
 fail3:
        EFSYS_PROBE(fail3);
 fail2:
@@ -402,7 +1020,14 @@ ef10_rx_qdestroy(
 ef10_rx_fini(
        __in    efx_nic_t *enp)
 {
+#if EFSYS_OPT_RX_SCALE
+       if (enp->en_rss_context_type != EFX_RX_SCALE_UNAVAILABLE)
+               (void) efx_mcdi_rss_context_free(enp, enp->en_rss_context);
+       enp->en_rss_context = 0;
+       enp->en_rss_context_type = EFX_RX_SCALE_UNAVAILABLE;
+#else
        _NOTE(ARGUNUSED(enp))
+#endif /* EFSYS_OPT_RX_SCALE */
 }
 
 #endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */