net/sfc/base: support choosing firmware variant
[dpdk.git] / drivers / net / sfc / sfc.c
index 4245fb8..2a326fc 100644 (file)
@@ -1,36 +1,17 @@
-/*-
- * Copyright (c) 2016 Solarflare Communications Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 2016-2018 Solarflare Communications Inc.
  * All rights reserved.
  *
  * This software was jointly developed between OKTET Labs (under contract
  * for Solarflare) and Solarflare Communications, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /* sysconf() */
 #include <unistd.h>
 
 #include <rte_errno.h>
+#include <rte_alarm.h>
 
 #include "efx.h"
 
@@ -38,6 +19,7 @@
 #include "sfc_log.h"
 #include "sfc_ev.h"
 #include "sfc_rx.h"
+#include "sfc_tx.h"
 
 
 int
@@ -58,8 +40,8 @@ sfc_dma_alloc(const struct sfc_adapter *sa, const char *name, uint16_t id,
                return ENOMEM;
        }
 
-       esmp->esm_addr = rte_mem_phy2mch(mz->memseg_id, mz->phys_addr);
-       if (esmp->esm_addr == RTE_BAD_PHYS_ADDR) {
+       esmp->esm_addr = mz->iova;
+       if (esmp->esm_addr == RTE_BAD_IOVA) {
                (void)rte_memzone_free(mz);
                return EFAULT;
        }
@@ -84,6 +66,33 @@ sfc_dma_free(const struct sfc_adapter *sa, efsys_mem_t *esmp)
        memset(esmp, 0, sizeof(*esmp));
 }
 
+static uint32_t
+sfc_phy_cap_from_link_speeds(uint32_t speeds)
+{
+       uint32_t phy_caps = 0;
+
+       if (~speeds & 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)
+                       phy_caps |=
+                               (1 << EFX_PHY_CAP_1000FDX) |
+                               (1 << EFX_PHY_CAP_10000FDX) |
+                               (1 << EFX_PHY_CAP_40000FDX);
+       }
+       if (speeds & ETH_LINK_SPEED_1G)
+               phy_caps |= (1 << EFX_PHY_CAP_1000FDX);
+       if (speeds & ETH_LINK_SPEED_10G)
+               phy_caps |= (1 << EFX_PHY_CAP_10000FDX);
+       if (speeds & ETH_LINK_SPEED_40G)
+               phy_caps |= (1 << EFX_PHY_CAP_40000FDX);
+
+       return phy_caps;
+}
+
 /*
  * Check requested device level configuration.
  * Receive and transmit configuration is checked in corresponding
@@ -95,8 +104,12 @@ sfc_check_conf(struct sfc_adapter *sa)
        const struct rte_eth_conf *conf = &sa->eth_dev->data->dev_conf;
        int rc = 0;
 
-       if (conf->link_speeds != ETH_LINK_SPEED_AUTONEG) {
-               sfc_err(sa, "Manual link speed/duplex choice not supported");
+       sa->port.phy_adv_cap =
+               sfc_phy_cap_from_link_speeds(conf->link_speeds) &
+               sa->port.phy_adv_cap_mask;
+       if ((sa->port.phy_adv_cap & ~(1 << EFX_PHY_CAP_AN)) == 0) {
+               sfc_err(sa, "No link speeds from mask %#x are supported",
+                       conf->link_speeds);
                rc = EINVAL;
        }
 
@@ -115,7 +128,9 @@ sfc_check_conf(struct sfc_adapter *sa)
                rc = EINVAL;
        }
 
-       if (conf->intr_conf.lsc != 0) {
+       if ((conf->intr_conf.lsc != 0) &&
+           (sa->intr.type != EFX_INTR_LINE) &&
+           (sa->intr.type != EFX_INTR_MESSAGE)) {
                sfc_err(sa, "Link status change interrupt not supported");
                rc = EINVAL;
        }
@@ -169,6 +184,13 @@ sfc_estimate_resource_limits(struct sfc_adapter *sa)
        limits.edl_max_txq_count =
                MIN(encp->enc_txq_limit,
                    limits.edl_max_evq_count - 1 - limits.edl_max_rxq_count);
+
+       if (sa->tso)
+               limits.edl_max_txq_count =
+                       MIN(limits.edl_max_txq_count,
+                           encp->enc_fw_assisted_tso_v2_n_contexts /
+                           encp->enc_hw_pf_count);
+
        SFC_ASSERT(limits.edl_max_txq_count >= limits.edl_min_rxq_count);
 
        /* Configure the minimum required resources needed for the
@@ -227,27 +249,16 @@ sfc_set_drv_limits(struct sfc_adapter *sa)
        return efx_nic_set_drv_limits(sa->nic, &lim);
 }
 
-int
-sfc_start(struct sfc_adapter *sa)
+static int
+sfc_try_start(struct sfc_adapter *sa)
 {
+       const efx_nic_cfg_t *encp;
        int rc;
 
        sfc_log_init(sa, "entry");
 
        SFC_ASSERT(sfc_adapter_is_locked(sa));
-
-       switch (sa->state) {
-       case SFC_ADAPTER_CONFIGURED:
-               break;
-       case SFC_ADAPTER_STARTED:
-               sfc_info(sa, "already started");
-               return 0;
-       default:
-               rc = EINVAL;
-               goto fail_bad_state;
-       }
-
-       sa->state = SFC_ADAPTER_STARTING;
+       SFC_ASSERT(sa->state == SFC_ADAPTER_STARTING);
 
        sfc_log_init(sa, "set resource limits");
        rc = sfc_set_drv_limits(sa);
@@ -259,6 +270,14 @@ sfc_start(struct sfc_adapter *sa)
        if (rc != 0)
                goto fail_nic_init;
 
+       encp = efx_nic_cfg_get(sa->nic);
+       if (encp->enc_tunnel_encapsulations_supported != 0) {
+               sfc_log_init(sa, "apply tunnel config");
+               rc = efx_tunnel_reconfigure(sa->nic);
+               if (rc != 0)
+                       goto fail_tunnel_reconfigure;
+       }
+
        rc = sfc_intr_start(sa);
        if (rc != 0)
                goto fail_intr_start;
@@ -275,10 +294,23 @@ sfc_start(struct sfc_adapter *sa)
        if (rc != 0)
                goto fail_rx_start;
 
-       sa->state = SFC_ADAPTER_STARTED;
+       rc = sfc_tx_start(sa);
+       if (rc != 0)
+               goto fail_tx_start;
+
+       rc = sfc_flow_start(sa);
+       if (rc != 0)
+               goto fail_flows_insert;
+
        sfc_log_init(sa, "done");
        return 0;
 
+fail_flows_insert:
+       sfc_tx_stop(sa);
+
+fail_tx_start:
+       sfc_rx_stop(sa);
+
 fail_rx_start:
        sfc_port_stop(sa);
 
@@ -289,10 +321,51 @@ fail_ev_start:
        sfc_intr_stop(sa);
 
 fail_intr_start:
+fail_tunnel_reconfigure:
        efx_nic_fini(sa->nic);
 
 fail_nic_init:
 fail_set_drv_limits:
+       sfc_log_init(sa, "failed %d", rc);
+       return rc;
+}
+
+int
+sfc_start(struct sfc_adapter *sa)
+{
+       unsigned int start_tries = 3;
+       int rc;
+
+       sfc_log_init(sa, "entry");
+
+       SFC_ASSERT(sfc_adapter_is_locked(sa));
+
+       switch (sa->state) {
+       case SFC_ADAPTER_CONFIGURED:
+               break;
+       case SFC_ADAPTER_STARTED:
+               sfc_notice(sa, "already started");
+               return 0;
+       default:
+               rc = EINVAL;
+               goto fail_bad_state;
+       }
+
+       sa->state = SFC_ADAPTER_STARTING;
+
+       do {
+               rc = sfc_try_start(sa);
+       } while ((--start_tries > 0) &&
+                (rc == EIO || rc == EAGAIN || rc == ENOENT || rc == EINVAL));
+
+       if (rc != 0)
+               goto fail_try_start;
+
+       sa->state = SFC_ADAPTER_STARTED;
+       sfc_log_init(sa, "done");
+       return 0;
+
+fail_try_start:
        sa->state = SFC_ADAPTER_CONFIGURED;
 fail_bad_state:
        sfc_log_init(sa, "failed %d", rc);
@@ -310,7 +383,7 @@ sfc_stop(struct sfc_adapter *sa)
        case SFC_ADAPTER_STARTED:
                break;
        case SFC_ADAPTER_CONFIGURED:
-               sfc_info(sa, "already stopped");
+               sfc_notice(sa, "already stopped");
                return;
        default:
                sfc_err(sa, "stop in unexpected state %u", sa->state);
@@ -320,6 +393,8 @@ sfc_stop(struct sfc_adapter *sa)
 
        sa->state = SFC_ADAPTER_STOPPING;
 
+       sfc_flow_stop(sa);
+       sfc_tx_stop(sa);
        sfc_rx_stop(sa);
        sfc_port_stop(sa);
        sfc_ev_stop(sa);
@@ -330,6 +405,58 @@ sfc_stop(struct sfc_adapter *sa)
        sfc_log_init(sa, "done");
 }
 
+static int
+sfc_restart(struct sfc_adapter *sa)
+{
+       int rc;
+
+       SFC_ASSERT(sfc_adapter_is_locked(sa));
+
+       if (sa->state != SFC_ADAPTER_STARTED)
+               return EINVAL;
+
+       sfc_stop(sa);
+
+       rc = sfc_start(sa);
+       if (rc != 0)
+               sfc_err(sa, "restart failed");
+
+       return rc;
+}
+
+static void
+sfc_restart_if_required(void *arg)
+{
+       struct sfc_adapter *sa = arg;
+
+       /* If restart is scheduled, clear the flag and do it */
+       if (rte_atomic32_cmpset((volatile uint32_t *)&sa->restart_required,
+                               1, 0)) {
+               sfc_adapter_lock(sa);
+               if (sa->state == SFC_ADAPTER_STARTED)
+                       (void)sfc_restart(sa);
+               sfc_adapter_unlock(sa);
+       }
+}
+
+void
+sfc_schedule_restart(struct sfc_adapter *sa)
+{
+       int rc;
+
+       /* Schedule restart alarm if it is not scheduled yet */
+       if (!rte_atomic32_test_and_set(&sa->restart_required))
+               return;
+
+       rc = rte_eal_alarm_set(1, sfc_restart_if_required, sa);
+       if (rc == -ENOTSUP)
+               sfc_warn(sa, "alarms are not supported, restart is pending");
+       else if (rc != 0)
+               sfc_err(sa, "cannot arm restart alarm (rc=%d)", rc);
+       else
+               sfc_notice(sa, "restart scheduled");
+}
+
 int
 sfc_configure(struct sfc_adapter *sa)
 {
@@ -339,43 +466,44 @@ sfc_configure(struct sfc_adapter *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);
+       rc = sfc_intr_configure(sa);
        if (rc != 0)
-               goto fail_intr_init;
+               goto fail_intr_configure;
 
-       rc = sfc_ev_init(sa);
+       rc = sfc_port_configure(sa);
        if (rc != 0)
-               goto fail_ev_init;
+               goto fail_port_configure;
 
-       rc = sfc_port_init(sa);
+       rc = sfc_rx_configure(sa);
        if (rc != 0)
-               goto fail_port_init;
+               goto fail_rx_configure;
 
-       rc = sfc_rx_init(sa);
+       rc = sfc_tx_configure(sa);
        if (rc != 0)
-               goto fail_rx_init;
+               goto fail_tx_configure;
 
        sa->state = SFC_ADAPTER_CONFIGURED;
        sfc_log_init(sa, "done");
        return 0;
 
-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);
@@ -392,37 +520,28 @@ sfc_close(struct sfc_adapter *sa)
        SFC_ASSERT(sa->state == SFC_ADAPTER_CONFIGURED);
        sa->state = SFC_ADAPTER_CLOSING;
 
-       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");
 }
 
 static int
-sfc_mem_bar_init(struct sfc_adapter *sa)
+sfc_mem_bar_init(struct sfc_adapter *sa, unsigned int membar)
 {
        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;
-
-       for (i = 0; i < RTE_DIM(pci_dev->mem_resource); i++) {
-               res = &pci_dev->mem_resource[i];
-               if ((res->len != 0) && (res->phys_addr != 0)) {
-                       /* Found first memory BAR */
-                       SFC_BAR_LOCK_INIT(ebp, eth_dev->data->name);
-                       ebp->esb_rid = i;
-                       ebp->esb_dev = pci_dev;
-                       ebp->esb_base = res->addr;
-                       return 0;
-               }
-       }
+       struct rte_mem_resource *res = &pci_dev->mem_resource[membar];
 
-       return EFAULT;
+       SFC_BAR_LOCK_INIT(ebp, eth_dev->data->name);
+       ebp->esb_rid = membar;
+       ebp->esb_dev = pci_dev;
+       ebp->esb_base = res->addr;
+       return 0;
 }
 
 static void
@@ -434,47 +553,87 @@ sfc_mem_bar_fini(struct sfc_adapter *sa)
        memset(ebp, 0, sizeof(*ebp));
 }
 
-int
-sfc_attach(struct sfc_adapter *sa)
+#if EFSYS_OPT_RX_SCALE
+/*
+ * A fixed RSS key which has a property of being symmetric
+ * (symmetrical flows are distributed to the same CPU)
+ * and also known to give a uniform distribution
+ * (a good distribution of traffic between different CPUs)
+ */
+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,
+       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)
 {
-       struct rte_pci_device *pci_dev = SFC_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);
+       rc = efx_intr_init(sa->nic, sa->intr.type, NULL);
        if (rc != 0)
-               goto fail_mem_bar_init;
+               goto fail_intr_init;
 
-       sfc_log_init(sa, "get family");
-       rc = efx_family(pci_dev->id.vendor_id, pci_dev->id.device_id,
-                       &sa->family);
+       rc = efx_ev_init(sa->nic);
        if (rc != 0)
-               goto fail_family;
-       sfc_log_init(sa, "family is %u", sa->family);
+               goto fail_ev_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, &sa->nic_lock, &enp);
+       rc = efx_rx_init(sa->nic);
        if (rc != 0)
-               goto fail_nic_create;
-       sa->nic = enp;
+               goto fail_rx_init;
 
-       rc = sfc_mcdi_init(sa);
+       rc = efx_rx_scale_default_support_get(sa->nic, &sa->rss_support);
        if (rc != 0)
-               goto fail_mcdi_init;
+               goto fail_scale_support_get;
 
-       sfc_log_init(sa, "probe nic");
-       rc = efx_nic_probe(enp);
+       rc = efx_rx_hash_default_support_get(sa->nic, &sa->hash_support);
        if (rc != 0)
-               goto fail_nic_probe;
+               goto fail_hash_support_get;
+
+       efx_rx_fini(sa->nic);
+       efx_ev_fini(sa->nic);
+       efx_intr_fini(sa->nic);
+
+       sa->rss_hash_types = sfc_rte_to_efx_hash_type(SFC_RSS_OFFLOADS);
+
+       rte_memcpy(sa->rss_key, default_rss_key, sizeof(sa->rss_key));
+
+       return 0;
+
+fail_hash_support_get:
+fail_scale_support_get:
+fail_rx_init:
+       efx_ev_fini(sa->nic);
+
+fail_ev_init:
+       efx_intr_fini(sa->nic);
+
+fail_intr_init:
+       return rc;
+}
+#else
+static int
+sfc_set_rss_defaults(__rte_unused struct sfc_adapter *sa)
+{
+       return 0;
+}
+#endif
+
+int
+sfc_attach(struct sfc_adapter *sa)
+{
+       const efx_nic_cfg_t *encp;
+       efx_nic_t *enp = sa->nic;
+       int rc;
+
+       sfc_log_init(sa, "entry");
+
+       SFC_ASSERT(sfc_adapter_is_locked(sa));
 
        efx_mcdi_new_epoch(enp);
 
@@ -483,28 +642,150 @@ sfc_attach(struct sfc_adapter *sa)
        if (rc != 0)
                goto fail_nic_reset;
 
+       /*
+        * Probed NIC is sufficient for tunnel init.
+        * Initialize tunnel support to be able to use libefx
+        * efx_tunnel_config_udp_{add,remove}() in any state and
+        * efx_tunnel_reconfigure() on start up.
+        */
+       rc = efx_tunnel_init(enp);
+       if (rc != 0)
+               goto fail_tunnel_init;
+
+       encp = efx_nic_cfg_get(sa->nic);
+
+       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_estimate_rsrc_limits;
 
+       sa->txq_max_entries = encp->enc_txq_max_ndescs;
+       SFC_ASSERT(rte_is_power_of_2(sa->txq_max_entries));
+
        rc = sfc_intr_attach(sa);
        if (rc != 0)
                goto fail_intr_attach;
 
+       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:
+       efx_nic_fini(sa->nic);
+
 fail_estimate_rsrc_limits:
+fail_tunnel_init:
+       efx_tunnel_fini(sa->nic);
+
 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);
+       efx_tunnel_fini(sa->nic);
+
+       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);
+       unsigned int membar;
+       efx_nic_t *enp;
+       int rc;
+
+       sfc_log_init(sa, "entry");
+
+       SFC_ASSERT(sfc_adapter_is_locked(sa));
+
+       sa->socket_id = rte_socket_id();
+       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);
+       if (rc != 0)
+               goto fail_family;
+       sfc_log_init(sa, "family is %u, membar is %u", sa->family, membar);
+
+       sfc_log_init(sa, "init mem bar");
+       rc = sfc_mem_bar_init(sa, membar);
+       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, &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, EFX_FW_VARIANT_DONT_CARE);
+       if (rc != 0)
+               goto fail_nic_probe;
+
+       sfc_log_init(sa, "done");
+       return 0;
 
 fail_nic_probe:
        sfc_mcdi_fini(sa);
@@ -515,16 +796,16 @@ fail_mcdi_init:
        efx_nic_destroy(enp);
 
 fail_nic_create:
-fail_family:
        sfc_mem_bar_fini(sa);
 
 fail_mem_bar_init:
+fail_family:
        sfc_log_init(sa, "failed %d", rc);
        return rc;
 }
 
 void
-sfc_detach(struct sfc_adapter *sa)
+sfc_unprobe(struct sfc_adapter *sa)
 {
        efx_nic_t *enp = sa->nic;
 
@@ -532,18 +813,57 @@ sfc_detach(struct sfc_adapter *sa)
 
        SFC_ASSERT(sfc_adapter_is_locked(sa));
 
-       sfc_intr_detach(sa);
-
        sfc_log_init(sa, "unprobe nic");
        efx_nic_unprobe(enp);
 
        sfc_mcdi_fini(sa);
 
+       /*
+        * Make sure there is no pending alarm to restart since we are
+        * going to free device private which is passed as the callback
+        * opaque data. A new alarm cannot be scheduled since MCDI is
+        * shut down.
+        */
+       rte_eal_alarm_cancel(sfc_restart_if_required, sa);
+
        sfc_log_init(sa, "destroy nic");
        sa->nic = NULL;
        efx_nic_destroy(enp);
 
        sfc_mem_bar_fini(sa);
 
+       sfc_flow_fini(sa);
        sa->state = SFC_ADAPTER_UNINITIALIZED;
 }
+
+uint32_t
+sfc_register_logtype(struct sfc_adapter *sa, const char *lt_prefix_str,
+                    uint32_t ll_default)
+{
+       size_t lt_prefix_str_size = strlen(lt_prefix_str);
+       size_t lt_str_size_max;
+       char *lt_str = NULL;
+       int ret;
+
+       if (SIZE_MAX - PCI_PRI_STR_SIZE - 1 > lt_prefix_str_size) {
+               ++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;
+       }
+
+       lt_str = rte_zmalloc("logtype_str", lt_str_size_max, 0);
+       if (lt_str == NULL)
+               return RTE_LOGTYPE_PMD;
+
+       strncpy(lt_str, lt_prefix_str, lt_prefix_str_size);
+       lt_str[lt_prefix_str_size - 1] = '.';
+       rte_pci_device_name(&sa->pci_addr, lt_str + lt_prefix_str_size,
+                           lt_str_size_max - lt_prefix_str_size);
+       lt_str[lt_str_size_max - 1] = '\0';
+
+       ret = rte_log_register_type_and_pick_level(lt_str, ll_default);
+       rte_free(lt_str);
+
+       return (ret < 0) ? RTE_LOGTYPE_PMD : ret;
+}