X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsfc%2Fsfc.c;h=ed714fe02f3d7fca0e0c7de5af50e337bdf7a1ba;hb=4c6005999e41d71fb449652ee7f1ff4924e0affe;hp=591b8971b33726e2982b6b69d7f47a5bf4351b7c;hpb=52e80b1b64bdd28e88bbad98cfae96d7345f4da0;p=dpdk.git diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c index 591b8971b3..ed714fe02f 100644 --- a/drivers/net/sfc/sfc.c +++ b/drivers/net/sfc/sfc.c @@ -25,7 +25,8 @@ #include "sfc_kvargs.h" #include "sfc_tweak.h" #include "sfc_sw_stats.h" - +#include "sfc_switch.h" +#include "sfc_nic_dma.h" bool sfc_repr_supported(const struct sfc_adapter *sa) @@ -46,11 +47,19 @@ sfc_repr_supported(const struct sfc_adapter *sa) return true; } +bool +sfc_repr_available(const struct sfc_adapter_shared *sas) +{ + return sas->nb_repr_rxq > 0 && sas->nb_repr_txq > 0; +} + int -sfc_dma_alloc(const struct sfc_adapter *sa, const char *name, uint16_t id, - size_t len, int socket_id, efsys_mem_t *esmp) +sfc_dma_alloc(struct sfc_adapter *sa, const char *name, uint16_t id, + efx_nic_dma_addr_type_t addr_type, size_t len, int socket_id, + efsys_mem_t *esmp) { const struct rte_memzone *mz; + int rc; sfc_log_init(sa, "name=%s id=%u len=%zu socket_id=%d", name, id, len, socket_id); @@ -63,13 +72,17 @@ sfc_dma_alloc(const struct sfc_adapter *sa, const char *name, uint16_t id, rte_strerror(rte_errno)); return ENOMEM; } - - esmp->esm_addr = mz->iova; - if (esmp->esm_addr == RTE_BAD_IOVA) { + if (mz->iova == RTE_BAD_IOVA) { (void)rte_memzone_free(mz); return EFAULT; } + rc = sfc_nic_dma_mz_map(sa, mz, addr_type, &esmp->esm_addr); + if (rc != 0) { + (void)rte_memzone_free(mz); + return rc; + } + esmp->esm_mz = mz; esmp->esm_base = mz->addr; @@ -100,13 +113,13 @@ sfc_phy_cap_from_link_speeds(uint32_t speeds) { uint32_t phy_caps = 0; - if (~speeds & ETH_LINK_SPEED_FIXED) { + if (~speeds & RTE_ETH_LINK_SPEED_FIXED) { phy_caps |= (1 << EFX_PHY_CAP_AN); /* * If no speeds are specified in the mask, any supported * may be negotiated */ - if (speeds == ETH_LINK_SPEED_AUTONEG) + if (speeds == RTE_ETH_LINK_SPEED_AUTONEG) phy_caps |= (1 << EFX_PHY_CAP_1000FDX) | (1 << EFX_PHY_CAP_10000FDX) | @@ -115,17 +128,17 @@ sfc_phy_cap_from_link_speeds(uint32_t speeds) (1 << EFX_PHY_CAP_50000FDX) | (1 << EFX_PHY_CAP_100000FDX); } - if (speeds & ETH_LINK_SPEED_1G) + if (speeds & RTE_ETH_LINK_SPEED_1G) phy_caps |= (1 << EFX_PHY_CAP_1000FDX); - if (speeds & ETH_LINK_SPEED_10G) + if (speeds & RTE_ETH_LINK_SPEED_10G) phy_caps |= (1 << EFX_PHY_CAP_10000FDX); - if (speeds & ETH_LINK_SPEED_25G) + if (speeds & RTE_ETH_LINK_SPEED_25G) phy_caps |= (1 << EFX_PHY_CAP_25000FDX); - if (speeds & ETH_LINK_SPEED_40G) + if (speeds & RTE_ETH_LINK_SPEED_40G) phy_caps |= (1 << EFX_PHY_CAP_40000FDX); - if (speeds & ETH_LINK_SPEED_50G) + if (speeds & RTE_ETH_LINK_SPEED_50G) phy_caps |= (1 << EFX_PHY_CAP_50000FDX); - if (speeds & ETH_LINK_SPEED_100G) + if (speeds & RTE_ETH_LINK_SPEED_100G) phy_caps |= (1 << EFX_PHY_CAP_100000FDX); return phy_caps; @@ -296,6 +309,41 @@ sfc_estimate_resource_limits(struct sfc_adapter *sa) sas->counters_rxq_allocated = false; } + if (sfc_repr_supported(sa) && + evq_allocated >= SFC_REPR_PROXY_NB_RXQ_MIN + + SFC_REPR_PROXY_NB_TXQ_MIN && + rxq_allocated >= SFC_REPR_PROXY_NB_RXQ_MIN && + txq_allocated >= SFC_REPR_PROXY_NB_TXQ_MIN) { + unsigned int extra; + + txq_allocated -= SFC_REPR_PROXY_NB_TXQ_MIN; + rxq_allocated -= SFC_REPR_PROXY_NB_RXQ_MIN; + evq_allocated -= SFC_REPR_PROXY_NB_RXQ_MIN + + SFC_REPR_PROXY_NB_TXQ_MIN; + + sas->nb_repr_rxq = SFC_REPR_PROXY_NB_RXQ_MIN; + sas->nb_repr_txq = SFC_REPR_PROXY_NB_TXQ_MIN; + + /* Allocate extra representor RxQs up to the maximum */ + extra = MIN(evq_allocated, rxq_allocated); + extra = MIN(extra, + SFC_REPR_PROXY_NB_RXQ_MAX - sas->nb_repr_rxq); + evq_allocated -= extra; + rxq_allocated -= extra; + sas->nb_repr_rxq += extra; + + /* Allocate extra representor TxQs up to the maximum */ + extra = MIN(evq_allocated, txq_allocated); + extra = MIN(extra, + SFC_REPR_PROXY_NB_TXQ_MAX - sas->nb_repr_txq); + evq_allocated -= extra; + txq_allocated -= extra; + sas->nb_repr_txq += extra; + } else { + sas->nb_repr_rxq = 0; + sas->nb_repr_txq = 0; + } + /* Add remaining allocated queues */ sa->rxq_max += MIN(rxq_allocated, evq_allocated / 2); sa->txq_max += MIN(txq_allocated, evq_allocated - sa->rxq_max); @@ -313,8 +361,10 @@ fail_nic_init: static int sfc_set_drv_limits(struct sfc_adapter *sa) { + struct sfc_adapter_shared *sas = sfc_sa2shared(sa); const struct rte_eth_dev_data *data = sa->eth_dev->data; - uint32_t rxq_reserved = sfc_nb_reserved_rxq(sfc_sa2shared(sa)); + uint32_t rxq_reserved = sfc_nb_reserved_rxq(sas); + uint32_t txq_reserved = sfc_nb_txq_reserved(sas); efx_drv_limits_t lim; memset(&lim, 0, sizeof(lim)); @@ -325,10 +375,12 @@ sfc_set_drv_limits(struct sfc_adapter *sa) * sfc_estimate_resource_limits(). */ lim.edl_min_evq_count = lim.edl_max_evq_count = - 1 + data->nb_rx_queues + data->nb_tx_queues + rxq_reserved; + 1 + data->nb_rx_queues + data->nb_tx_queues + + rxq_reserved + txq_reserved; lim.edl_min_rxq_count = lim.edl_max_rxq_count = data->nb_rx_queues + rxq_reserved; - lim.edl_min_txq_count = lim.edl_max_txq_count = data->nb_tx_queues; + lim.edl_min_txq_count = lim.edl_max_txq_count = + data->nb_tx_queues + txq_reserved; return efx_nic_set_drv_limits(sa->nic, &lim); } @@ -356,10 +408,10 @@ sfc_set_fw_subvariant(struct sfc_adapter *sa) tx_offloads |= txq_info->offloads; } - if (tx_offloads & (DEV_TX_OFFLOAD_IPV4_CKSUM | - DEV_TX_OFFLOAD_TCP_CKSUM | - DEV_TX_OFFLOAD_UDP_CKSUM | - DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM)) + if (tx_offloads & (RTE_ETH_TX_OFFLOAD_IPV4_CKSUM | + RTE_ETH_TX_OFFLOAD_TCP_CKSUM | + RTE_ETH_TX_OFFLOAD_UDP_CKSUM | + RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM)) req_fw_subvariant = EFX_NIC_FW_SUBVARIANT_DEFAULT; else req_fw_subvariant = EFX_NIC_FW_SUBVARIANT_NO_TX_CSUM; @@ -395,7 +447,7 @@ sfc_try_start(struct sfc_adapter *sa) sfc_log_init(sa, "entry"); SFC_ASSERT(sfc_adapter_is_locked(sa)); - SFC_ASSERT(sa->state == SFC_ADAPTER_STARTING); + SFC_ASSERT(sa->state == SFC_ETHDEV_STARTING); sfc_log_init(sa, "set FW subvariant"); rc = sfc_set_fw_subvariant(sa); @@ -412,6 +464,13 @@ sfc_try_start(struct sfc_adapter *sa) if (rc != 0) goto fail_nic_init; + sfc_log_init(sa, "reconfigure NIC DMA"); + rc = efx_nic_dma_reconfigure(sa->nic); + if (rc != 0) { + sfc_err(sa, "cannot reconfigure NIC DMA: %s", rte_strerror(rc)); + goto fail_nic_dma_reconfigure; + } + encp = efx_nic_cfg_get(sa->nic); /* @@ -480,6 +539,7 @@ fail_ev_start: fail_intr_start: fail_tunnel_reconfigure: +fail_nic_dma_reconfigure: efx_nic_fini(sa->nic); fail_nic_init: @@ -500,9 +560,9 @@ sfc_start(struct sfc_adapter *sa) SFC_ASSERT(sfc_adapter_is_locked(sa)); switch (sa->state) { - case SFC_ADAPTER_CONFIGURED: + case SFC_ETHDEV_CONFIGURED: break; - case SFC_ADAPTER_STARTED: + case SFC_ETHDEV_STARTED: sfc_notice(sa, "already started"); return 0; default: @@ -510,7 +570,7 @@ sfc_start(struct sfc_adapter *sa) goto fail_bad_state; } - sa->state = SFC_ADAPTER_STARTING; + sa->state = SFC_ETHDEV_STARTING; rc = 0; do { @@ -533,13 +593,13 @@ sfc_start(struct sfc_adapter *sa) if (rc != 0) goto fail_try_start; - sa->state = SFC_ADAPTER_STARTED; + sa->state = SFC_ETHDEV_STARTED; sfc_log_init(sa, "done"); return 0; fail_try_start: fail_sriov_vswitch_create: - sa->state = SFC_ADAPTER_CONFIGURED; + sa->state = SFC_ETHDEV_CONFIGURED; fail_bad_state: sfc_log_init(sa, "failed %d", rc); return rc; @@ -553,9 +613,9 @@ sfc_stop(struct sfc_adapter *sa) SFC_ASSERT(sfc_adapter_is_locked(sa)); switch (sa->state) { - case SFC_ADAPTER_STARTED: + case SFC_ETHDEV_STARTED: break; - case SFC_ADAPTER_CONFIGURED: + case SFC_ETHDEV_CONFIGURED: sfc_notice(sa, "already stopped"); return; default: @@ -564,7 +624,7 @@ sfc_stop(struct sfc_adapter *sa) return; } - sa->state = SFC_ADAPTER_STOPPING; + sa->state = SFC_ETHDEV_STOPPING; sfc_repr_proxy_stop(sa); sfc_flow_stop(sa); @@ -575,7 +635,7 @@ sfc_stop(struct sfc_adapter *sa) sfc_intr_stop(sa); efx_nic_fini(sa->nic); - sa->state = SFC_ADAPTER_CONFIGURED; + sa->state = SFC_ETHDEV_CONFIGURED; sfc_log_init(sa, "done"); } @@ -586,7 +646,7 @@ sfc_restart(struct sfc_adapter *sa) SFC_ASSERT(sfc_adapter_is_locked(sa)); - if (sa->state != SFC_ADAPTER_STARTED) + if (sa->state != SFC_ETHDEV_STARTED) return EINVAL; sfc_stop(sa); @@ -607,7 +667,7 @@ sfc_restart_if_required(void *arg) if (rte_atomic32_cmpset((volatile uint32_t *)&sa->restart_required, 1, 0)) { sfc_adapter_lock(sa); - if (sa->state == SFC_ADAPTER_STARTED) + if (sa->state == SFC_ETHDEV_STARTED) (void)sfc_restart(sa); sfc_adapter_unlock(sa); } @@ -640,9 +700,9 @@ sfc_configure(struct sfc_adapter *sa) SFC_ASSERT(sfc_adapter_is_locked(sa)); - SFC_ASSERT(sa->state == SFC_ADAPTER_INITIALIZED || - sa->state == SFC_ADAPTER_CONFIGURED); - sa->state = SFC_ADAPTER_CONFIGURING; + SFC_ASSERT(sa->state == SFC_ETHDEV_INITIALIZED || + sa->state == SFC_ETHDEV_CONFIGURED); + sa->state = SFC_ETHDEV_CONFIGURING; rc = sfc_check_conf(sa); if (rc != 0) @@ -668,7 +728,7 @@ sfc_configure(struct sfc_adapter *sa) if (rc != 0) goto fail_sw_xstats_configure; - sa->state = SFC_ADAPTER_CONFIGURED; + sa->state = SFC_ETHDEV_CONFIGURED; sfc_log_init(sa, "done"); return 0; @@ -686,7 +746,7 @@ fail_port_configure: fail_intr_configure: fail_check_conf: - sa->state = SFC_ADAPTER_INITIALIZED; + sa->state = SFC_ETHDEV_INITIALIZED; sfc_log_init(sa, "failed %d", rc); return rc; } @@ -698,8 +758,8 @@ sfc_close(struct sfc_adapter *sa) SFC_ASSERT(sfc_adapter_is_locked(sa)); - SFC_ASSERT(sa->state == SFC_ADAPTER_CONFIGURED); - sa->state = SFC_ADAPTER_CLOSING; + SFC_ASSERT(sa->state == SFC_ETHDEV_CONFIGURED); + sa->state = SFC_ETHDEV_CLOSING; sfc_sw_xstats_close(sa); sfc_tx_close(sa); @@ -707,7 +767,7 @@ sfc_close(struct sfc_adapter *sa) sfc_port_close(sa); sfc_intr_close(sa); - sa->state = SFC_ADAPTER_INITIALIZED; + sa->state = SFC_ETHDEV_INITIALIZED; sfc_log_init(sa, "done"); } @@ -854,7 +914,7 @@ sfc_attach(struct sfc_adapter *sa) sa->priv.shared->tunnel_encaps = encp->enc_tunnel_encapsulations_supported; - if (sfc_dp_tx_offload_capa(sa->priv.dp_tx) & DEV_TX_OFFLOAD_TCP_TSO) { + if (sfc_dp_tx_offload_capa(sa->priv.dp_tx) & RTE_ETH_TX_OFFLOAD_TCP_TSO) { sa->tso = encp->enc_fw_assisted_tso_v2_enabled || encp->enc_tso_v3_enabled; if (!sa->tso) @@ -863,8 +923,8 @@ sfc_attach(struct sfc_adapter *sa) 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) { + (RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO | + RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO)) != 0) { sa->tso_encap = encp->enc_fw_assisted_tso_v2_encap_enabled || encp->enc_tso_v3_enabled; if (!sa->tso_encap) @@ -948,7 +1008,7 @@ sfc_attach(struct sfc_adapter *sa) if (rc != 0) goto fail_sriov_vswitch_create; - sa->state = SFC_ADAPTER_INITIALIZED; + sa->state = SFC_ETHDEV_INITIALIZED; sfc_log_init(sa, "done"); return 0; @@ -999,6 +1059,18 @@ fail_nic_reset: return rc; } +void +sfc_pre_detach(struct sfc_adapter *sa) +{ + sfc_log_init(sa, "entry"); + + SFC_ASSERT(!sfc_adapter_is_locked(sa)); + + sfc_repr_proxy_pre_detach(sa); + + sfc_log_init(sa, "done"); +} + void sfc_detach(struct sfc_adapter *sa) { @@ -1022,7 +1094,7 @@ sfc_detach(struct sfc_adapter *sa) efx_tunnel_fini(sa->nic); sfc_sriov_detach(sa); - sa->state = SFC_ADAPTER_UNINITIALIZED; + sa->state = SFC_ETHDEV_UNINITIALIZED; } static int @@ -1273,6 +1345,9 @@ sfc_unprobe(struct sfc_adapter *sa) */ rte_eal_alarm_cancel(sfc_restart_if_required, sa); + sfc_mae_clear_switch_port(sa->mae.switch_domain_id, + sa->mae.switch_port_id); + sfc_log_init(sa, "destroy nic"); sa->nic = NULL; efx_nic_destroy(enp); @@ -1280,7 +1355,7 @@ sfc_unprobe(struct sfc_adapter *sa) sfc_mem_bar_fini(sa); sfc_flow_fini(sa); - sa->state = SFC_ADAPTER_UNINITIALIZED; + sa->state = SFC_ETHDEV_UNINITIALIZED; } uint32_t