net/sfc: fix initialization error path

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

diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c
index 26c7c32..3f5cd77 100644 (file)
--- a/drivers/net/sfc/sfc.c
+++ b/drivers/net/sfc/sfc.c
@@ -30,7 +30,7 @@ sfc_dma_alloc(const struct sfc_adapter *sa, const char *name, uint16_t id,
 {
        const struct rte_memzone *mz;
 
-       sfc_log_init(sa, "name=%s id=%u len=%lu socket_id=%d",
+       sfc_log_init(sa, "name=%s id=%u len=%zu socket_id=%d",
                     name, id, len, socket_id);
 
        mz = rte_eth_dma_zone_reserve(sa->eth_dev, name, id, len,
@@ -148,7 +148,8 @@ sfc_check_conf(struct sfc_adapter *sa)
                rc = EINVAL;
        }
 
-       if (conf->intr_conf.rxq != 0) {
+       if (conf->intr_conf.rxq != 0 &&
+           (sa->priv.dp_rx->features & SFC_DP_RX_FEAT_INTR) == 0) {
                sfc_err(sa, "Receive queue interrupt not supported");
                rc = EINVAL;
        }
@@ -240,8 +241,8 @@ sfc_estimate_resource_limits(struct sfc_adapter *sa)
        return 0;
 
 fail_get_vi_pool:
-fail_nic_init:
        efx_nic_fini(sa->nic);
+fail_nic_init:
        return rc;
 }
 
@@ -744,11 +745,19 @@ sfc_attach(struct sfc_adapter *sa)
        sa->priv.shared->tunnel_encaps =
                encp->enc_tunnel_encapsulations_supported;
 
-       if (sa->priv.dp_tx->features & SFC_DP_TX_FEAT_TSO) {
+       if (sfc_dp_tx_offload_capa(sa->priv.dp_tx) & DEV_TX_OFFLOAD_TCP_TSO) {
                sa->tso = encp->enc_fw_assisted_tso_v2_enabled;
                if (!sa->tso)
-                       sfc_warn(sa,
-                                "TSO support isn't available on this adapter");
+                       sfc_info(sa, "TSO support isn't available on this adapter");
+       }
+
+       if (sa->tso &&
+           (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;
+               if (!sa->tso_encap)
+                       sfc_info(sa, "Encapsulated TSO support isn't available on this adapter");
        }
 
        sfc_log_init(sa, "estimate resource limits");
@@ -756,6 +765,12 @@ sfc_attach(struct sfc_adapter *sa)
        if (rc != 0)
                goto fail_estimate_rsrc_limits;
 
+       sa->evq_max_entries = encp->enc_evq_max_nevs;
+       SFC_ASSERT(rte_is_power_of_2(sa->evq_max_entries));
+
+       sa->evq_min_entries = encp->enc_evq_min_nevs;
+       SFC_ASSERT(rte_is_power_of_2(sa->evq_min_entries));
+
        sa->rxq_max_entries = encp->enc_rxq_max_ndescs;
        SFC_ASSERT(rte_is_power_of_2(sa->rxq_max_entries));
 
@@ -1109,12 +1124,12 @@ sfc_register_logtype(const struct rte_pci_addr *pci_addr,
                ++lt_prefix_str_size; /* Reserve space for prefix separator */
                lt_str_size_max = lt_prefix_str_size + PCI_PRI_STR_SIZE + 1;
        } else {
-               return RTE_LOGTYPE_PMD;
+               return sfc_logtype_driver;
        }
 
        lt_str = rte_zmalloc("logtype_str", lt_str_size_max, 0);
        if (lt_str == NULL)
-               return RTE_LOGTYPE_PMD;
+               return sfc_logtype_driver;
 
        strncpy(lt_str, lt_prefix_str, lt_prefix_str_size);
        lt_str[lt_prefix_str_size - 1] = '.';
@@ -1125,5 +1140,8 @@ sfc_register_logtype(const struct rte_pci_addr *pci_addr,
        ret = rte_log_register_type_and_pick_level(lt_str, ll_default);
        rte_free(lt_str);
 
-       return (ret < 0) ? RTE_LOGTYPE_PMD : ret;
+       if (ret < 0)
+               return sfc_logtype_driver;
+
+       return ret;
 }