mempool/dpaa2: add functions for CMDIF

[dpdk.git] / drivers / net / sfc / sfc_ethdev.c

diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index 359d6d2..e42d553 100644 (file)
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -153,9 +153,15 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
                dev_info->default_txconf.txq_flags |= ETH_TXQ_FLAGS_NOREFCOUNT;
 
        if (rss->context_type != EFX_RX_SCALE_UNAVAILABLE) {
+               uint64_t rte_hf = 0;
+               unsigned int i;
+
+               for (i = 0; i < rss->hf_map_nb_entries; ++i)
+                       rte_hf |= rss->hf_map[i].rte;
+
                dev_info->reta_size = EFX_RSS_TBL_SIZE;
                dev_info->hash_key_size = EFX_RSS_KEY_SIZE;
-               dev_info->flow_type_rss_offloads = SFC_RSS_OFFLOADS;
+               dev_info->flow_type_rss_offloads = rte_hf;
        }
 
        /* Initialize to hardware limits */
@@ -1378,7 +1384,7 @@ sfc_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
         * flags which corresponds to the active EFX configuration stored
         * locally in 'sfc_adapter' and kept up-to-date
         */
-       rss_conf->rss_hf = sfc_efx_to_rte_hash_type(rss->hash_types);
+       rss_conf->rss_hf = sfc_rx_hf_efx_to_rte(sa, rss->hash_types);
        rss_conf->rss_key_len = EFX_RSS_KEY_SIZE;
        if (rss_conf->rss_key != NULL)
                rte_memcpy(rss_conf->rss_key, rss->key, EFX_RSS_KEY_SIZE);
@@ -1418,18 +1424,14 @@ sfc_dev_rss_hash_update(struct rte_eth_dev *dev,
                return -EINVAL;
        }
 
-       if ((rss_conf->rss_hf & ~SFC_RSS_OFFLOADS) != 0) {
-               sfc_err(sa, "unsupported hash functions requested");
-               return -EINVAL;
-       }
-
        sfc_adapter_lock(sa);
 
-       efx_hash_types = sfc_rte_to_efx_hash_type(rss_conf->rss_hf);
+       rc = sfc_rx_hf_rte_to_efx(sa, rss_conf->rss_hf, &efx_hash_types);
+       if (rc != 0)
+               goto fail_rx_hf_rte_to_efx;
 
        rc = efx_rx_scale_mode_set(sa->nic, EFX_RSS_CONTEXT_DEFAULT,
-                                  EFX_RX_HASHALG_TOEPLITZ,
-                                  efx_hash_types, B_TRUE);
+                                  rss->hash_alg, efx_hash_types, B_TRUE);
        if (rc != 0)
                goto fail_scale_mode_set;
 
@@ -1459,6 +1461,7 @@ fail_scale_key_set:
                sfc_err(sa, "failed to restore RSS mode");
 
 fail_scale_mode_set:
+fail_rx_hf_rte_to_efx:
        sfc_adapter_unlock(sa);
        return -rc;
 }
@@ -1627,6 +1630,21 @@ sfc_dev_filter_ctrl(struct rte_eth_dev *dev, enum rte_filter_type filter_type,
        return -rc;
 }
 
+static int
+sfc_pool_ops_supported(struct rte_eth_dev *dev, const char *pool)
+{
+       struct sfc_adapter *sa = dev->data->dev_private;
+
+       /*
+        * If Rx datapath does not provide callback to check mempool,
+        * all pools are supported.
+        */
+       if (sa->dp_rx->pool_ops_supported == NULL)
+               return 1;
+
+       return sa->dp_rx->pool_ops_supported(pool);
+}
+
 static const struct eth_dev_ops sfc_eth_dev_ops = {
        .dev_configure                  = sfc_dev_configure,
        .dev_start                      = sfc_dev_start,
@@ -1675,6 +1693,7 @@ static const struct eth_dev_ops sfc_eth_dev_ops = {
        .fw_version_get                 = sfc_fw_version_get,
        .xstats_get_by_id               = sfc_xstats_get_by_id,
        .xstats_get_names_by_id         = sfc_xstats_get_names_by_id,
+       .pool_ops_supported             = sfc_pool_ops_supported,
 };
 
 /**
@@ -1704,6 +1723,7 @@ static int
 sfc_eth_dev_set_ops(struct rte_eth_dev *dev)
 {
        struct sfc_adapter *sa = dev->data->dev_private;
+       const efx_nic_cfg_t *encp;
        unsigned int avail_caps = 0;
        const char *rx_name = NULL;
        const char *tx_name = NULL;
@@ -1719,6 +1739,10 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev)
                break;
        }
 
+       encp = efx_nic_cfg_get(sa->nic);
+       if (encp->enc_rx_es_super_buffer_supported)
+               avail_caps |= SFC_DP_HW_FW_CAP_RX_ES_SUPER_BUFFER;
+
        rc = sfc_kvargs_process(sa, SFC_KVARG_RX_DATAPATH,
                                sfc_kvarg_string_handler, &rx_name);
        if (rc != 0)
@@ -1908,6 +1932,7 @@ sfc_register_dp(void)
        /* Register once */
        if (TAILQ_EMPTY(&sfc_dp_head)) {
                /* Prefer EF10 datapath */
+               sfc_dp_register(&sfc_dp_head, &sfc_ef10_essb_rx.dp);
                sfc_dp_register(&sfc_dp_head, &sfc_ef10_rx.dp);
                sfc_dp_register(&sfc_dp_head, &sfc_efx_rx.dp);
 
@@ -2084,6 +2109,7 @@ RTE_PMD_REGISTER_PARAM_STRING(net_sfc_efx,
        SFC_KVARG_TX_DATAPATH "=" SFC_KVARG_VALUES_TX_DATAPATH " "
        SFC_KVARG_PERF_PROFILE "=" SFC_KVARG_VALUES_PERF_PROFILE " "
        SFC_KVARG_FW_VARIANT "=" SFC_KVARG_VALUES_FW_VARIANT " "
+       SFC_KVARG_RXD_WAIT_TIMEOUT_NS "=<long> "
        SFC_KVARG_STATS_UPDATE_PERIOD_MS "=<long>");
 
 RTE_INIT(sfc_driver_register_logtype);