ethdev: return diagnostic when setting MAC address
[dpdk.git] / drivers / net / sfc / sfc_ethdev.c
index cd82b0d..47d7a86 100644 (file)
@@ -1,38 +1,17 @@
-/*-
- *   BSD LICENSE
+/* SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 2016-2017 Solarflare Communications Inc.
+ * 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.
  */
 
 #include <rte_dev.h>
-#include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
 #include <rte_ethdev_pci.h>
 #include <rte_pci.h>
+#include <rte_bus_pci.h>
 #include <rte_errno.h>
 
 #include "efx.h"
@@ -48,6 +27,8 @@
 #include "sfc_dp.h"
 #include "sfc_dp_rx.h"
 
+uint32_t sfc_logtype_driver;
+
 static struct sfc_dp_list sfc_dp_head =
        TAILQ_HEAD_INITIALIZER(sfc_dp_head);
 
@@ -104,10 +85,10 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 {
        struct sfc_adapter *sa = dev->data->dev_private;
        const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);
+       uint64_t txq_offloads_def = 0;
 
        sfc_log_init(sa, "entry");
 
-       dev_info->pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        dev_info->max_rx_pktlen = EFX_MAC_PDU_MAX;
 
        /* Autonegotiation may be disabled */
@@ -116,8 +97,14 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
                dev_info->speed_capa |= ETH_LINK_SPEED_1G;
        if (sa->port.phy_adv_cap_mask & EFX_PHY_CAP_10000FDX)
                dev_info->speed_capa |= ETH_LINK_SPEED_10G;
+       if (sa->port.phy_adv_cap_mask & EFX_PHY_CAP_25000FDX)
+               dev_info->speed_capa |= ETH_LINK_SPEED_25G;
        if (sa->port.phy_adv_cap_mask & EFX_PHY_CAP_40000FDX)
                dev_info->speed_capa |= ETH_LINK_SPEED_40G;
+       if (sa->port.phy_adv_cap_mask & EFX_PHY_CAP_50000FDX)
+               dev_info->speed_capa |= ETH_LINK_SPEED_50G;
+       if (sa->port.phy_adv_cap_mask & EFX_PHY_CAP_100000FDX)
+               dev_info->speed_capa |= ETH_LINK_SPEED_100G;
 
        dev_info->max_rx_queues = sa->rxq_max;
        dev_info->max_tx_queues = sa->txq_max;
@@ -125,22 +112,35 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        /* By default packets are dropped if no descriptors are available */
        dev_info->default_rxconf.rx_drop_en = 1;
 
-       dev_info->rx_offload_capa =
-               DEV_RX_OFFLOAD_IPV4_CKSUM |
-               DEV_RX_OFFLOAD_UDP_CKSUM |
-               DEV_RX_OFFLOAD_TCP_CKSUM;
+       dev_info->rx_queue_offload_capa = sfc_rx_get_queue_offload_caps(sa);
+
+       /*
+        * rx_offload_capa includes both device and queue offloads since
+        * the latter may be requested on a per device basis which makes
+        * sense when some offloads are needed to be set on all queues.
+        */
+       dev_info->rx_offload_capa = sfc_rx_get_dev_offload_caps(sa) |
+                                   dev_info->rx_queue_offload_capa;
 
-       dev_info->tx_offload_capa =
-               DEV_TX_OFFLOAD_IPV4_CKSUM |
-               DEV_TX_OFFLOAD_UDP_CKSUM |
-               DEV_TX_OFFLOAD_TCP_CKSUM;
+       dev_info->tx_queue_offload_capa = sfc_tx_get_queue_offload_caps(sa);
+
+       /*
+        * tx_offload_capa includes both device and queue offloads since
+        * the latter may be requested on a per device basis which makes
+        * sense when some offloads are needed to be set on all queues.
+        */
+       dev_info->tx_offload_capa = sfc_tx_get_dev_offload_caps(sa) |
+                                   dev_info->tx_queue_offload_capa;
+
+       if (dev_info->tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
+               txq_offloads_def |= DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+
+       dev_info->default_txconf.offloads |= txq_offloads_def;
 
        dev_info->default_txconf.txq_flags = ETH_TXQ_FLAGS_NOXSUMSCTP;
        if ((~sa->dp_tx->features & SFC_DP_TX_FEAT_VLAN_INSERT) ||
            !encp->enc_hw_tx_insert_vlan_enabled)
                dev_info->default_txconf.txq_flags |= ETH_TXQ_FLAGS_NOVLANOFFL;
-       else
-               dev_info->tx_offload_capa |= DEV_TX_OFFLOAD_VLAN_INSERT;
 
        if (~sa->dp_tx->features & SFC_DP_TX_FEAT_MULTI_SEG)
                dev_info->default_txconf.txq_flags |= ETH_TXQ_FLAGS_NOMULTSEGS;
@@ -159,9 +159,7 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        }
 #endif
 
-       if (sa->tso)
-               dev_info->tx_offload_capa |= DEV_TX_OFFLOAD_TCP_TSO;
-
+       /* Initialize to hardware limits */
        dev_info->rx_desc_lim.nb_max = EFX_RXQ_MAXNDESCS;
        dev_info->rx_desc_lim.nb_min = EFX_RXQ_MINNDESCS;
        /* The RXQ hardware requires that the descriptor count is a power
@@ -169,6 +167,7 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
         */
        dev_info->rx_desc_lim.nb_align = EFX_RXQ_MINNDESCS;
 
+       /* Initialize to hardware limits */
        dev_info->tx_desc_lim.nb_max = sa->txq_max_entries;
        dev_info->tx_desc_lim.nb_min = EFX_TXQ_MINNDESCS;
        /*
@@ -176,14 +175,21 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
         * of 2, but tx_desc_lim cannot properly describe that constraint
         */
        dev_info->tx_desc_lim.nb_align = EFX_TXQ_MINNDESCS;
+
+       if (sa->dp_rx->get_dev_info != NULL)
+               sa->dp_rx->get_dev_info(dev_info);
+       if (sa->dp_tx->get_dev_info != NULL)
+               sa->dp_tx->get_dev_info(dev_info);
 }
 
 static const uint32_t *
 sfc_dev_supported_ptypes_get(struct rte_eth_dev *dev)
 {
        struct sfc_adapter *sa = dev->data->dev_private;
+       const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);
+       uint32_t tunnel_encaps = encp->enc_tunnel_encapsulations_supported;
 
-       return sa->dp_rx->supported_ptypes_get();
+       return sa->dp_rx->supported_ptypes_get(tunnel_encaps);
 }
 
 static int
@@ -237,22 +243,13 @@ static int
 sfc_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 {
        struct sfc_adapter *sa = dev->data->dev_private;
-       struct rte_eth_link *dev_link = &dev->data->dev_link;
-       struct rte_eth_link old_link;
        struct rte_eth_link current_link;
+       int ret;
 
        sfc_log_init(sa, "entry");
 
-retry:
-       EFX_STATIC_ASSERT(sizeof(*dev_link) == sizeof(rte_atomic64_t));
-       *(int64_t *)&old_link = rte_atomic64_read((rte_atomic64_t *)dev_link);
-
        if (sa->state != SFC_ADAPTER_STARTED) {
                sfc_port_link_mode_to_info(EFX_LINK_UNKNOWN, &current_link);
-               if (!rte_atomic64_cmpset((volatile uint64_t *)dev_link,
-                                        *(uint64_t *)&old_link,
-                                        *(uint64_t *)&current_link))
-                       goto retry;
        } else if (wait_to_complete) {
                efx_link_mode_t link_mode;
 
@@ -260,21 +257,17 @@ retry:
                        link_mode = EFX_LINK_UNKNOWN;
                sfc_port_link_mode_to_info(link_mode, &current_link);
 
-               if (!rte_atomic64_cmpset((volatile uint64_t *)dev_link,
-                                        *(uint64_t *)&old_link,
-                                        *(uint64_t *)&current_link))
-                       goto retry;
        } else {
                sfc_ev_mgmt_qpoll(sa);
-               *(int64_t *)&current_link =
-                       rte_atomic64_read((rte_atomic64_t *)dev_link);
+               rte_eth_linkstatus_get(dev, &current_link);
        }
 
-       if (old_link.link_status != current_link.link_status)
-               sfc_info(sa, "Link status is %s",
-                        current_link.link_status ? "UP" : "DOWN");
+       ret = rte_eth_linkstatus_set(dev, &current_link);
+       if (ret == 0)
+               sfc_notice(sa, "Link status is %s",
+                          current_link.link_status ? "UP" : "DOWN");
 
-       return old_link.link_status == current_link.link_status ? 0 : -1;
+       return ret;
 }
 
 static void
@@ -894,7 +887,13 @@ sfc_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
         * The driver does not use it, but other PMDs update jumbo_frame
         * flag and max_rx_pkt_len when MTU is set.
         */
-       dev->data->dev_conf.rxmode.jumbo_frame = (mtu > ETHER_MAX_LEN);
+       if (mtu > ETHER_MAX_LEN) {
+               struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
+
+               rxmode->offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
+               rxmode->jumbo_frame = 1;
+       }
+
        dev->data->dev_conf.rxmode.max_rx_pkt_len = sa->port.pdu;
 
        sfc_adapter_unlock(sa);
@@ -915,25 +914,39 @@ fail_inval:
        SFC_ASSERT(rc > 0);
        return -rc;
 }
-static void
+static int
 sfc_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
 {
        struct sfc_adapter *sa = dev->data->dev_private;
        const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);
        struct sfc_port *port = &sa->port;
-       int rc;
+       struct ether_addr *old_addr = &dev->data->mac_addrs[0];
+       int rc = 0;
 
        sfc_adapter_lock(sa);
 
+       /*
+        * Copy the address to the device private data so that
+        * it could be recalled in the case of adapter restart.
+        */
+       ether_addr_copy(mac_addr, &port->default_mac_addr);
+
+       /*
+        * Neither of the two following checks can return
+        * an error. The new MAC address is preserved in
+        * the device private data and can be activated
+        * on the next port start if the user prevents
+        * isolated mode from being enabled.
+        */
        if (port->isolated) {
-               sfc_err(sa, "isolated mode is active on the port");
-               sfc_err(sa, "will not set MAC address");
+               sfc_warn(sa, "isolated mode is active on the port");
+               sfc_warn(sa, "will not set MAC address");
                goto unlock;
        }
 
        if (sa->state != SFC_ADAPTER_STARTED) {
-               sfc_info(sa, "the port is not started");
-               sfc_info(sa, "the new MAC address will be set on port start");
+               sfc_notice(sa, "the port is not started");
+               sfc_notice(sa, "the new MAC address will be set on port start");
 
                goto unlock;
        }
@@ -951,8 +964,12 @@ sfc_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
                 * we also need to update unicast filters
                 */
                rc = sfc_set_rx_mode(sa);
-               if (rc != 0)
+               if (rc != 0) {
                        sfc_err(sa, "cannot set filter (rc = %u)", rc);
+                       /* Rollback the old address */
+                       (void)efx_mac_addr_set(sa->nic, old_addr->addr_bytes);
+                       (void)sfc_set_rx_mode(sa);
+               }
        } else {
                sfc_warn(sa, "cannot set MAC address with filters installed");
                sfc_warn(sa, "adapter will be restarted to pick the new MAC");
@@ -960,9 +977,9 @@ sfc_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
 
                /*
                 * Since setting MAC address with filters installed is not
-                * allowed on the adapter, one needs to simply restart adapter
-                * so that the new MAC address will be taken from an outer
-                * storage and set flawlessly by means of sfc_start() call
+                * allowed on the adapter, the new MAC address will be set
+                * by means of adapter restart. sfc_start() shall retrieve
+                * the new address from the device private data and set it.
                 */
                sfc_stop(sa);
                rc = sfc_start(sa);
@@ -971,7 +988,13 @@ sfc_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
        }
 
 unlock:
+       if (rc != 0)
+               ether_addr_copy(old_addr, &port->default_mac_addr);
+
        sfc_adapter_unlock(sa);
+
+       SFC_ASSERT(rc >= 0);
+       return -rc;
 }
 
 
@@ -1044,7 +1067,13 @@ sfc_rx_queue_info_get(struct rte_eth_dev *dev, uint16_t rx_queue_id,
        qinfo->conf.rx_free_thresh = rxq->refill_threshold;
        qinfo->conf.rx_drop_en = 1;
        qinfo->conf.rx_deferred_start = rxq_info->deferred_start;
-       qinfo->scattered_rx = (rxq_info->type == EFX_RXQ_TYPE_SCATTER);
+       qinfo->conf.offloads = DEV_RX_OFFLOAD_IPV4_CKSUM |
+                              DEV_RX_OFFLOAD_UDP_CKSUM |
+                              DEV_RX_OFFLOAD_TCP_CKSUM;
+       if (rxq_info->type_flags & EFX_RXQ_FLAG_SCATTER) {
+               qinfo->conf.offloads |= DEV_RX_OFFLOAD_SCATTER;
+               qinfo->scattered_rx = 1;
+       }
        qinfo->nb_desc = rxq_info->entries;
 
        sfc_adapter_unlock(sa);
@@ -1071,6 +1100,7 @@ sfc_tx_queue_info_get(struct rte_eth_dev *dev, uint16_t tx_queue_id,
        memset(qinfo, 0, sizeof(*qinfo));
 
        qinfo->conf.txq_flags = txq_info->txq->flags;
+       qinfo->conf.offloads = txq_info->txq->offloads;
        qinfo->conf.tx_free_thresh = txq_info->txq->free_thresh;
        qinfo->conf.tx_deferred_start = txq_info->deferred_start;
        qinfo->nb_desc = txq_info->entries;
@@ -1210,6 +1240,123 @@ sfc_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)
        return 0;
 }
 
+static efx_tunnel_protocol_t
+sfc_tunnel_rte_type_to_efx_udp_proto(enum rte_eth_tunnel_type rte_type)
+{
+       switch (rte_type) {
+       case RTE_TUNNEL_TYPE_VXLAN:
+               return EFX_TUNNEL_PROTOCOL_VXLAN;
+       case RTE_TUNNEL_TYPE_GENEVE:
+               return EFX_TUNNEL_PROTOCOL_GENEVE;
+       default:
+               return EFX_TUNNEL_NPROTOS;
+       }
+}
+
+enum sfc_udp_tunnel_op_e {
+       SFC_UDP_TUNNEL_ADD_PORT,
+       SFC_UDP_TUNNEL_DEL_PORT,
+};
+
+static int
+sfc_dev_udp_tunnel_op(struct rte_eth_dev *dev,
+                     struct rte_eth_udp_tunnel *tunnel_udp,
+                     enum sfc_udp_tunnel_op_e op)
+{
+       struct sfc_adapter *sa = dev->data->dev_private;
+       efx_tunnel_protocol_t tunnel_proto;
+       int rc;
+
+       sfc_log_init(sa, "%s udp_port=%u prot_type=%u",
+                    (op == SFC_UDP_TUNNEL_ADD_PORT) ? "add" :
+                    (op == SFC_UDP_TUNNEL_DEL_PORT) ? "delete" : "unknown",
+                    tunnel_udp->udp_port, tunnel_udp->prot_type);
+
+       tunnel_proto =
+               sfc_tunnel_rte_type_to_efx_udp_proto(tunnel_udp->prot_type);
+       if (tunnel_proto >= EFX_TUNNEL_NPROTOS) {
+               rc = ENOTSUP;
+               goto fail_bad_proto;
+       }
+
+       sfc_adapter_lock(sa);
+
+       switch (op) {
+       case SFC_UDP_TUNNEL_ADD_PORT:
+               rc = efx_tunnel_config_udp_add(sa->nic,
+                                              tunnel_udp->udp_port,
+                                              tunnel_proto);
+               break;
+       case SFC_UDP_TUNNEL_DEL_PORT:
+               rc = efx_tunnel_config_udp_remove(sa->nic,
+                                                 tunnel_udp->udp_port,
+                                                 tunnel_proto);
+               break;
+       default:
+               rc = EINVAL;
+               goto fail_bad_op;
+       }
+
+       if (rc != 0)
+               goto fail_op;
+
+       if (sa->state == SFC_ADAPTER_STARTED) {
+               rc = efx_tunnel_reconfigure(sa->nic);
+               if (rc == EAGAIN) {
+                       /*
+                        * Configuration is accepted by FW and MC reboot
+                        * is initiated to apply the changes. MC reboot
+                        * will be handled in a usual way (MC reboot
+                        * event on management event queue and adapter
+                        * restart).
+                        */
+                       rc = 0;
+               } else if (rc != 0) {
+                       goto fail_reconfigure;
+               }
+       }
+
+       sfc_adapter_unlock(sa);
+       return 0;
+
+fail_reconfigure:
+       /* Remove/restore entry since the change makes the trouble */
+       switch (op) {
+       case SFC_UDP_TUNNEL_ADD_PORT:
+               (void)efx_tunnel_config_udp_remove(sa->nic,
+                                                  tunnel_udp->udp_port,
+                                                  tunnel_proto);
+               break;
+       case SFC_UDP_TUNNEL_DEL_PORT:
+               (void)efx_tunnel_config_udp_add(sa->nic,
+                                               tunnel_udp->udp_port,
+                                               tunnel_proto);
+               break;
+       }
+
+fail_op:
+fail_bad_op:
+       sfc_adapter_unlock(sa);
+
+fail_bad_proto:
+       SFC_ASSERT(rc > 0);
+       return -rc;
+}
+
+static int
+sfc_dev_udp_tunnel_port_add(struct rte_eth_dev *dev,
+                           struct rte_eth_udp_tunnel *tunnel_udp)
+{
+       return sfc_dev_udp_tunnel_op(dev, tunnel_udp, SFC_UDP_TUNNEL_ADD_PORT);
+}
+
+static int
+sfc_dev_udp_tunnel_port_del(struct rte_eth_dev *dev,
+                           struct rte_eth_udp_tunnel *tunnel_udp)
+{
+       return sfc_dev_udp_tunnel_op(dev, tunnel_udp, SFC_UDP_TUNNEL_DEL_PORT);
+}
+
 #if EFSYS_OPT_RX_SCALE
 static int
 sfc_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
@@ -1514,6 +1661,8 @@ static const struct eth_dev_ops sfc_eth_dev_ops = {
        .flow_ctrl_get                  = sfc_flow_ctrl_get,
        .flow_ctrl_set                  = sfc_flow_ctrl_set,
        .mac_addr_set                   = sfc_mac_addr_set,
+       .udp_tunnel_port_add            = sfc_dev_udp_tunnel_port_add,
+       .udp_tunnel_port_del            = sfc_dev_udp_tunnel_port_del,
 #if EFSYS_OPT_RX_SCALE
        .reta_update                    = sfc_dev_rss_reta_update,
        .reta_query                     = sfc_dev_rss_reta_query,
@@ -1564,6 +1713,7 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev)
        switch (sa->family) {
        case EFX_FAMILY_HUNTINGTON:
        case EFX_FAMILY_MEDFORD:
+       case EFX_FAMILY_MEDFORD2:
                avail_caps |= SFC_DP_HW_FW_CAP_EF10;
                break;
        default:
@@ -1605,7 +1755,7 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev)
                goto fail_dp_rx_name;
        }
 
-       sfc_info(sa, "use %s Rx datapath", sa->dp_rx_name);
+       sfc_notice(sa, "use %s Rx datapath", sa->dp_rx_name);
 
        dev->rx_pkt_burst = sa->dp_rx->pkt_burst;
 
@@ -1644,7 +1794,7 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev)
                goto fail_dp_tx_name;
        }
 
-       sfc_info(sa, "use %s Tx datapath", sa->dp_tx_name);
+       sfc_notice(sa, "use %s Tx datapath", sa->dp_tx_name);
 
        dev->tx_pkt_burst = sa->dp_tx->pkt_burst;
 
@@ -1791,15 +1941,13 @@ sfc_eth_dev_init(struct rte_eth_dev *dev)
        /* Copy PCI device info to the dev->data */
        rte_eth_copy_pci_info(dev, pci_dev);
 
+       sa->logtype_main = sfc_register_logtype(sa, SFC_LOGTYPE_MAIN_STR,
+                                               RTE_LOG_NOTICE);
+
        rc = sfc_kvargs_parse(sa);
        if (rc != 0)
                goto fail_kvargs_parse;
 
-       rc = sfc_kvargs_process(sa, SFC_KVARG_DEBUG_INIT,
-                               sfc_kvarg_bool_handler, &sa->debug_init);
-       if (rc != 0)
-               goto fail_kvarg_debug_init;
-
        sfc_log_init(sa, "entry");
 
        dev->data->mac_addrs = rte_zmalloc("sfc", ETHER_ADDR_LEN, 0);
@@ -1853,7 +2001,6 @@ fail_probe:
        dev->data->mac_addrs = NULL;
 
 fail_mac_addrs:
-fail_kvarg_debug_init:
        sfc_kvargs_cleanup(sa);
 
 fail_kvargs_parse:
@@ -1904,6 +2051,8 @@ static const struct rte_pci_id pci_id_sfc_efx_map[] = {
        { RTE_PCI_DEVICE(EFX_PCI_VENID_SFC, EFX_PCI_DEVID_GREENPORT_VF) },
        { RTE_PCI_DEVICE(EFX_PCI_VENID_SFC, EFX_PCI_DEVID_MEDFORD) },
        { RTE_PCI_DEVICE(EFX_PCI_VENID_SFC, EFX_PCI_DEVID_MEDFORD_VF) },
+       { RTE_PCI_DEVICE(EFX_PCI_VENID_SFC, EFX_PCI_DEVID_MEDFORD2) },
+       { RTE_PCI_DEVICE(EFX_PCI_VENID_SFC, EFX_PCI_DEVID_MEDFORD2_VF) },
        { .vendor_id = 0 /* sentinel */ }
 };
 
@@ -1935,6 +2084,16 @@ RTE_PMD_REGISTER_PARAM_STRING(net_sfc_efx,
        SFC_KVARG_RX_DATAPATH "=" SFC_KVARG_VALUES_RX_DATAPATH " "
        SFC_KVARG_TX_DATAPATH "=" SFC_KVARG_VALUES_TX_DATAPATH " "
        SFC_KVARG_PERF_PROFILE "=" SFC_KVARG_VALUES_PERF_PROFILE " "
-       SFC_KVARG_STATS_UPDATE_PERIOD_MS "=<long> "
-       SFC_KVARG_MCDI_LOGGING "=" SFC_KVARG_VALUES_BOOL " "
-       SFC_KVARG_DEBUG_INIT "=" SFC_KVARG_VALUES_BOOL);
+       SFC_KVARG_FW_VARIANT "=" SFC_KVARG_VALUES_FW_VARIANT " "
+       SFC_KVARG_STATS_UPDATE_PERIOD_MS "=<long>");
+
+RTE_INIT(sfc_driver_register_logtype);
+static void
+sfc_driver_register_logtype(void)
+{
+       int ret;
+
+       ret = rte_log_register_type_and_pick_level(SFC_LOGTYPE_PREFIX "driver",
+                                                  RTE_LOG_NOTICE);
+       sfc_logtype_driver = (ret < 0) ? RTE_LOGTYPE_PMD : ret;
+}