net/cxgbe: fix port ID in Rx mbuf

[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 a8b971a..b04a05b 100644 (file)
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -32,6 +32,7 @@
 #include "sfc_repr.h"
 #include "sfc_sw_stats.h"
 #include "sfc_switch.h"
+#include "sfc_nic_dma.h"
 
 #define SFC_XSTAT_ID_INVALID_VAL  UINT64_MAX
 #define SFC_XSTAT_ID_INVALID_NAME '\0'
@@ -93,7 +94,6 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);
        struct sfc_rss *rss = &sas->rss;
        struct sfc_mae *mae = &sa->mae;
-       uint64_t txq_offloads_def = 0;
 
        sfc_log_init(sa, "entry");
 
@@ -145,11 +145,6 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        dev_info->tx_offload_capa = sfc_tx_get_dev_offload_caps(sa) |
                                    dev_info->tx_queue_offload_capa;
 
-       if (dev_info->tx_offload_capa & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE)
-               txq_offloads_def |= RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE;
-
-       dev_info->default_txconf.offloads |= txq_offloads_def;
-
        if (rss->context_type != EFX_RX_SCALE_UNAVAILABLE) {
                uint64_t rte_hf = 0;
                unsigned int i;
@@ -375,6 +370,7 @@ sfc_dev_close(struct rte_eth_dev *dev)
 
        sfc_eth_dev_clear_ops(dev);
 
+       sfc_nic_dma_detach(sa);
        sfc_detach(sa);
        sfc_unprobe(sa);
 
@@ -1672,15 +1668,13 @@ sfc_dev_rss_hash_update(struct rte_eth_dev *dev,
        struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);
        struct sfc_rss *rss = &sfc_sa2shared(sa)->rss;
        unsigned int efx_hash_types;
-       uint32_t contexts[] = {EFX_RSS_CONTEXT_DEFAULT, rss->dummy_rss_context};
        unsigned int n_contexts;
        unsigned int mode_i = 0;
        unsigned int key_i = 0;
+       uint32_t contexts[2];
        unsigned int i = 0;
        int rc = 0;
 
-       n_contexts = rss->dummy_rss_context == EFX_RSS_CONTEXT_DEFAULT ? 1 : 2;
-
        if (sfc_sa2shared(sa)->isolated)
                return -ENOTSUP;
 
@@ -1707,6 +1701,10 @@ sfc_dev_rss_hash_update(struct rte_eth_dev *dev,
        if (rc != 0)
                goto fail_rx_hf_rte_to_efx;
 
+       contexts[0] = EFX_RSS_CONTEXT_DEFAULT;
+       contexts[1] = rss->dummy_ctx.nic_handle;
+       n_contexts = (rss->dummy_ctx.nic_handle_refcnt == 0) ? 1 : 2;
+
        for (mode_i = 0; mode_i < n_contexts; mode_i++) {
                rc = efx_rx_scale_mode_set(sa->nic, contexts[mode_i],
                                           rss->hash_alg, efx_hash_types,
@@ -2840,11 +2838,22 @@ sfc_eth_dev_init(struct rte_eth_dev *dev, void *init_params)
        from = (const struct rte_ether_addr *)(encp->enc_mac_addr);
        rte_ether_addr_copy(from, &dev->data->mac_addrs[0]);
 
+       /*
+        * Setup the NIC DMA mapping handler. All internal mempools
+        * MUST be created on attach before this point, and the
+        * adapter MUST NOT create mempools with the adapter lock
+        * held after this point.
+        */
+       rc = sfc_nic_dma_attach(sa);
+       if (rc != 0)
+               goto fail_nic_dma_attach;
+
        sfc_adapter_unlock(sa);
 
        sfc_log_init(sa, "done");
        return 0;
 
+fail_nic_dma_attach:
 fail_switchdev_no_mae:
        sfc_detach(sa);