X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsfc%2Fsfc.c;h=8fa790da5589cb16c34d0b2888415ed28b88ced1;hb=f30e69b41f949cd4a9afb6ff39de196e661708e2;hp=615e15af647eb5ca9df265b9a41682f82bf121a0;hpb=92a15fc541fcba1848933c4ba5c6e08f6330bc13;p=dpdk.git diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c index 615e15af64..8fa790da55 100644 --- 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 / @@ -436,7 +441,20 @@ sfc_start(struct sfc_adapter *sa) sa->state = SFC_ADAPTER_STARTING; + rc = 0; do { + /* + * FIXME Try to recreate vSwitch on start retry. + * vSwitch is absent after MC reboot like events and + * we should recreate it. May be we need proper + * indication instead of guessing. + */ + if (rc != 0) { + sfc_sriov_vswitch_destroy(sa); + rc = sfc_sriov_vswitch_create(sa); + if (rc != 0) + goto fail_sriov_vswitch_create; + } rc = sfc_try_start(sa); } while ((--start_tries > 0) && (rc == EIO || rc == EAGAIN || rc == ENOENT || rc == EINVAL)); @@ -449,6 +467,7 @@ sfc_start(struct sfc_adapter *sa) return 0; fail_try_start: +fail_sriov_vswitch_create: sa->state = SFC_ADAPTER_CONFIGURED; fail_bad_state: sfc_log_init(sa, "failed %d", rc); @@ -612,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; } @@ -728,6 +774,10 @@ sfc_attach(struct sfc_adapter *sa) if (rc != 0) goto fail_nic_reset; + rc = sfc_sriov_attach(sa); + if (rc != 0) + goto fail_sriov_attach; + /* * Probed NIC is sufficient for tunnel init. * Initialize tunnel support to be able to use libefx @@ -748,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"); } @@ -757,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"); } @@ -810,11 +862,24 @@ sfc_attach(struct sfc_adapter *sa) sfc_flow_init(sa); + /* + * Create vSwitch to be able to use VFs when PF is not started yet + * as DPDK port. VFs should be able to talk to each other even + * if PF is down. + */ + rc = sfc_sriov_vswitch_create(sa); + if (rc != 0) + goto fail_sriov_vswitch_create; + sa->state = SFC_ADAPTER_INITIALIZED; sfc_log_init(sa, "done"); return 0; +fail_sriov_vswitch_create: + sfc_flow_fini(sa); + sfc_filter_detach(sa); + fail_filter_attach: sfc_rss_detach(sa); @@ -833,7 +898,9 @@ fail_intr_attach: fail_estimate_rsrc_limits: fail_tunnel_init: efx_tunnel_fini(sa->nic); + sfc_sriov_detach(sa); +fail_sriov_attach: fail_nic_reset: sfc_log_init(sa, "failed %d", rc); @@ -847,6 +914,8 @@ sfc_detach(struct sfc_adapter *sa) SFC_ASSERT(sfc_adapter_is_locked(sa)); + sfc_sriov_vswitch_destroy(sa); + sfc_flow_fini(sa); sfc_filter_detach(sa); @@ -855,6 +924,7 @@ sfc_detach(struct sfc_adapter *sa) sfc_ev_detach(sa); sfc_intr_detach(sa); efx_tunnel_fini(sa->nic); + sfc_sriov_detach(sa); sa->state = SFC_ADAPTER_UNINITIALIZED; } @@ -1017,11 +1087,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; @@ -1033,21 +1135,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;