/*-
- * Copyright (c) 2016 Solarflare Communications Inc.
+ * BSD LICENSE
+ *
+ * Copyright (c) 2016-2017 Solarflare Communications Inc.
* All rights reserved.
*
* This software was jointly developed between OKTET Labs (under contract
return ENOMEM;
}
- esmp->esm_addr = rte_mem_phy2mch(mz->memseg_id, mz->phys_addr);
+ esmp->esm_addr = mz->phys_addr;
if (esmp->esm_addr == RTE_BAD_PHYS_ADDR) {
(void)rte_memzone_free(mz);
return EFAULT;
if (rc != 0)
goto fail_tx_start;
+ rc = sfc_flow_start(sa);
+ if (rc != 0)
+ goto fail_flows_insert;
+
sa->state = SFC_ADAPTER_STARTED;
sfc_log_init(sa, "done");
return 0;
+fail_flows_insert:
+ sfc_tx_stop(sa);
+
fail_tx_start:
sfc_rx_stop(sa);
sa->state = SFC_ADAPTER_STOPPING;
+ sfc_flow_stop(sa);
sfc_tx_stop(sa);
sfc_rx_stop(sa);
sfc_port_stop(sa);
SFC_ASSERT(sfc_adapter_is_locked(sa));
- SFC_ASSERT(sa->state == SFC_ADAPTER_INITIALIZED);
+ SFC_ASSERT(sa->state == SFC_ADAPTER_INITIALIZED ||
+ sa->state == SFC_ADAPTER_CONFIGURED);
sa->state = SFC_ADAPTER_CONFIGURING;
rc = sfc_check_conf(sa);
if (rc != 0)
goto fail_check_conf;
- rc = sfc_intr_init(sa);
- if (rc != 0)
- goto fail_intr_init;
-
- rc = sfc_ev_init(sa);
+ rc = sfc_intr_configure(sa);
if (rc != 0)
- goto fail_ev_init;
+ goto fail_intr_configure;
- rc = sfc_port_init(sa);
+ rc = sfc_port_configure(sa);
if (rc != 0)
- goto fail_port_init;
+ goto fail_port_configure;
- rc = sfc_rx_init(sa);
+ rc = sfc_rx_configure(sa);
if (rc != 0)
- goto fail_rx_init;
+ goto fail_rx_configure;
- rc = sfc_tx_init(sa);
+ rc = sfc_tx_configure(sa);
if (rc != 0)
- goto fail_tx_init;
+ goto fail_tx_configure;
sa->state = SFC_ADAPTER_CONFIGURED;
sfc_log_init(sa, "done");
return 0;
-fail_tx_init:
- sfc_rx_fini(sa);
-
-fail_rx_init:
- sfc_port_fini(sa);
+fail_tx_configure:
+ sfc_rx_close(sa);
-fail_port_init:
- sfc_ev_fini(sa);
+fail_rx_configure:
+ sfc_port_close(sa);
-fail_ev_init:
- sfc_intr_fini(sa);
+fail_port_configure:
+ sfc_intr_close(sa);
-fail_intr_init:
+fail_intr_configure:
fail_check_conf:
sa->state = SFC_ADAPTER_INITIALIZED;
sfc_log_init(sa, "failed %d", rc);
SFC_ASSERT(sa->state == SFC_ADAPTER_CONFIGURED);
sa->state = SFC_ADAPTER_CLOSING;
- sfc_tx_fini(sa);
- sfc_rx_fini(sa);
- sfc_port_fini(sa);
- sfc_ev_fini(sa);
- sfc_intr_fini(sa);
+ sfc_tx_close(sa);
+ sfc_rx_close(sa);
+ sfc_port_close(sa);
+ sfc_intr_close(sa);
sa->state = SFC_ADAPTER_INITIALIZED;
sfc_log_init(sa, "done");
sfc_mem_bar_init(struct sfc_adapter *sa)
{
struct rte_eth_dev *eth_dev = sa->eth_dev;
- struct rte_pci_device *pci_dev = SFC_DEV_TO_PCI(eth_dev);
+ struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
efsys_bar_t *ebp = &sa->mem_bar;
unsigned int i;
struct rte_mem_resource *res;
* and also known to give a uniform distribution
* (a good distribution of traffic between different CPUs)
*/
-static const uint8_t default_rss_key[SFC_RSS_KEY_SIZE] = {
+static const uint8_t default_rss_key[EFX_RSS_KEY_SIZE] = {
0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a,
0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a,
0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a,
};
#endif
+#if EFSYS_OPT_RX_SCALE
static int
sfc_set_rss_defaults(struct sfc_adapter *sa)
{
-#if EFSYS_OPT_RX_SCALE
int rc;
rc = efx_intr_init(sa->nic, sa->intr.type, NULL);
if (rc != 0)
goto fail_rx_init;
- rc = efx_rx_scale_support_get(sa->nic, &sa->rss_support);
+ rc = efx_rx_scale_default_support_get(sa->nic, &sa->rss_support);
if (rc != 0)
goto fail_scale_support_get;
- rc = efx_rx_hash_support_get(sa->nic, &sa->hash_support);
+ rc = efx_rx_hash_default_support_get(sa->nic, &sa->hash_support);
if (rc != 0)
goto fail_hash_support_get;
fail_intr_init:
return rc;
+}
#else
+static int
+sfc_set_rss_defaults(__rte_unused struct sfc_adapter *sa)
+{
return 0;
-#endif
}
+#endif
int
sfc_attach(struct sfc_adapter *sa)
{
- struct rte_pci_device *pci_dev = SFC_DEV_TO_PCI(sa->eth_dev);
const efx_nic_cfg_t *encp;
- efx_nic_t *enp;
+ efx_nic_t *enp = sa->nic;
int rc;
sfc_log_init(sa, "entry");
SFC_ASSERT(sfc_adapter_is_locked(sa));
- sa->socket_id = rte_socket_id();
-
- sfc_log_init(sa, "init mem bar");
- rc = sfc_mem_bar_init(sa);
- if (rc != 0)
- goto fail_mem_bar_init;
-
- sfc_log_init(sa, "get family");
- rc = efx_family(pci_dev->id.vendor_id, pci_dev->id.device_id,
- &sa->family);
- if (rc != 0)
- goto fail_family;
- sfc_log_init(sa, "family is %u", sa->family);
-
- 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, &sa->nic_lock, &enp);
- if (rc != 0)
- goto fail_nic_create;
- sa->nic = enp;
-
- rc = sfc_mcdi_init(sa);
- if (rc != 0)
- goto fail_mcdi_init;
-
- sfc_log_init(sa, "probe nic");
- rc = efx_nic_probe(enp);
- if (rc != 0)
- goto fail_nic_probe;
-
efx_mcdi_new_epoch(enp);
sfc_log_init(sa, "reset nic");
encp = efx_nic_cfg_get(sa->nic);
- sa->tso = encp->enc_fw_assisted_tso_v2_enabled;
- if (!sa->tso)
- sfc_warn(sa, "TSO support isn't available on this adapter");
+ if (sa->dp_tx->features & SFC_DP_TX_FEAT_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_log_init(sa, "estimate resource limits");
rc = sfc_estimate_resource_limits(sa);
if (rc != 0)
goto fail_intr_attach;
- efx_phy_adv_cap_get(sa->nic, EFX_PHY_CAP_PERM,
- &sa->port.phy_adv_cap_mask);
+ rc = sfc_ev_attach(sa);
+ if (rc != 0)
+ goto fail_ev_attach;
+
+ rc = sfc_port_attach(sa);
+ if (rc != 0)
+ goto fail_port_attach;
rc = sfc_set_rss_defaults(sa);
if (rc != 0)
goto fail_set_rss_defaults;
+ rc = sfc_filter_attach(sa);
+ if (rc != 0)
+ goto fail_filter_attach;
+
sfc_log_init(sa, "fini nic");
efx_nic_fini(enp);
+ sfc_flow_init(sa);
+
sa->state = SFC_ADAPTER_INITIALIZED;
sfc_log_init(sa, "done");
return 0;
+fail_filter_attach:
fail_set_rss_defaults:
+ sfc_port_detach(sa);
+
+fail_port_attach:
+ sfc_ev_detach(sa);
+
+fail_ev_attach:
sfc_intr_detach(sa);
fail_intr_attach:
fail_estimate_rsrc_limits:
fail_nic_reset:
- sfc_log_init(sa, "unprobe nic");
- efx_nic_unprobe(enp);
+
+ sfc_log_init(sa, "failed %d", rc);
+ return rc;
+}
+
+void
+sfc_detach(struct sfc_adapter *sa)
+{
+ sfc_log_init(sa, "entry");
+
+ SFC_ASSERT(sfc_adapter_is_locked(sa));
+
+ sfc_flow_fini(sa);
+
+ sfc_filter_detach(sa);
+ sfc_port_detach(sa);
+ sfc_ev_detach(sa);
+ sfc_intr_detach(sa);
+
+ sa->state = SFC_ADAPTER_UNINITIALIZED;
+}
+
+int
+sfc_probe(struct sfc_adapter *sa)
+{
+ struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(sa->eth_dev);
+ efx_nic_t *enp;
+ int rc;
+
+ sfc_log_init(sa, "entry");
+
+ SFC_ASSERT(sfc_adapter_is_locked(sa));
+
+ sa->socket_id = rte_socket_id();
+
+ sfc_log_init(sa, "init mem bar");
+ rc = sfc_mem_bar_init(sa);
+ if (rc != 0)
+ goto fail_mem_bar_init;
+
+ sfc_log_init(sa, "get family");
+ rc = efx_family(pci_dev->id.vendor_id, pci_dev->id.device_id,
+ &sa->family);
+ if (rc != 0)
+ goto fail_family;
+ sfc_log_init(sa, "family is %u", sa->family);
+
+ 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, &sa->nic_lock, &enp);
+ if (rc != 0)
+ goto fail_nic_create;
+ sa->nic = enp;
+
+ rc = sfc_mcdi_init(sa);
+ if (rc != 0)
+ goto fail_mcdi_init;
+
+ sfc_log_init(sa, "probe nic");
+ rc = efx_nic_probe(enp);
+ if (rc != 0)
+ goto fail_nic_probe;
+
+ sfc_log_init(sa, "done");
+ return 0;
fail_nic_probe:
sfc_mcdi_fini(sa);
}
void
-sfc_detach(struct sfc_adapter *sa)
+sfc_unprobe(struct sfc_adapter *sa)
{
efx_nic_t *enp = sa->nic;
SFC_ASSERT(sfc_adapter_is_locked(sa));
- sfc_intr_detach(sa);
-
sfc_log_init(sa, "unprobe nic");
efx_nic_unprobe(enp);
sfc_mem_bar_fini(sa);
+ sfc_flow_fini(sa);
sa->state = SFC_ADAPTER_UNINITIALIZED;
}
git.droids-corp.org / dpdk.git / blobdiff