net/sfc: support flow action drop in transfer rules

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

diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c
index 4f1fd0c..3b89649 100644 (file)
--- a/drivers/net/sfc/sfc.c
+++ b/drivers/net/sfc/sfc.c
@@ -52,6 +52,11 @@ sfc_dma_alloc(const struct sfc_adapter *sa, const char *name, uint16_t id,
        esmp->esm_mz = mz;
        esmp->esm_base = mz->addr;
 
+       sfc_info(sa,
+                "DMA name=%s id=%u len=%lu socket_id=%d => virt=%p iova=%lx",
+                name, id, len, socket_id, esmp->esm_base,
+                (unsigned long)esmp->esm_addr);
+
        return 0;
 }
 
@@ -200,7 +205,7 @@ sfc_estimate_resource_limits(struct sfc_adapter *sa)
                MIN(encp->enc_txq_limit,
                    limits.edl_max_evq_count - 1 - limits.edl_max_rxq_count);
 
-       if (sa->tso)
+       if (sa->tso && encp->enc_fw_assisted_tso_v2_enabled)
                limits.edl_max_txq_count =
                        MIN(limits.edl_max_txq_count,
                            encp->enc_fw_assisted_tso_v2_n_contexts /
@@ -626,18 +631,45 @@ sfc_close(struct sfc_adapter *sa)
        sfc_log_init(sa, "done");
 }
 
+static efx_rc_t
+sfc_find_mem_bar(efsys_pci_config_t *configp, int bar_index,
+                efsys_bar_t *barp)
+{
+       efsys_bar_t result;
+       struct rte_pci_device *dev;
+
+       memset(&result, 0, sizeof(result));
+
+       if (bar_index < 0 || bar_index >= PCI_MAX_RESOURCE)
+               return EINVAL;
+
+       dev = configp->espc_dev;
+
+       result.esb_rid = bar_index;
+       result.esb_dev = dev;
+       result.esb_base = dev->mem_resource[bar_index].addr;
+
+       *barp = result;
+
+       return 0;
+}
+
 static int
-sfc_mem_bar_init(struct sfc_adapter *sa, unsigned int membar)
+sfc_mem_bar_init(struct sfc_adapter *sa, const efx_bar_region_t *mem_ebrp)
 {
        struct rte_eth_dev *eth_dev = sa->eth_dev;
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
        efsys_bar_t *ebp = &sa->mem_bar;
-       struct rte_mem_resource *res = &pci_dev->mem_resource[membar];
+       struct rte_mem_resource *res =
+               &pci_dev->mem_resource[mem_ebrp->ebr_index];
 
        SFC_BAR_LOCK_INIT(ebp, eth_dev->data->name);
-       ebp->esb_rid = membar;
+       ebp->esb_rid = mem_ebrp->ebr_index;
        ebp->esb_dev = pci_dev;
        ebp->esb_base = res->addr;
+
+       sa->fcw_offset = mem_ebrp->ebr_offset;
+
        return 0;
 }
 
@@ -766,7 +798,8 @@ sfc_attach(struct sfc_adapter *sa)
                encp->enc_tunnel_encapsulations_supported;
 
        if (sfc_dp_tx_offload_capa(sa->priv.dp_tx) & DEV_TX_OFFLOAD_TCP_TSO) {
-               sa->tso = encp->enc_fw_assisted_tso_v2_enabled;
+               sa->tso = encp->enc_fw_assisted_tso_v2_enabled ||
+                         encp->enc_tso_v3_enabled;
                if (!sa->tso)
                        sfc_info(sa, "TSO support isn't available on this adapter");
        }
@@ -775,7 +808,8 @@ sfc_attach(struct sfc_adapter *sa)
            (sfc_dp_tx_offload_capa(sa->priv.dp_tx) &
             (DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
              DEV_TX_OFFLOAD_GENEVE_TNL_TSO)) != 0) {
-               sa->tso_encap = encp->enc_fw_assisted_tso_v2_encap_enabled;
+               sa->tso_encap = encp->enc_fw_assisted_tso_v2_encap_enabled ||
+                               encp->enc_tso_v3_enabled;
                if (!sa->tso_encap)
                        sfc_info(sa, "Encapsulated TSO support isn't available on this adapter");
        }
@@ -823,6 +857,10 @@ sfc_attach(struct sfc_adapter *sa)
        if (rc != 0)
                goto fail_filter_attach;
 
+       rc = sfc_mae_attach(sa);
+       if (rc != 0)
+               goto fail_mae_attach;
+
        sfc_log_init(sa, "fini nic");
        efx_nic_fini(enp);
 
@@ -844,6 +882,9 @@ sfc_attach(struct sfc_adapter *sa)
 
 fail_sriov_vswitch_create:
        sfc_flow_fini(sa);
+       sfc_mae_detach(sa);
+
+fail_mae_attach:
        sfc_filter_detach(sa);
 
 fail_filter_attach:
@@ -884,6 +925,7 @@ sfc_detach(struct sfc_adapter *sa)
 
        sfc_flow_fini(sa);
 
+       sfc_mae_detach(sa);
        sfc_filter_detach(sa);
        sfc_rss_detach(sa);
        sfc_port_detach(sa);
@@ -1053,11 +1095,43 @@ sfc_nic_probe(struct sfc_adapter *sa)
        return 0;
 }
 
+static efx_rc_t
+sfc_pci_config_readd(efsys_pci_config_t *configp, uint32_t offset,
+                    efx_dword_t *edp)
+{
+       int rc;
+
+       rc = rte_pci_read_config(configp->espc_dev, edp->ed_u32, sizeof(*edp),
+                                offset);
+
+       return (rc < 0 || rc != sizeof(*edp)) ? EIO : 0;
+}
+
+static int
+sfc_family(struct sfc_adapter *sa, efx_bar_region_t *mem_ebrp)
+{
+       struct rte_eth_dev *eth_dev = sa->eth_dev;
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
+       efsys_pci_config_t espcp;
+       static const efx_pci_ops_t ops = {
+               .epo_config_readd = sfc_pci_config_readd,
+               .epo_find_mem_bar = sfc_find_mem_bar,
+       };
+       int rc;
+
+       espcp.espc_dev = pci_dev;
+
+       rc = efx_family_probe_bar(pci_dev->id.vendor_id,
+                                 pci_dev->id.device_id,
+                                 &espcp, &ops, &sa->family, mem_ebrp);
+
+       return rc;
+}
+
 int
 sfc_probe(struct sfc_adapter *sa)
 {
-       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(sa->eth_dev);
-       unsigned int membar;
+       efx_bar_region_t mem_ebrp;
        efx_nic_t *enp;
        int rc;
 
@@ -1069,21 +1143,22 @@ sfc_probe(struct sfc_adapter *sa)
        rte_atomic32_init(&sa->restart_required);
 
        sfc_log_init(sa, "get family");
-       rc = efx_family(pci_dev->id.vendor_id, pci_dev->id.device_id,
-                       &sa->family, &membar);
+       rc = sfc_family(sa, &mem_ebrp);
        if (rc != 0)
                goto fail_family;
-       sfc_log_init(sa, "family is %u, membar is %u", sa->family, membar);
+       sfc_log_init(sa,
+                    "family is %u, membar is %u, function control window offset is %lu",
+                    sa->family, mem_ebrp.ebr_index, mem_ebrp.ebr_offset);
 
        sfc_log_init(sa, "init mem bar");
-       rc = sfc_mem_bar_init(sa, membar);
+       rc = sfc_mem_bar_init(sa, &mem_ebrp);
        if (rc != 0)
                goto fail_mem_bar_init;
 
        sfc_log_init(sa, "create nic");
        rte_spinlock_init(&sa->nic_lock);
        rc = efx_nic_create(sa->family, (efsys_identifier_t *)sa,
-                           &sa->mem_bar, 0,
+                           &sa->mem_bar, mem_ebrp.ebr_offset,
                            &sa->nic_lock, &enp);
        if (rc != 0)
                goto fail_nic_create;