net/sfc: fix device reconfigure

[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 6dffc1c..4f7b640 100644 (file)
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -135,11 +135,15 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
                DEV_TX_OFFLOAD_TCP_CKSUM;
 
        dev_info->default_txconf.txq_flags = ETH_TXQ_FLAGS_NOXSUMSCTP;
-       if (!encp->enc_hw_tx_insert_vlan_enabled)
+       if ((~sa->dp_tx->features & SFC_DP_TX_FEAT_VLAN_INSERT) ||
+           !encp->enc_hw_tx_insert_vlan_enabled)
                dev_info->default_txconf.txq_flags |= ETH_TXQ_FLAGS_NOVLANOFFL;
        else
                dev_info->tx_offload_capa |= DEV_TX_OFFLOAD_VLAN_INSERT;
 
+       if (~sa->dp_tx->features & SFC_DP_TX_FEAT_MULTI_SEG)
+               dev_info->default_txconf.txq_flags |= ETH_TXQ_FLAGS_NOMULTSEGS;
+
 #if EFSYS_OPT_RX_SCALE
        if (sa->rss_support != EFX_RX_SCALE_UNAVAILABLE) {
                dev_info->reta_size = EFX_RSS_TBL_SIZE;
@@ -188,8 +192,6 @@ sfc_dev_configure(struct rte_eth_dev *dev)
        sfc_adapter_lock(sa);
        switch (sa->state) {
        case SFC_ADAPTER_CONFIGURED:
-               sfc_close(sa);
-               SFC_ASSERT(sa->state == SFC_ADAPTER_INITIALIZED);
                /* FALLTHROUGH */
        case SFC_ADAPTER_INITIALIZED:
                rc = sfc_configure(sa);
@@ -467,7 +469,7 @@ sfc_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
        if (rc != 0)
                goto fail_tx_qinit;
 
-       dev->data->tx_queues[tx_queue_id] = sa->txq_info[tx_queue_id].txq;
+       dev->data->tx_queues[tx_queue_id] = sa->txq_info[tx_queue_id].txq->dp;
 
        sfc_adapter_unlock(sa);
        return 0;
@@ -481,13 +483,15 @@ fail_tx_qinit:
 static void
 sfc_tx_queue_release(void *queue)
 {
-       struct sfc_txq *txq = queue;
+       struct sfc_dp_txq *dp_txq = queue;
+       struct sfc_txq *txq;
        unsigned int sw_index;
        struct sfc_adapter *sa;
 
-       if (txq == NULL)
+       if (dp_txq == NULL)
                return;
 
+       txq = sfc_txq_by_dp_txq(dp_txq);
        sw_index = sfc_txq_sw_index(txq);
 
        SFC_ASSERT(txq->evq != NULL);
@@ -1361,10 +1365,17 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev)
        struct sfc_adapter *sa = dev->data->dev_private;
        unsigned int avail_caps = 0;
        const char *rx_name = NULL;
+       const char *tx_name = NULL;
        int rc;
 
-       if (sa == NULL || sa->state == SFC_ADAPTER_UNINITIALIZED)
-               return -E_RTE_SECONDARY;
+       switch (sa->family) {
+       case EFX_FAMILY_HUNTINGTON:
+       case EFX_FAMILY_MEDFORD:
+               avail_caps |= SFC_DP_HW_FW_CAP_EF10;
+               break;
+       default:
+               break;
+       }
 
        rc = sfc_kvargs_process(sa, SFC_KVARG_RX_DATAPATH,
                                sfc_kvarg_string_handler, &rx_name);
@@ -1399,12 +1410,45 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev)
 
        dev->rx_pkt_burst = sa->dp_rx->pkt_burst;
 
-       dev->tx_pkt_burst = sfc_xmit_pkts;
+       rc = sfc_kvargs_process(sa, SFC_KVARG_TX_DATAPATH,
+                               sfc_kvarg_string_handler, &tx_name);
+       if (rc != 0)
+               goto fail_kvarg_tx_datapath;
+
+       if (tx_name != NULL) {
+               sa->dp_tx = sfc_dp_find_tx_by_name(&sfc_dp_head, tx_name);
+               if (sa->dp_tx == NULL) {
+                       sfc_err(sa, "Tx datapath %s not found", tx_name);
+                       rc = ENOENT;
+                       goto fail_dp_tx;
+               }
+               if (!sfc_dp_match_hw_fw_caps(&sa->dp_tx->dp, avail_caps)) {
+                       sfc_err(sa,
+                               "Insufficient Hw/FW capabilities to use Tx datapath %s",
+                               tx_name);
+                       rc = EINVAL;
+                       goto fail_dp_tx;
+               }
+       } else {
+               sa->dp_tx = sfc_dp_find_tx_by_caps(&sfc_dp_head, avail_caps);
+               if (sa->dp_tx == NULL) {
+                       sfc_err(sa, "Tx datapath by caps %#x not found",
+                               avail_caps);
+                       rc = ENOENT;
+                       goto fail_dp_tx;
+               }
+       }
+
+       sfc_info(sa, "use %s Tx datapath", sa->dp_tx->dp.name);
+
+       dev->tx_pkt_burst = sa->dp_tx->pkt_burst;
 
        dev->dev_ops = &sfc_eth_dev_ops;
 
        return 0;
 
+fail_dp_tx:
+fail_kvarg_tx_datapath:
 fail_dp_rx:
 fail_kvarg_rx_datapath:
        return rc;
@@ -1414,8 +1458,15 @@ static void
 sfc_register_dp(void)
 {
        /* Register once */
-       if (TAILQ_EMPTY(&sfc_dp_head))
+       if (TAILQ_EMPTY(&sfc_dp_head)) {
+               /* Prefer EF10 datapath */
+               sfc_dp_register(&sfc_dp_head, &sfc_ef10_rx.dp);
                sfc_dp_register(&sfc_dp_head, &sfc_efx_rx.dp);
+
+               sfc_dp_register(&sfc_dp_head, &sfc_ef10_tx.dp);
+               sfc_dp_register(&sfc_dp_head, &sfc_efx_tx.dp);
+               sfc_dp_register(&sfc_dp_head, &sfc_ef10_simple_tx.dp);
+       }
 }
 
 static int
@@ -1455,6 +1506,16 @@ sfc_eth_dev_init(struct rte_eth_dev *dev)
        sfc_adapter_lock_init(sa);
        sfc_adapter_lock(sa);
 
+       sfc_log_init(sa, "probing");
+       rc = sfc_probe(sa);
+       if (rc != 0)
+               goto fail_probe;
+
+       sfc_log_init(sa, "set device ops");
+       rc = sfc_eth_dev_set_ops(dev);
+       if (rc != 0)
+               goto fail_set_ops;
+
        sfc_log_init(sa, "attaching");
        rc = sfc_attach(sa);
        if (rc != 0)
@@ -1471,12 +1532,14 @@ sfc_eth_dev_init(struct rte_eth_dev *dev)
 
        sfc_adapter_unlock(sa);
 
-       sfc_eth_dev_set_ops(dev);
-
        sfc_log_init(sa, "done");
        return 0;
 
 fail_attach:
+fail_set_ops:
+       sfc_unprobe(sa);
+
+fail_probe:
        sfc_adapter_unlock(sa);
        sfc_adapter_lock_fini(sa);
        rte_free(dev->data->mac_addrs);
@@ -1502,6 +1565,7 @@ sfc_eth_dev_uninit(struct rte_eth_dev *dev)
        sfc_adapter_lock(sa);
 
        sfc_detach(sa);
+       sfc_unprobe(sa);
 
        rte_free(dev->data->mac_addrs);
        dev->data->mac_addrs = NULL;
@@ -1551,6 +1615,7 @@ RTE_PMD_REGISTER_PCI_TABLE(net_sfc_efx, pci_id_sfc_efx_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_sfc_efx, "* igb_uio | uio_pci_generic | vfio");
 RTE_PMD_REGISTER_PARAM_STRING(net_sfc_efx,
        SFC_KVARG_RX_DATAPATH "=" SFC_KVARG_VALUES_RX_DATAPATH " "
+       SFC_KVARG_TX_DATAPATH "=" SFC_KVARG_VALUES_TX_DATAPATH " "
        SFC_KVARG_PERF_PROFILE "=" SFC_KVARG_VALUES_PERF_PROFILE " "
        SFC_KVARG_STATS_UPDATE_PERIOD_MS "=<long> "
        SFC_KVARG_MCDI_LOGGING "=" SFC_KVARG_VALUES_BOOL " "