examples/ipsec-secgw: fix session mempool initialisation

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

diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c
index 559f903..8fa790d 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 /
@@ -662,6 +667,9 @@ sfc_mem_bar_init(struct sfc_adapter *sa, const efx_bar_region_t *mem_ebrp)
        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;
 }
 
@@ -790,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");
        }
@@ -799,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");
        }