net/sfc: allow ports without MAE privilege

[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 200961c..f5986b6 100644 (file)
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -26,6 +26,7 @@
 #include "sfc_rx.h"
 #include "sfc_tx.h"
 #include "sfc_flow.h"
+#include "sfc_flow_tunnel.h"
 #include "sfc_dp.h"
 #include "sfc_dp_rx.h"
 #include "sfc_repr.h"
@@ -186,7 +187,8 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        dev_info->dev_capa = RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP |
                             RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP;
 
-       if (mae->status == SFC_MAE_STATUS_SUPPORTED) {
+       if (mae->status == SFC_MAE_STATUS_SUPPORTED ||
+           mae->status == SFC_MAE_STATUS_ADMIN) {
                dev_info->switch_info.name = dev->device->driver->name;
                dev_info->switch_info.domain_id = mae->switch_domain_id;
                dev_info->switch_info.port_id = mae->switch_port_id;
@@ -1139,17 +1141,6 @@ sfc_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
                }
        }
 
-       /*
-        * The driver does not use it, but other PMDs update jumbo frame
-        * flag and max_rx_pkt_len when MTU is set.
-        */
-       if (mtu > RTE_ETHER_MTU) {
-               struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
-               rxmode->offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
-       }
-
-       dev->data->dev_conf.rxmode.max_rx_pkt_len = sa->port.pdu;
-
        sfc_adapter_unlock(sa);
 
        sfc_log_init(sa, "done");
@@ -1356,19 +1347,19 @@ sfc_tx_queue_info_get(struct rte_eth_dev *dev, uint16_t ethdev_qid,
  * use any process-local pointers from the adapter data.
  */
 static uint32_t
-sfc_rx_queue_count(struct rte_eth_dev *dev, uint16_t ethdev_qid)
+sfc_rx_queue_count(void *rx_queue)
 {
-       const struct sfc_adapter_priv *sap = sfc_adapter_priv_by_eth_dev(dev);
-       struct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);
-       sfc_ethdev_qid_t sfc_ethdev_qid = ethdev_qid;
+       struct sfc_dp_rxq *dp_rxq = rx_queue;
+       const struct sfc_dp_rx *dp_rx;
        struct sfc_rxq_info *rxq_info;
 
-       rxq_info = sfc_rxq_info_by_ethdev_qid(sas, sfc_ethdev_qid);
+       dp_rx = sfc_dp_rx_by_dp_rxq(dp_rxq);
+       rxq_info = sfc_rxq_info_by_dp_rxq(dp_rxq);
 
        if ((rxq_info->state & SFC_RXQ_STARTED) == 0)
                return 0;
 
-       return sap->dp_rx->qdesc_npending(rxq_info->dp);
+       return dp_rx->qdesc_npending(dp_rxq);
 }
 
 /*
@@ -2251,7 +2242,7 @@ sfc_representor_info_get(struct rte_eth_dev *dev,
 
        sfc_adapter_lock(sa);
 
-       if (sa->mae.status != SFC_MAE_STATUS_SUPPORTED) {
+       if (sa->mae.status != SFC_MAE_STATUS_ADMIN) {
                sfc_adapter_unlock(sa);
                return -ENOTSUP;
        }
@@ -2318,6 +2309,31 @@ sfc_representor_info_get(struct rte_eth_dev *dev,
        return nb_repr;
 }
 
+static int
+sfc_rx_metadata_negotiate(struct rte_eth_dev *dev, uint64_t *features)
+{
+       struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);
+       uint64_t supported = 0;
+
+       sfc_adapter_lock(sa);
+
+       if ((sa->priv.dp_rx->features & SFC_DP_RX_FEAT_FLOW_FLAG) != 0)
+               supported |= RTE_ETH_RX_METADATA_USER_FLAG;
+
+       if ((sa->priv.dp_rx->features & SFC_DP_RX_FEAT_FLOW_MARK) != 0)
+               supported |= RTE_ETH_RX_METADATA_USER_MARK;
+
+       if (sfc_flow_tunnel_is_supported(sa))
+               supported |= RTE_ETH_RX_METADATA_TUNNEL_ID;
+
+       sa->negotiated_rx_metadata = supported & *features;
+       *features = sa->negotiated_rx_metadata;
+
+       sfc_adapter_unlock(sa);
+
+       return 0;
+}
+
 static const struct eth_dev_ops sfc_eth_dev_ops = {
        .dev_configure                  = sfc_dev_configure,
        .dev_start                      = sfc_dev_start,
@@ -2366,6 +2382,7 @@ static const struct eth_dev_ops sfc_eth_dev_ops = {
        .xstats_get_names_by_id         = sfc_xstats_get_names_by_id,
        .pool_ops_supported             = sfc_pool_ops_supported,
        .representor_info_get           = sfc_representor_info_get,
+       .rx_metadata_negotiate          = sfc_rx_metadata_negotiate,
 };
 
 struct sfc_ethdev_init_data {
@@ -2462,6 +2479,12 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev)
                goto fail_dp_rx_name;
        }
 
+       if (strcmp(dp_rx->dp.name, SFC_KVARG_DATAPATH_EF10_ESSB) == 0) {
+               /* FLAG and MARK are always available from Rx prefix. */
+               sa->negotiated_rx_metadata |= RTE_ETH_RX_METADATA_USER_FLAG;
+               sa->negotiated_rx_metadata |= RTE_ETH_RX_METADATA_USER_MARK;
+       }
+
        sfc_notice(sa, "use %s Rx datapath", sas->dp_rx_name);
 
        rc = sfc_kvargs_process(sa, SFC_KVARG_TX_DATAPATH,
@@ -2665,7 +2688,7 @@ sfc_parse_switch_mode(struct sfc_adapter *sa, bool has_representors)
                goto fail_kvargs;
 
        if (switch_mode == NULL) {
-               sa->switchdev = encp->enc_mae_supported &&
+               sa->switchdev = encp->enc_mae_admin &&
                                (!encp->enc_datapath_cap_evb ||
                                 has_representors);
        } else if (strcasecmp(switch_mode, SFC_KVARG_SWITCH_MODE_LEGACY) == 0) {
@@ -2760,7 +2783,6 @@ sfc_eth_dev_init(struct rte_eth_dev *dev, void *init_params)
 
        /* Copy PCI device info to the dev->data */
        rte_eth_copy_pci_info(dev, pci_dev);
-       dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
        dev->data->dev_flags |= RTE_ETH_DEV_FLOW_OPS_THREAD_SAFE;
 
        rc = sfc_kvargs_parse(sa);
@@ -2801,9 +2823,9 @@ sfc_eth_dev_init(struct rte_eth_dev *dev, void *init_params)
        if (rc != 0)
                goto fail_attach;
 
-       if (sa->switchdev && sa->mae.status != SFC_MAE_STATUS_SUPPORTED) {
+       if (sa->switchdev && sa->mae.status != SFC_MAE_STATUS_ADMIN) {
                sfc_err(sa,
-                       "failed to enable switchdev mode without MAE support");
+                       "failed to enable switchdev mode without admin MAE privilege");
                rc = ENOTSUP;
                goto fail_switchdev_no_mae;
        }