New upstream version 18.08
[deb_dpdk.git] / drivers / net / szedata2 / rte_eth_szedata2.c
index e53c738..1d20cb5 100644 (file)
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright (c) 2015 - 2016 CESNET
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of CESNET nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   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.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2015 - 2016 CESNET
  */
 
 #include <stdint.h>
 #include <rte_memcpy.h>
 #include <rte_kvargs.h>
 #include <rte_dev.h>
-#include <rte_atomic.h>
 
 #include "rte_eth_szedata2.h"
-#include "szedata2_iobuf.h"
+#include "szedata2_logs.h"
 
 #define RTE_ETH_SZEDATA2_MAX_RX_QUEUES 32
 #define RTE_ETH_SZEDATA2_MAX_TX_QUEUES 32
 
 #define SZEDATA2_DEV_PATH_FMT "/dev/szedataII%u"
 
+/**
+ * Format string for suffix used to differentiate between Ethernet ports
+ * on the same PCI device.
+ */
+#define SZEDATA2_ETH_DEV_NAME_SUFFIX_FMT "-port%u"
+
+/**
+ * Maximum number of ports for one device.
+ */
+#define SZEDATA2_MAX_PORTS 2
+
+/**
+ * Entry in list of PCI devices for this driver.
+ */
+struct pci_dev_list_entry;
+struct pci_dev_list_entry {
+       LIST_ENTRY(pci_dev_list_entry) next;
+       struct rte_pci_device *pci_dev;
+       unsigned int port_count;
+};
+
+/* List of PCI devices with number of ports for this driver. */
+LIST_HEAD(pci_dev_list, pci_dev_list_entry) szedata2_pci_dev_list =
+       LIST_HEAD_INITIALIZER(szedata2_pci_dev_list);
+
+struct port_info {
+       unsigned int rx_base_id;
+       unsigned int tx_base_id;
+       unsigned int rx_count;
+       unsigned int tx_count;
+       int numa_node;
+};
+
+struct pmd_internals {
+       struct rte_eth_dev *dev;
+       uint16_t max_rx_queues;
+       uint16_t max_tx_queues;
+       unsigned int rxq_base_id;
+       unsigned int txq_base_id;
+       char *sze_dev_path;
+};
+
 struct szedata2_rx_queue {
+       struct pmd_internals *priv;
        struct szedata *sze;
        uint8_t rx_channel;
+       uint16_t qid;
        uint16_t in_port;
        struct rte_mempool *mb_pool;
        volatile uint64_t rx_pkts;
@@ -79,21 +93,17 @@ struct szedata2_rx_queue {
 };
 
 struct szedata2_tx_queue {
+       struct pmd_internals *priv;
        struct szedata *sze;
        uint8_t tx_channel;
+       uint16_t qid;
        volatile uint64_t tx_pkts;
        volatile uint64_t tx_bytes;
        volatile uint64_t err_pkts;
 };
 
-struct pmd_internals {
-       struct szedata2_rx_queue rx_queue[RTE_ETH_SZEDATA2_MAX_RX_QUEUES];
-       struct szedata2_tx_queue tx_queue[RTE_ETH_SZEDATA2_MAX_TX_QUEUES];
-       uint16_t max_rx_queues;
-       uint16_t max_tx_queues;
-       char sze_dev[PATH_MAX];
-       struct rte_mem_resource *pci_rsc;
-};
+int szedata2_logtype_init;
+int szedata2_logtype_driver;
 
 static struct ether_addr eth_addr = {
        .addr_bytes = { 0x00, 0x11, 0x17, 0x00, 0x00, 0x00 }
@@ -133,8 +143,10 @@ eth_szedata2_rx(void *queue,
        for (i = 0; i < nb_pkts; i++) {
                mbuf = rte_pktmbuf_alloc(sze_q->mb_pool);
 
-               if (unlikely(mbuf == NULL))
+               if (unlikely(mbuf == NULL)) {
+                       sze_q->priv->dev->data->rx_mbuf_alloc_failed++;
                        break;
+               }
 
                /* get the next sze packet */
                if (sze->ct_rx_lck != NULL && !sze->ct_rx_rem_bytes &&
@@ -318,10 +330,10 @@ eth_szedata2_rx(void *queue,
                         * sze packet will not fit in one mbuf,
                         * scattered mode is not enabled, drop packet
                         */
-                       RTE_LOG(ERR, PMD,
+                       PMD_DRV_LOG(ERR,
                                "SZE segment %d bytes will not fit in one mbuf "
                                "(%d bytes), scattered mode is not enabled, "
-                               "drop packet!!\n",
+                               "drop packet!!",
                                packet_size, buf_size);
                        rte_pktmbuf_free(mbuf);
                }
@@ -354,6 +366,8 @@ eth_szedata2_rx_scattered(void *queue,
        uint16_t packet_len1 = 0;
        uint16_t packet_len2 = 0;
        uint16_t hw_data_align;
+       uint64_t *mbuf_failed_ptr =
+               &sze_q->priv->dev->data->rx_mbuf_alloc_failed;
 
        if (unlikely(sze_q->sze == NULL || nb_pkts == 0))
                return 0;
@@ -541,6 +555,7 @@ eth_szedata2_rx_scattered(void *queue,
                        sze->ct_rx_lck = ct_rx_lck_backup;
                        sze->ct_rx_rem_bytes = ct_rx_rem_bytes_backup;
                        sze->ct_rx_cur_ptr = ct_rx_cur_ptr_backup;
+                       sze_q->priv->dev->data->rx_mbuf_alloc_failed++;
                        break;
                }
 
@@ -590,6 +605,7 @@ eth_szedata2_rx_scattered(void *queue,
                                                ct_rx_rem_bytes_backup;
                                        sze->ct_rx_cur_ptr =
                                                ct_rx_cur_ptr_backup;
+                                       (*mbuf_failed_ptr)++;
                                        goto finish;
                                }
 
@@ -633,6 +649,7 @@ eth_szedata2_rx_scattered(void *queue,
                                                        ct_rx_rem_bytes_backup;
                                                sze->ct_rx_cur_ptr =
                                                        ct_rx_cur_ptr_backup;
+                                               (*mbuf_failed_ptr)++;
                                                goto finish;
                                        }
 
@@ -889,7 +906,7 @@ eth_rx_queue_start(struct rte_eth_dev *dev, uint16_t rxq_id)
        if (rxq->sze == NULL) {
                uint32_t rx = 1 << rxq->rx_channel;
                uint32_t tx = 0;
-               rxq->sze = szedata_open(internals->sze_dev);
+               rxq->sze = szedata_open(internals->sze_dev_path);
                if (rxq->sze == NULL)
                        return -EINVAL;
                ret = szedata_subscribe3(rxq->sze, &rx, &tx);
@@ -934,7 +951,7 @@ eth_tx_queue_start(struct rte_eth_dev *dev, uint16_t txq_id)
        if (txq->sze == NULL) {
                uint32_t rx = 0;
                uint32_t tx = 1 << txq->tx_channel;
-               txq->sze = szedata_open(internals->sze_dev);
+               txq->sze = szedata_open(internals->sze_dev_path);
                if (txq->sze == NULL)
                        return -EINVAL;
                ret = szedata_subscribe3(txq->sze, &rx, &tx);
@@ -1017,7 +1034,7 @@ static int
 eth_dev_configure(struct rte_eth_dev *dev)
 {
        struct rte_eth_dev_data *data = dev->data;
-       if (data->dev_conf.rxmode.enable_scatter == 1) {
+       if (data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SCATTER) {
                dev->rx_pkt_burst = eth_szedata2_rx_scattered;
                data->scattered_rx = 1;
        } else {
@@ -1032,13 +1049,18 @@ eth_dev_info(struct rte_eth_dev *dev,
                struct rte_eth_dev_info *dev_info)
 {
        struct pmd_internals *internals = dev->data->dev_private;
-       dev_info->pci_dev = RTE_ETH_DEV_TO_PCI(dev);
+
        dev_info->if_index = 0;
        dev_info->max_mac_addrs = 1;
        dev_info->max_rx_pktlen = (uint32_t)-1;
        dev_info->max_rx_queues = internals->max_rx_queues;
        dev_info->max_tx_queues = internals->max_tx_queues;
        dev_info->min_rx_bufsize = 0;
+       dev_info->rx_offload_capa = DEV_RX_OFFLOAD_SCATTER |
+                                   DEV_RX_OFFLOAD_CRC_STRIP;
+       dev_info->tx_offload_capa = 0;
+       dev_info->rx_queue_offload_capa = 0;
+       dev_info->tx_queue_offload_capa = 0;
        dev_info->speed_capa = ETH_LINK_SPEED_100G;
 }
 
@@ -1054,22 +1076,29 @@ eth_stats_get(struct rte_eth_dev *dev,
        uint64_t tx_err_total = 0;
        uint64_t rx_total_bytes = 0;
        uint64_t tx_total_bytes = 0;
-       const struct pmd_internals *internals = dev->data->dev_private;
 
-       for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS && i < nb_rx; i++) {
-               stats->q_ipackets[i] = internals->rx_queue[i].rx_pkts;
-               stats->q_ibytes[i] = internals->rx_queue[i].rx_bytes;
-               rx_total += stats->q_ipackets[i];
-               rx_total_bytes += stats->q_ibytes[i];
+       for (i = 0; i < nb_rx; i++) {
+               struct szedata2_rx_queue *rxq = dev->data->rx_queues[i];
+
+               if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
+                       stats->q_ipackets[i] = rxq->rx_pkts;
+                       stats->q_ibytes[i] = rxq->rx_bytes;
+               }
+               rx_total += rxq->rx_pkts;
+               rx_total_bytes += rxq->rx_bytes;
        }
 
-       for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS && i < nb_tx; i++) {
-               stats->q_opackets[i] = internals->tx_queue[i].tx_pkts;
-               stats->q_obytes[i] = internals->tx_queue[i].tx_bytes;
-               stats->q_errors[i] = internals->tx_queue[i].err_pkts;
-               tx_total += stats->q_opackets[i];
-               tx_total_bytes += stats->q_obytes[i];
-               tx_err_total += stats->q_errors[i];
+       for (i = 0; i < nb_tx; i++) {
+               struct szedata2_tx_queue *txq = dev->data->tx_queues[i];
+
+               if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
+                       stats->q_opackets[i] = txq->tx_pkts;
+                       stats->q_obytes[i] = txq->tx_bytes;
+                       stats->q_errors[i] = txq->err_pkts;
+               }
+               tx_total += txq->tx_pkts;
+               tx_total_bytes += txq->tx_bytes;
+               tx_err_total += txq->err_pkts;
        }
 
        stats->ipackets = rx_total;
@@ -1077,6 +1106,7 @@ eth_stats_get(struct rte_eth_dev *dev,
        stats->ibytes = rx_total_bytes;
        stats->obytes = tx_total_bytes;
        stats->oerrors = tx_err_total;
+       stats->rx_nombuf = dev->data->rx_mbuf_alloc_failed;
 
        return 0;
 }
@@ -1087,17 +1117,18 @@ eth_stats_reset(struct rte_eth_dev *dev)
        uint16_t i;
        uint16_t nb_rx = dev->data->nb_rx_queues;
        uint16_t nb_tx = dev->data->nb_tx_queues;
-       struct pmd_internals *internals = dev->data->dev_private;
 
        for (i = 0; i < nb_rx; i++) {
-               internals->rx_queue[i].rx_pkts = 0;
-               internals->rx_queue[i].rx_bytes = 0;
-               internals->rx_queue[i].err_pkts = 0;
+               struct szedata2_rx_queue *rxq = dev->data->rx_queues[i];
+               rxq->rx_pkts = 0;
+               rxq->rx_bytes = 0;
+               rxq->err_pkts = 0;
        }
        for (i = 0; i < nb_tx; i++) {
-               internals->tx_queue[i].tx_pkts = 0;
-               internals->tx_queue[i].tx_bytes = 0;
-               internals->tx_queue[i].err_pkts = 0;
+               struct szedata2_tx_queue *txq = dev->data->tx_queues[i];
+               txq->tx_pkts = 0;
+               txq->tx_bytes = 0;
+               txq->err_pkts = 0;
        }
 }
 
@@ -1105,9 +1136,11 @@ static void
 eth_rx_queue_release(void *q)
 {
        struct szedata2_rx_queue *rxq = (struct szedata2_rx_queue *)q;
-       if (rxq->sze != NULL) {
-               szedata_close(rxq->sze);
-               rxq->sze = NULL;
+
+       if (rxq != NULL) {
+               if (rxq->sze != NULL)
+                       szedata_close(rxq->sze);
+               rte_free(rxq);
        }
 }
 
@@ -1115,9 +1148,11 @@ static void
 eth_tx_queue_release(void *q)
 {
        struct szedata2_tx_queue *txq = (struct szedata2_tx_queue *)q;
-       if (txq->sze != NULL) {
-               szedata_close(txq->sze);
-               txq->sze = NULL;
+
+       if (txq != NULL) {
+               if (txq->sze != NULL)
+                       szedata_close(txq->sze);
+               rte_free(txq);
        }
 }
 
@@ -1142,111 +1177,34 @@ eth_dev_close(struct rte_eth_dev *dev)
        dev->data->nb_tx_queues = 0;
 }
 
-/**
- * Function takes value from first IBUF status register.
- * Values in IBUF and OBUF should be same.
- *
- * @param internals
- *     Pointer to device private structure.
- * @return
- *     Link speed constant.
- */
-static inline enum szedata2_link_speed
-get_link_speed(const struct pmd_internals *internals)
-{
-       const volatile struct szedata2_ibuf *ibuf =
-               ibuf_ptr_by_index(internals->pci_rsc, 0);
-       uint32_t speed = (szedata2_read32(&ibuf->ibuf_st) & 0x70) >> 4;
-       switch (speed) {
-       case 0x03:
-               return SZEDATA2_LINK_SPEED_10G;
-       case 0x04:
-               return SZEDATA2_LINK_SPEED_40G;
-       case 0x05:
-               return SZEDATA2_LINK_SPEED_100G;
-       default:
-               return SZEDATA2_LINK_SPEED_DEFAULT;
-       }
-}
-
 static int
 eth_link_update(struct rte_eth_dev *dev,
                int wait_to_complete __rte_unused)
 {
        struct rte_eth_link link;
-       struct rte_eth_link *link_ptr = &link;
-       struct rte_eth_link *dev_link = &dev->data->dev_link;
-       struct pmd_internals *internals = (struct pmd_internals *)
-               dev->data->dev_private;
-       const volatile struct szedata2_ibuf *ibuf;
-       uint32_t i;
-       bool link_is_up = false;
-
-       switch (get_link_speed(internals)) {
-       case SZEDATA2_LINK_SPEED_10G:
-               link.link_speed = ETH_SPEED_NUM_10G;
-               break;
-       case SZEDATA2_LINK_SPEED_40G:
-               link.link_speed = ETH_SPEED_NUM_40G;
-               break;
-       case SZEDATA2_LINK_SPEED_100G:
-               link.link_speed = ETH_SPEED_NUM_100G;
-               break;
-       default:
-               link.link_speed = ETH_SPEED_NUM_10G;
-               break;
-       }
 
-       /* szedata2 uses only full duplex */
-       link.link_duplex = ETH_LINK_FULL_DUPLEX;
-
-       for (i = 0; i < szedata2_ibuf_count; i++) {
-               ibuf = ibuf_ptr_by_index(internals->pci_rsc, i);
-               /*
-                * Link is considered up if at least one ibuf is enabled
-                * and up.
-                */
-               if (ibuf_is_enabled(ibuf) && ibuf_is_link_up(ibuf)) {
-                       link_is_up = true;
-                       break;
-               }
-       }
-
-       link.link_status = (link_is_up) ? ETH_LINK_UP : ETH_LINK_DOWN;
+       memset(&link, 0, sizeof(link));
 
+       link.link_speed = ETH_SPEED_NUM_100G;
+       link.link_duplex = ETH_LINK_FULL_DUPLEX;
+       link.link_status = ETH_LINK_UP;
        link.link_autoneg = ETH_LINK_FIXED;
 
-       rte_atomic64_cmpset((uint64_t *)dev_link, *(uint64_t *)dev_link,
-                       *(uint64_t *)link_ptr);
-
+       rte_eth_linkstatus_set(dev, &link);
        return 0;
 }
 
 static int
-eth_dev_set_link_up(struct rte_eth_dev *dev)
+eth_dev_set_link_up(struct rte_eth_dev *dev __rte_unused)
 {
-       struct pmd_internals *internals = (struct pmd_internals *)
-               dev->data->dev_private;
-       uint32_t i;
-
-       for (i = 0; i < szedata2_ibuf_count; i++)
-               ibuf_enable(ibuf_ptr_by_index(internals->pci_rsc, i));
-       for (i = 0; i < szedata2_obuf_count; i++)
-               obuf_enable(obuf_ptr_by_index(internals->pci_rsc, i));
+       PMD_DRV_LOG(WARNING, "Setting link up is not supported.");
        return 0;
 }
 
 static int
-eth_dev_set_link_down(struct rte_eth_dev *dev)
+eth_dev_set_link_down(struct rte_eth_dev *dev __rte_unused)
 {
-       struct pmd_internals *internals = (struct pmd_internals *)
-               dev->data->dev_private;
-       uint32_t i;
-
-       for (i = 0; i < szedata2_ibuf_count; i++)
-               ibuf_disable(ibuf_ptr_by_index(internals->pci_rsc, i));
-       for (i = 0; i < szedata2_obuf_count; i++)
-               obuf_disable(obuf_ptr_by_index(internals->pci_rsc, i));
+       PMD_DRV_LOG(WARNING, "Setting link down is not supported.");
        return 0;
 }
 
@@ -1254,26 +1212,50 @@ static int
 eth_rx_queue_setup(struct rte_eth_dev *dev,
                uint16_t rx_queue_id,
                uint16_t nb_rx_desc __rte_unused,
-               unsigned int socket_id __rte_unused,
+               unsigned int socket_id,
                const struct rte_eth_rxconf *rx_conf __rte_unused,
                struct rte_mempool *mb_pool)
 {
-       struct pmd_internals *internals = dev->data->dev_private;
-       struct szedata2_rx_queue *rxq = &internals->rx_queue[rx_queue_id];
+       struct szedata2_rx_queue *rxq;
        int ret;
-       uint32_t rx = 1 << rx_queue_id;
+       struct pmd_internals *internals = dev->data->dev_private;
+       uint8_t rx_channel = internals->rxq_base_id + rx_queue_id;
+       uint32_t rx = 1 << rx_channel;
        uint32_t tx = 0;
 
-       rxq->sze = szedata_open(internals->sze_dev);
-       if (rxq->sze == NULL)
+       PMD_INIT_FUNC_TRACE();
+
+       if (dev->data->rx_queues[rx_queue_id] != NULL) {
+               eth_rx_queue_release(dev->data->rx_queues[rx_queue_id]);
+               dev->data->rx_queues[rx_queue_id] = NULL;
+       }
+
+       rxq = rte_zmalloc_socket("szedata2 rx queue",
+                       sizeof(struct szedata2_rx_queue),
+                       RTE_CACHE_LINE_SIZE, socket_id);
+       if (rxq == NULL) {
+               PMD_INIT_LOG(ERR, "rte_zmalloc_socket() failed for rx queue id "
+                               "%" PRIu16 "!", rx_queue_id);
+               return -ENOMEM;
+       }
+
+       rxq->priv = internals;
+       rxq->sze = szedata_open(internals->sze_dev_path);
+       if (rxq->sze == NULL) {
+               PMD_INIT_LOG(ERR, "szedata_open() failed for rx queue id "
+                               "%" PRIu16 "!", rx_queue_id);
+               eth_rx_queue_release(rxq);
                return -EINVAL;
+       }
        ret = szedata_subscribe3(rxq->sze, &rx, &tx);
        if (ret != 0 || rx == 0) {
-               szedata_close(rxq->sze);
-               rxq->sze = NULL;
+               PMD_INIT_LOG(ERR, "szedata_subscribe3() failed for rx queue id "
+                               "%" PRIu16 "!", rx_queue_id);
+               eth_rx_queue_release(rxq);
                return -EINVAL;
        }
-       rxq->rx_channel = rx_queue_id;
+       rxq->rx_channel = rx_channel;
+       rxq->qid = rx_queue_id;
        rxq->in_port = dev->data->port_id;
        rxq->mb_pool = mb_pool;
        rxq->rx_pkts = 0;
@@ -1281,6 +1263,11 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,
        rxq->err_pkts = 0;
 
        dev->data->rx_queues[rx_queue_id] = rxq;
+
+       PMD_INIT_LOG(DEBUG, "Configured rx queue id %" PRIu16 " on socket "
+                       "%u (channel id %u).", rxq->qid, socket_id,
+                       rxq->rx_channel);
+
        return 0;
 }
 
@@ -1288,89 +1275,93 @@ static int
 eth_tx_queue_setup(struct rte_eth_dev *dev,
                uint16_t tx_queue_id,
                uint16_t nb_tx_desc __rte_unused,
-               unsigned int socket_id __rte_unused,
+               unsigned int socket_id,
                const struct rte_eth_txconf *tx_conf __rte_unused)
 {
-       struct pmd_internals *internals = dev->data->dev_private;
-       struct szedata2_tx_queue *txq = &internals->tx_queue[tx_queue_id];
+       struct szedata2_tx_queue *txq;
        int ret;
+       struct pmd_internals *internals = dev->data->dev_private;
+       uint8_t tx_channel = internals->txq_base_id + tx_queue_id;
        uint32_t rx = 0;
-       uint32_t tx = 1 << tx_queue_id;
+       uint32_t tx = 1 << tx_channel;
+
+       PMD_INIT_FUNC_TRACE();
 
-       txq->sze = szedata_open(internals->sze_dev);
-       if (txq->sze == NULL)
+       if (dev->data->tx_queues[tx_queue_id] != NULL) {
+               eth_tx_queue_release(dev->data->tx_queues[tx_queue_id]);
+               dev->data->tx_queues[tx_queue_id] = NULL;
+       }
+
+       txq = rte_zmalloc_socket("szedata2 tx queue",
+                       sizeof(struct szedata2_tx_queue),
+                       RTE_CACHE_LINE_SIZE, socket_id);
+       if (txq == NULL) {
+               PMD_INIT_LOG(ERR, "rte_zmalloc_socket() failed for tx queue id "
+                               "%" PRIu16 "!", tx_queue_id);
+               return -ENOMEM;
+       }
+
+       txq->priv = internals;
+       txq->sze = szedata_open(internals->sze_dev_path);
+       if (txq->sze == NULL) {
+               PMD_INIT_LOG(ERR, "szedata_open() failed for tx queue id "
+                               "%" PRIu16 "!", tx_queue_id);
+               eth_tx_queue_release(txq);
                return -EINVAL;
+       }
        ret = szedata_subscribe3(txq->sze, &rx, &tx);
        if (ret != 0 || tx == 0) {
-               szedata_close(txq->sze);
-               txq->sze = NULL;
+               PMD_INIT_LOG(ERR, "szedata_subscribe3() failed for tx queue id "
+                               "%" PRIu16 "!", tx_queue_id);
+               eth_tx_queue_release(txq);
                return -EINVAL;
        }
-       txq->tx_channel = tx_queue_id;
+       txq->tx_channel = tx_channel;
+       txq->qid = tx_queue_id;
        txq->tx_pkts = 0;
        txq->tx_bytes = 0;
        txq->err_pkts = 0;
 
        dev->data->tx_queues[tx_queue_id] = txq;
+
+       PMD_INIT_LOG(DEBUG, "Configured tx queue id %" PRIu16 " on socket "
+                       "%u (channel id %u).", txq->qid, socket_id,
+                       txq->tx_channel);
+
        return 0;
 }
 
-static void
+static int
 eth_mac_addr_set(struct rte_eth_dev *dev __rte_unused,
                struct ether_addr *mac_addr __rte_unused)
 {
+       return 0;
 }
 
 static void
-eth_promiscuous_enable(struct rte_eth_dev *dev)
+eth_promiscuous_enable(struct rte_eth_dev *dev __rte_unused)
 {
-       struct pmd_internals *internals = (struct pmd_internals *)
-               dev->data->dev_private;
-       uint32_t i;
-
-       for (i = 0; i < szedata2_ibuf_count; i++) {
-               ibuf_mac_mode_write(ibuf_ptr_by_index(internals->pci_rsc, i),
-                               SZEDATA2_MAC_CHMODE_PROMISC);
-       }
+       PMD_DRV_LOG(WARNING, "Enabling promiscuous mode is not supported. "
+                       "The card is always in promiscuous mode.");
 }
 
 static void
-eth_promiscuous_disable(struct rte_eth_dev *dev)
+eth_promiscuous_disable(struct rte_eth_dev *dev __rte_unused)
 {
-       struct pmd_internals *internals = (struct pmd_internals *)
-               dev->data->dev_private;
-       uint32_t i;
-
-       for (i = 0; i < szedata2_ibuf_count; i++) {
-               ibuf_mac_mode_write(ibuf_ptr_by_index(internals->pci_rsc, i),
-                               SZEDATA2_MAC_CHMODE_ONLY_VALID);
-       }
+       PMD_DRV_LOG(WARNING, "Disabling promiscuous mode is not supported. "
+                       "The card is always in promiscuous mode.");
 }
 
 static void
-eth_allmulticast_enable(struct rte_eth_dev *dev)
+eth_allmulticast_enable(struct rte_eth_dev *dev __rte_unused)
 {
-       struct pmd_internals *internals = (struct pmd_internals *)
-               dev->data->dev_private;
-       uint32_t i;
-
-       for (i = 0; i < szedata2_ibuf_count; i++) {
-               ibuf_mac_mode_write(ibuf_ptr_by_index(internals->pci_rsc, i),
-                               SZEDATA2_MAC_CHMODE_ALL_MULTICAST);
-       }
+       PMD_DRV_LOG(WARNING, "Enabling allmulticast mode is not supported.");
 }
 
 static void
-eth_allmulticast_disable(struct rte_eth_dev *dev)
+eth_allmulticast_disable(struct rte_eth_dev *dev __rte_unused)
 {
-       struct pmd_internals *internals = (struct pmd_internals *)
-               dev->data->dev_private;
-       uint32_t i;
-
-       for (i = 0; i < szedata2_ibuf_count; i++) {
-               ibuf_mac_mode_write(ibuf_ptr_by_index(internals->pci_rsc, i),
-                               SZEDATA2_MAC_CHMODE_ONLY_VALID);
-       }
+       PMD_DRV_LOG(WARNING, "Disabling allmulticast mode is not supported.");
 }
 
 static const struct eth_dev_ops ops = {
@@ -1417,9 +1408,9 @@ get_szedata2_index(const struct rte_pci_addr *pcislot_addr, uint32_t *index)
        FILE *fd;
        char pcislot_path[PATH_MAX];
        uint32_t domain;
-       uint32_t bus;
-       uint32_t devid;
-       uint32_t function;
+       uint8_t bus;
+       uint8_t devid;
+       uint8_t function;
 
        dir = opendir("/sys/class/combo");
        if (dir == NULL)
@@ -1444,7 +1435,7 @@ get_szedata2_index(const struct rte_pci_addr *pcislot_addr, uint32_t *index)
                if (fd == NULL)
                        continue;
 
-               ret = fscanf(fd, "%4" PRIx16 ":%2" PRIx8 ":%2" PRIx8 ".%" PRIx8,
+               ret = fscanf(fd, "%8" SCNx32 ":%2" SCNx8 ":%2" SCNx8 ".%" SCNx8,
                                &domain, &bus, &devid, &function);
                fclose(fd);
                if (ret != 4)
@@ -1464,109 +1455,62 @@ get_szedata2_index(const struct rte_pci_addr *pcislot_addr, uint32_t *index)
        return -1;
 }
 
+/**
+ * @brief Initializes rte_eth_dev device.
+ * @param dev Device to initialize.
+ * @param pi Structure with info about DMA queues.
+ * @return 0 on success, negative error code on error.
+ */
 static int
-rte_szedata2_eth_dev_init(struct rte_eth_dev *dev)
+rte_szedata2_eth_dev_init(struct rte_eth_dev *dev, struct port_info *pi)
 {
+       int ret;
+       uint32_t szedata2_index;
+       char name[PATH_MAX];
        struct rte_eth_dev_data *data = dev->data;
        struct pmd_internals *internals = (struct pmd_internals *)
                data->dev_private;
-       struct szedata *szedata_temp;
-       int ret;
-       uint32_t szedata2_index;
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
-       struct rte_pci_addr *pci_addr = &pci_dev->addr;
-       struct rte_mem_resource *pci_rsc =
-               &pci_dev->mem_resource[PCI_RESOURCE_NUMBER];
-       char rsc_filename[PATH_MAX];
-       void *pci_resource_ptr = NULL;
-       int fd;
 
-       RTE_LOG(INFO, PMD, "Initializing szedata2 device (" PCI_PRI_FMT ")\n",
-                       pci_addr->domain, pci_addr->bus, pci_addr->devid,
-                       pci_addr->function);
+       PMD_INIT_FUNC_TRACE();
 
+       PMD_INIT_LOG(INFO, "Initializing eth_dev %s (driver %s)", data->name,
+                       dev->device->driver->name);
+
+       /* Fill internal private structure. */
+       internals->dev = dev;
        /* Get index of szedata2 device file and create path to device file */
-       ret = get_szedata2_index(pci_addr, &szedata2_index);
+       ret = get_szedata2_index(&pci_dev->addr, &szedata2_index);
        if (ret != 0) {
-               RTE_LOG(ERR, PMD, "Failed to get szedata2 device index!\n");
+               PMD_INIT_LOG(ERR, "Failed to get szedata2 device index!");
                return -ENODEV;
        }
-       snprintf(internals->sze_dev, PATH_MAX, SZEDATA2_DEV_PATH_FMT,
-                       szedata2_index);
-
-       RTE_LOG(INFO, PMD, "SZEDATA2 path: %s\n", internals->sze_dev);
-
-       /*
-        * Get number of available DMA RX and TX channels, which is maximum
-        * number of queues that can be created and store it in private device
-        * data structure.
-        */
-       szedata_temp = szedata_open(internals->sze_dev);
-       if (szedata_temp == NULL) {
-               RTE_LOG(ERR, PMD, "szedata_open(): failed to open %s",
-                               internals->sze_dev);
-               return -EINVAL;
+       snprintf(name, PATH_MAX, SZEDATA2_DEV_PATH_FMT, szedata2_index);
+       internals->sze_dev_path = strdup(name);
+       if (internals->sze_dev_path == NULL) {
+               PMD_INIT_LOG(ERR, "strdup() failed!");
+               return -ENOMEM;
        }
-       internals->max_rx_queues = szedata_ifaces_available(szedata_temp,
-                       SZE2_DIR_RX);
-       internals->max_tx_queues = szedata_ifaces_available(szedata_temp,
-                       SZE2_DIR_TX);
-       szedata_close(szedata_temp);
-
-       RTE_LOG(INFO, PMD, "Available DMA channels RX: %u TX: %u\n",
-                       internals->max_rx_queues, internals->max_tx_queues);
+       PMD_INIT_LOG(INFO, "SZEDATA2 path: %s", internals->sze_dev_path);
+       internals->max_rx_queues = pi->rx_count;
+       internals->max_tx_queues = pi->tx_count;
+       internals->rxq_base_id = pi->rx_base_id;
+       internals->txq_base_id = pi->tx_base_id;
+       PMD_INIT_LOG(INFO, "%u RX DMA channels from id %u",
+                       internals->max_rx_queues, internals->rxq_base_id);
+       PMD_INIT_LOG(INFO, "%u TX DMA channels from id %u",
+                       internals->max_tx_queues, internals->txq_base_id);
 
        /* Set rx, tx burst functions */
-       if (data->dev_conf.rxmode.enable_scatter == 1 ||
-               data->scattered_rx == 1) {
+       if (data->scattered_rx == 1)
                dev->rx_pkt_burst = eth_szedata2_rx_scattered;
-               data->scattered_rx = 1;
-       } else {
+       else
                dev->rx_pkt_burst = eth_szedata2_rx;
-               data->scattered_rx = 0;
-       }
        dev->tx_pkt_burst = eth_szedata2_tx;
 
        /* Set function callbacks for Ethernet API */
        dev->dev_ops = &ops;
 
-       rte_eth_copy_pci_info(dev, pci_dev);
-
-       /* mmap pci resource0 file to rte_mem_resource structure */
-       if (pci_dev->mem_resource[PCI_RESOURCE_NUMBER].phys_addr ==
-                       0) {
-               RTE_LOG(ERR, PMD, "Missing resource%u file\n",
-                               PCI_RESOURCE_NUMBER);
-               return -EINVAL;
-       }
-       snprintf(rsc_filename, PATH_MAX,
-               "%s/" PCI_PRI_FMT "/resource%u", rte_pci_get_sysfs_path(),
-               pci_addr->domain, pci_addr->bus,
-               pci_addr->devid, pci_addr->function, PCI_RESOURCE_NUMBER);
-       fd = open(rsc_filename, O_RDWR);
-       if (fd < 0) {
-               RTE_LOG(ERR, PMD, "Could not open file %s\n", rsc_filename);
-               return -EINVAL;
-       }
-
-       pci_resource_ptr = mmap(0,
-                       pci_dev->mem_resource[PCI_RESOURCE_NUMBER].len,
-                       PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-       close(fd);
-       if (pci_resource_ptr == MAP_FAILED) {
-               RTE_LOG(ERR, PMD, "Could not mmap file %s (fd = %d)\n",
-                               rsc_filename, fd);
-               return -EINVAL;
-       }
-       pci_dev->mem_resource[PCI_RESOURCE_NUMBER].addr = pci_resource_ptr;
-       internals->pci_rsc = pci_rsc;
-
-       RTE_LOG(DEBUG, PMD, "resource%u phys_addr = 0x%llx len = %llu "
-                       "virt addr = %llx\n", PCI_RESOURCE_NUMBER,
-                       (unsigned long long)pci_rsc->phys_addr,
-                       (unsigned long long)pci_rsc->len,
-                       (unsigned long long)pci_rsc->addr);
-
        /* Get link state */
        eth_link_update(dev, 0);
 
@@ -1574,40 +1518,37 @@ rte_szedata2_eth_dev_init(struct rte_eth_dev *dev)
        data->mac_addrs = rte_zmalloc(data->name, sizeof(struct ether_addr),
                        RTE_CACHE_LINE_SIZE);
        if (data->mac_addrs == NULL) {
-               RTE_LOG(ERR, PMD, "Could not alloc space for MAC address!\n");
-               munmap(pci_dev->mem_resource[PCI_RESOURCE_NUMBER].addr,
-                      pci_dev->mem_resource[PCI_RESOURCE_NUMBER].len);
-               return -EINVAL;
+               PMD_INIT_LOG(ERR, "Could not alloc space for MAC address!");
+               free(internals->sze_dev_path);
+               return -ENOMEM;
        }
 
        ether_addr_copy(&eth_addr, data->mac_addrs);
 
-       /* At initial state COMBO card is in promiscuous mode so disable it */
-       eth_promiscuous_disable(dev);
-
-       RTE_LOG(INFO, PMD, "szedata2 device ("
-                       PCI_PRI_FMT ") successfully initialized\n",
-                       pci_addr->domain, pci_addr->bus, pci_addr->devid,
-                       pci_addr->function);
+       PMD_INIT_LOG(INFO, "%s device %s successfully initialized",
+                       dev->device->driver->name, data->name);
 
        return 0;
 }
 
+/**
+ * @brief Unitializes rte_eth_dev device.
+ * @param dev Device to uninitialize.
+ * @return 0 on success, negative error code on error.
+ */
 static int
 rte_szedata2_eth_dev_uninit(struct rte_eth_dev *dev)
 {
-       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
-       struct rte_pci_addr *pci_addr = &pci_dev->addr;
+       struct pmd_internals *internals = (struct pmd_internals *)
+               dev->data->dev_private;
+
+       PMD_INIT_FUNC_TRACE();
 
+       free(internals->sze_dev_path);
        rte_free(dev->data->mac_addrs);
-       dev->data->mac_addrs = NULL;
-       munmap(pci_dev->mem_resource[PCI_RESOURCE_NUMBER].addr,
-              pci_dev->mem_resource[PCI_RESOURCE_NUMBER].len);
 
-       RTE_LOG(INFO, PMD, "szedata2 device ("
-                       PCI_PRI_FMT ") successfully uninitialized\n",
-                       pci_addr->domain, pci_addr->bus, pci_addr->devid,
-                       pci_addr->function);
+       PMD_DRV_LOG(INFO, "%s device %s successfully uninitialized",
+                       dev->device->driver->name, dev->data->name);
 
        return 0;
 }
@@ -1625,22 +1566,350 @@ static const struct rte_pci_id rte_szedata2_pci_id_table[] = {
                RTE_PCI_DEVICE(PCI_VENDOR_ID_NETCOPE,
                                PCI_DEVICE_ID_NETCOPE_COMBO100G2)
        },
+       {
+               RTE_PCI_DEVICE(PCI_VENDOR_ID_NETCOPE,
+                               PCI_DEVICE_ID_NETCOPE_NFB200G2QL)
+       },
        {
                .vendor_id = 0,
        }
 };
 
+/**
+ * @brief Gets info about DMA queues for ports.
+ * @param pci_dev PCI device structure.
+ * @param port_count Pointer to variable set with number of ports.
+ * @param pi Pointer to array of structures with info about DMA queues
+ *           for ports.
+ * @param max_ports Maximum number of ports.
+ * @return 0 on success, negative error code on error.
+ */
+static int
+get_port_info(struct rte_pci_device *pci_dev, unsigned int *port_count,
+               struct port_info *pi, unsigned int max_ports)
+{
+       struct szedata *szedata_temp;
+       char sze_dev_path[PATH_MAX];
+       uint32_t szedata2_index;
+       int ret;
+       uint16_t max_rx_queues;
+       uint16_t max_tx_queues;
+
+       if (max_ports == 0)
+               return -EINVAL;
+
+       memset(pi, 0, max_ports * sizeof(struct port_info));
+       *port_count = 0;
+
+       /* Get index of szedata2 device file and create path to device file */
+       ret = get_szedata2_index(&pci_dev->addr, &szedata2_index);
+       if (ret != 0) {
+               PMD_INIT_LOG(ERR, "Failed to get szedata2 device index!");
+               return -ENODEV;
+       }
+       snprintf(sze_dev_path, PATH_MAX, SZEDATA2_DEV_PATH_FMT, szedata2_index);
+
+       /*
+        * Get number of available DMA RX and TX channels, which is maximum
+        * number of queues that can be created.
+        */
+       szedata_temp = szedata_open(sze_dev_path);
+       if (szedata_temp == NULL) {
+               PMD_INIT_LOG(ERR, "szedata_open(%s) failed", sze_dev_path);
+               return -EINVAL;
+       }
+       max_rx_queues = szedata_ifaces_available(szedata_temp, SZE2_DIR_RX);
+       max_tx_queues = szedata_ifaces_available(szedata_temp, SZE2_DIR_TX);
+       PMD_INIT_LOG(INFO, "Available DMA channels RX: %u TX: %u",
+                       max_rx_queues, max_tx_queues);
+       if (max_rx_queues > RTE_ETH_SZEDATA2_MAX_RX_QUEUES) {
+               PMD_INIT_LOG(ERR, "%u RX queues exceeds supported number %u",
+                               max_rx_queues, RTE_ETH_SZEDATA2_MAX_RX_QUEUES);
+               szedata_close(szedata_temp);
+               return -EINVAL;
+       }
+       if (max_tx_queues > RTE_ETH_SZEDATA2_MAX_TX_QUEUES) {
+               PMD_INIT_LOG(ERR, "%u TX queues exceeds supported number %u",
+                               max_tx_queues, RTE_ETH_SZEDATA2_MAX_TX_QUEUES);
+               szedata_close(szedata_temp);
+               return -EINVAL;
+       }
+
+       if (pci_dev->id.device_id == PCI_DEVICE_ID_NETCOPE_NFB200G2QL) {
+               unsigned int i;
+               unsigned int rx_queues = max_rx_queues / max_ports;
+               unsigned int tx_queues = max_tx_queues / max_ports;
+
+               /*
+                * Number of queues reported by szedata_ifaces_available()
+                * is the number of all queues from all DMA controllers which
+                * may reside at different numa locations.
+                * All queues from the same DMA controller have the same numa
+                * node.
+                * Numa node from the first queue of each DMA controller is
+                * retrieved.
+                * If the numa node differs from the numa node of the queues
+                * from the previous DMA controller the queues are assigned
+                * to the next port.
+                */
+
+               for (i = 0; i < max_ports; i++) {
+                       int numa_rx = szedata_get_area_numa_node(szedata_temp,
+                               SZE2_DIR_RX, rx_queues * i);
+                       int numa_tx = szedata_get_area_numa_node(szedata_temp,
+                               SZE2_DIR_TX, tx_queues * i);
+                       unsigned int port_rx_queues = numa_rx != -1 ?
+                               rx_queues : 0;
+                       unsigned int port_tx_queues = numa_tx != -1 ?
+                               tx_queues : 0;
+                       PMD_INIT_LOG(DEBUG, "%u rx queues from id %u, numa %d",
+                                       rx_queues, rx_queues * i, numa_rx);
+                       PMD_INIT_LOG(DEBUG, "%u tx queues from id %u, numa %d",
+                                       tx_queues, tx_queues * i, numa_tx);
+
+                       if (port_rx_queues != 0 && port_tx_queues != 0 &&
+                                       numa_rx != numa_tx) {
+                               PMD_INIT_LOG(ERR, "RX queue %u numa %d differs "
+                                               "from TX queue %u numa %d "
+                                               "unexpectedly",
+                                               rx_queues * i, numa_rx,
+                                               tx_queues * i, numa_tx);
+                               szedata_close(szedata_temp);
+                               return -EINVAL;
+                       } else if (port_rx_queues == 0 && port_tx_queues == 0) {
+                               continue;
+                       } else {
+                               unsigned int j;
+                               unsigned int current = *port_count;
+                               int port_numa = port_rx_queues != 0 ?
+                                       numa_rx : numa_tx;
+
+                               for (j = 0; j < *port_count; j++) {
+                                       if (pi[j].numa_node ==
+                                                       port_numa) {
+                                               current = j;
+                                               break;
+                                       }
+                               }
+                               if (pi[current].rx_count == 0 &&
+                                               pi[current].tx_count == 0) {
+                                       pi[current].rx_base_id = rx_queues * i;
+                                       pi[current].tx_base_id = tx_queues * i;
+                                       (*port_count)++;
+                               } else if ((rx_queues * i !=
+                                               pi[current].rx_base_id +
+                                               pi[current].rx_count) ||
+                                               (tx_queues * i !=
+                                                pi[current].tx_base_id +
+                                                pi[current].tx_count)) {
+                                       PMD_INIT_LOG(ERR, "Queue ids does not "
+                                                       "fulfill constraints");
+                                       szedata_close(szedata_temp);
+                                       return -EINVAL;
+                               }
+                               pi[current].rx_count += port_rx_queues;
+                               pi[current].tx_count += port_tx_queues;
+                               pi[current].numa_node = port_numa;
+                       }
+               }
+       } else {
+               pi[0].rx_count = max_rx_queues;
+               pi[0].tx_count = max_tx_queues;
+               pi[0].numa_node = pci_dev->device.numa_node;
+               *port_count = 1;
+       }
+
+       szedata_close(szedata_temp);
+       return 0;
+}
+
+/**
+ * @brief Allocates rte_eth_dev device.
+ * @param pci_dev Corresponding PCI device.
+ * @param numa_node NUMA node on which device is allocated.
+ * @param port_no Id of rte_eth_device created on PCI device pci_dev.
+ * @return Pointer to allocated device or NULL on error.
+ */
+static struct rte_eth_dev *
+szedata2_eth_dev_allocate(struct rte_pci_device *pci_dev, int numa_node,
+               unsigned int port_no)
+{
+       struct rte_eth_dev *eth_dev;
+       char name[RTE_ETH_NAME_MAX_LEN];
+
+       PMD_INIT_FUNC_TRACE();
+
+       snprintf(name, RTE_ETH_NAME_MAX_LEN, "%s"
+                       SZEDATA2_ETH_DEV_NAME_SUFFIX_FMT,
+                       pci_dev->device.name, port_no);
+       PMD_INIT_LOG(DEBUG, "Allocating eth_dev %s", name);
+
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+               eth_dev = rte_eth_dev_allocate(name);
+               if (!eth_dev)
+                       return NULL;
+
+               eth_dev->data->dev_private = rte_zmalloc_socket(name,
+                       sizeof(struct pmd_internals), RTE_CACHE_LINE_SIZE,
+                       numa_node);
+               if (!eth_dev->data->dev_private) {
+                       rte_eth_dev_release_port(eth_dev);
+                       return NULL;
+               }
+       } else {
+               eth_dev = rte_eth_dev_attach_secondary(name);
+               if (!eth_dev)
+                       return NULL;
+       }
+
+       eth_dev->device = &pci_dev->device;
+       rte_eth_copy_pci_info(eth_dev, pci_dev);
+       eth_dev->data->numa_node = numa_node;
+       return eth_dev;
+}
+
+/**
+ * @brief Releases interval of rte_eth_dev devices from array.
+ * @param eth_devs Array of pointers to rte_eth_dev devices.
+ * @param from Index in array eth_devs to start with.
+ * @param to Index in array right after the last element to release.
+ *
+ * Used for releasing at failed initialization.
+ */
+static void
+szedata2_eth_dev_release_interval(struct rte_eth_dev **eth_devs,
+               unsigned int from, unsigned int to)
+{
+       unsigned int i;
+
+       PMD_INIT_FUNC_TRACE();
+
+       for (i = from; i < to; i++) {
+               rte_szedata2_eth_dev_uninit(eth_devs[i]);
+               rte_eth_dev_pci_release(eth_devs[i]);
+       }
+}
+
+/**
+ * @brief Callback .probe for struct rte_pci_driver.
+ */
 static int szedata2_eth_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
        struct rte_pci_device *pci_dev)
 {
-       return rte_eth_dev_pci_generic_probe(pci_dev,
-               sizeof(struct pmd_internals), rte_szedata2_eth_dev_init);
+       struct port_info port_info[SZEDATA2_MAX_PORTS];
+       unsigned int port_count;
+       int ret;
+       unsigned int i;
+       struct pci_dev_list_entry *list_entry;
+       struct rte_eth_dev *eth_devs[SZEDATA2_MAX_PORTS] = {NULL,};
+
+       PMD_INIT_FUNC_TRACE();
+
+       ret = get_port_info(pci_dev, &port_count, port_info,
+                       SZEDATA2_MAX_PORTS);
+       if (ret != 0)
+               return ret;
+
+       if (port_count == 0) {
+               PMD_INIT_LOG(ERR, "No available ports!");
+               return -ENODEV;
+       }
+
+       list_entry = rte_zmalloc(NULL, sizeof(struct pci_dev_list_entry),
+                       RTE_CACHE_LINE_SIZE);
+       if (list_entry == NULL) {
+               PMD_INIT_LOG(ERR, "rte_zmalloc() failed!");
+               return -ENOMEM;
+       }
+
+       for (i = 0; i < port_count; i++) {
+               eth_devs[i] = szedata2_eth_dev_allocate(pci_dev,
+                               port_info[i].numa_node, i);
+               if (eth_devs[i] == NULL) {
+                       PMD_INIT_LOG(ERR, "Failed to alloc eth_dev for port %u",
+                                       i);
+                       szedata2_eth_dev_release_interval(eth_devs, 0, i);
+                       rte_free(list_entry);
+                       return -ENOMEM;
+               }
+
+               ret = rte_szedata2_eth_dev_init(eth_devs[i], &port_info[i]);
+               if (ret != 0) {
+                       PMD_INIT_LOG(ERR, "Failed to init eth_dev for port %u",
+                                       i);
+                       rte_eth_dev_pci_release(eth_devs[i]);
+                       szedata2_eth_dev_release_interval(eth_devs, 0, i);
+                       rte_free(list_entry);
+                       return ret;
+               }
+
+               rte_eth_dev_probing_finish(eth_devs[i]);
+       }
+
+       /*
+        * Add pci_dev to list of PCI devices for this driver
+        * which is used at remove callback to release all created eth_devs.
+        */
+       list_entry->pci_dev = pci_dev;
+       list_entry->port_count = port_count;
+       LIST_INSERT_HEAD(&szedata2_pci_dev_list, list_entry, next);
+       return 0;
 }
 
+/**
+ * @brief Callback .remove for struct rte_pci_driver.
+ */
 static int szedata2_eth_pci_remove(struct rte_pci_device *pci_dev)
 {
-       return rte_eth_dev_pci_generic_remove(pci_dev,
-               rte_szedata2_eth_dev_uninit);
+       unsigned int i;
+       unsigned int port_count;
+       char name[RTE_ETH_NAME_MAX_LEN];
+       struct rte_eth_dev *eth_dev;
+       int ret;
+       int retval = 0;
+       bool found = false;
+       struct pci_dev_list_entry *list_entry = NULL;
+
+       PMD_INIT_FUNC_TRACE();
+
+       LIST_FOREACH(list_entry, &szedata2_pci_dev_list, next) {
+               if (list_entry->pci_dev == pci_dev) {
+                       port_count = list_entry->port_count;
+                       found = true;
+                       break;
+               }
+       }
+       LIST_REMOVE(list_entry, next);
+       rte_free(list_entry);
+
+       if (!found) {
+               PMD_DRV_LOG(ERR, "PCI device " PCI_PRI_FMT " not found",
+                               pci_dev->addr.domain, pci_dev->addr.bus,
+                               pci_dev->addr.devid, pci_dev->addr.function);
+               return -ENODEV;
+       }
+
+       for (i = 0; i < port_count; i++) {
+               snprintf(name, RTE_ETH_NAME_MAX_LEN, "%s"
+                               SZEDATA2_ETH_DEV_NAME_SUFFIX_FMT,
+                               pci_dev->device.name, i);
+               PMD_DRV_LOG(DEBUG, "Removing eth_dev %s", name);
+               eth_dev = rte_eth_dev_allocated(name);
+               if (!eth_dev) {
+                       PMD_DRV_LOG(ERR, "eth_dev %s not found", name);
+                       retval = retval ? retval : -ENODEV;
+               }
+
+               ret = rte_szedata2_eth_dev_uninit(eth_dev);
+               if (ret != 0) {
+                       PMD_DRV_LOG(ERR, "eth_dev %s uninit failed", name);
+                       retval = retval ? retval : ret;
+               }
+
+               rte_eth_dev_pci_release(eth_dev);
+       }
+
+       return retval;
 }
 
 static struct rte_pci_driver szedata2_eth_driver = {
@@ -1652,4 +1921,14 @@ static struct rte_pci_driver szedata2_eth_driver = {
 RTE_PMD_REGISTER_PCI(RTE_SZEDATA2_DRIVER_NAME, szedata2_eth_driver);
 RTE_PMD_REGISTER_PCI_TABLE(RTE_SZEDATA2_DRIVER_NAME, rte_szedata2_pci_id_table);
 RTE_PMD_REGISTER_KMOD_DEP(RTE_SZEDATA2_DRIVER_NAME,
-       "* combo6core & combov3 & szedata2 & szedata2_cv3");
+       "* combo6core & combov3 & szedata2 & ( szedata2_cv3 | szedata2_cv3_fdt )");
+
+RTE_INIT(szedata2_init_log)
+{
+       szedata2_logtype_init = rte_log_register("pmd.net.szedata2.init");
+       if (szedata2_logtype_init >= 0)
+               rte_log_set_level(szedata2_logtype_init, RTE_LOG_NOTICE);
+       szedata2_logtype_driver = rte_log_register("pmd.net.szedata2.driver");
+       if (szedata2_logtype_driver >= 0)
+               rte_log_set_level(szedata2_logtype_driver, RTE_LOG_NOTICE);
+}